diff --git a/frontend/apps/reader/modules/readerfrontlight.lua b/frontend/apps/reader/modules/readerfrontlight.lua index ee5ee71e2..e6c7623c2 100644 --- a/frontend/apps/reader/modules/readerfrontlight.lua +++ b/frontend/apps/reader/modules/readerfrontlight.lua @@ -40,17 +40,17 @@ end function ReaderFrontLight:onAdjust(arg, ges) local powerd = Device:getPowerDevice() - if powerd.flIntensity ~= nil then - DEBUG("frontlight intensity", powerd.flIntensity) + if powerd.fl_intensity ~= nil then + DEBUG("frontlight intensity", powerd.fl_intensity) local step = math.ceil(#self.steps * ges.distance / self.gestureScale) DEBUG("step = ", step) local delta_int = self.steps[step] or self.steps[#self.steps] DEBUG("delta_int = ", delta_int) local new_intensity if ges.direction == "north" then - new_intensity = powerd.flIntensity + delta_int + new_intensity = powerd.fl_intensity + delta_int elseif ges.direction == "south" then - new_intensity = powerd.flIntensity - delta_int + new_intensity = powerd.fl_intensity - delta_int end if new_intensity ~= nil then powerd:setIntensity(new_intensity) @@ -61,9 +61,9 @@ end function ReaderFrontLight:onShowIntensity() local powerd = Device:getPowerDevice() - if powerd.flIntensity ~= nil then + if powerd.fl_intensity ~= nil then UIManager:show(Notification:new{ - text = T( _("Frontlight intensity is set to %1."), powerd.flIntensity), + text = T( _("Frontlight intensity is set to %1."), powerd.fl_intensity), timeout = 1.0, }) end diff --git a/frontend/device/generic/powerd.lua b/frontend/device/generic/powerd.lua index 9fb44ea76..dad7a9788 100644 --- a/frontend/device/generic/powerd.lua +++ b/frontend/device/generic/powerd.lua @@ -1,7 +1,7 @@ local BasePowerD = { fl_min = 0, -- min frontlight intensity fl_max = 10, -- max frontlight intensity - flIntensity = nil, -- frontlight intensity + fl_intensity = nil, -- frontlight intensity battCapacity = nil, -- battery capacity device = nil, -- device object @@ -57,7 +57,7 @@ function BasePowerD:normalizeIntensity(intensity) end function BasePowerD:setIntensity(intensity) - self.flIntensity = self:normalizeIntensity(intensity) + self.fl_intensity = self:normalizeIntensity(intensity) self:setIntensityHW() end diff --git a/frontend/device/kindle/powerd.lua b/frontend/device/kindle/powerd.lua index 6d025d5bb..de1e80213 100644 --- a/frontend/device/kindle/powerd.lua +++ b/frontend/device/kindle/powerd.lua @@ -4,7 +4,7 @@ local BasePowerD = require("device/generic/powerd") local KindlePowerD = BasePowerD:new{ fl_min = 0, fl_max = 24, - flIntensity = nil, + fl_intensity = nil, battCapacity = nil, is_charging = nil, lipc_handle = nil, @@ -17,9 +17,9 @@ function KindlePowerD:init() end if self.device.hasFrontlight() then if self.lipc_handle ~= nil then - self.flIntensity = self.lipc_handle:get_int_property("com.lab126.powerd", "flIntensity") + self.fl_intensity = self.lipc_handle:get_int_property("com.lab126.powerd", "flIntensity") else - self.flIntensity = self:read_int_file(self.fl_intensity_file) + self.fl_intensity = self:read_int_file(self.fl_intensity_file) end end end @@ -27,7 +27,7 @@ end function KindlePowerD:toggleFrontlight() local sysint = self:read_int_file(self.fl_intensity_file) if sysint == 0 then - self:setIntensity(self.flIntensity) + self:setIntensity(self.fl_intensity) else os.execute("echo -n 0 > " .. self.fl_intensity_file) end @@ -35,9 +35,9 @@ end function KindlePowerD:setIntensityHW() if self.lipc_handle ~= nil then - self.lipc_handle:set_int_property("com.lab126.powerd", "flIntensity", self.flIntensity) + self.lipc_handle:set_int_property("com.lab126.powerd", "flIntensity", self.fl_intensity) else - os.execute("echo -n ".. self.flIntensity .." > " .. self.fl_intensity_file) + os.execute("echo -n ".. self.fl_intensity .." > " .. self.fl_intensity_file) end end diff --git a/frontend/device/kobo/nickel_conf.lua b/frontend/device/kobo/nickel_conf.lua index 9248f994d..f0e39ca9d 100644 --- a/frontend/device/kobo/nickel_conf.lua +++ b/frontend/device/kobo/nickel_conf.lua @@ -57,9 +57,9 @@ function NickelConf.frontLightLevel.get() if new_intensity then return powerd:normalizeIntensity(new_intensity) else - local fallback_FrontLightLevel = powerd.flIntensity or 1 - assert(NickelConf.frontLightLevel.set(fallback_FrontLightLevel)) - return fallback_FrontLightLevel + local fallback_fl_level = powerd.fl_intensity or 1 + assert(NickelConf.frontLightLevel.set(fallback_fl_level)) + return fallback_fl_level end end diff --git a/frontend/device/kobo/powerd.lua b/frontend/device/kobo/powerd.lua index 59908d79f..7b218e934 100644 --- a/frontend/device/kobo/powerd.lua +++ b/frontend/device/kobo/powerd.lua @@ -8,11 +8,11 @@ local KoboPowerD = BasePowerD:new{ -- Do not actively set front light to 0, it may confuse users -- pressing -- hardware button won't take any effect. fl_min = 1, fl_max = 100, - flIntensity = 20, + fl_intensity = 20, restore_settings = true, fl = nil, - - flState = false, + -- this attribute should be synced with nickel's FrontLightState config + is_fl_on = false, batt_capacity_file = batt_state_folder .. "capacity", is_charging_file = batt_state_folder .. "status", battCapacity = nil, @@ -29,23 +29,23 @@ end function KoboPowerD:toggleFrontlight() if self.fl ~= nil then - if self.flState then + if self.is_fl_on then self.fl:setBrightness(0) else - self.fl:setBrightness(self.flIntensity) + self.fl:setBrightness(self.fl_intensity) end - self.flState = not self.flState + self.is_fl_on = not self.is_fl_on if KOBO_SYNC_BRIGHTNESS_WITH_NICKEL then - NickelConf.frontLightState.set(self.flState) + NickelConf.frontLightState.set(self.is_fl_on) end end end function KoboPowerD:setIntensityHW() if self.fl ~= nil then - self.fl:setBrightness(self.flIntensity) + self.fl:setBrightness(self.fl_intensity) if KOBO_SYNC_BRIGHTNESS_WITH_NICKEL then - NickelConf.frontLightLevel.set(self.flIntensity) + NickelConf.frontLightLevel.set(self.fl_intensity) end end end @@ -72,8 +72,8 @@ function KoboPowerD:afterResume() if self.fl ~= nil then if KOBO_LIGHT_ON_START and tonumber(KOBO_LIGHT_ON_START) > -1 then self:setIntensity(math.min(KOBO_LIGHT_ON_START, 100)) - else - self.fl:setBrightness(self.flIntensity) + elseif self.is_fl_on then + self.fl:setBrightness(self.fl_intensity) end end end diff --git a/reader.lua b/reader.lua index c014e02b6..ed201012b 100755 --- a/reader.lua +++ b/reader.lua @@ -121,7 +121,7 @@ if Device:isKobo() then local powerd = Device:getPowerDevice() if powerd and powerd.restore_settings then local intensity = G_reader_settings:readSetting("frontlight_intensity") - powerd.flIntensity = intensity or powerd.flIntensity + powerd.fl_intensity = intensity or powerd.fl_intensity local state = G_reader_settings:readSetting("frontlight_state") if state then -- Default state is off