Merge pull request #1964 from NiLuJe/master

Assorted FrontLight fixes ;)
This commit is contained in:
Qingping Hou
2016-04-15 09:49:09 -07:00
3 changed files with 5 additions and 3 deletions

2
base

Submodule base updated: 8e39d61493...3ca13f3f2c

View File

@@ -27,8 +27,10 @@ end
function KindlePowerD:toggleFrontlight()
local sysint = self:read_int_file(self.fl_intensity_file)
if sysint == 0 then
self:setIntensity(self.fl_intensity)
-- NOTE: We want to bypass setIntensity's shenanigans and simply restore the light as-is
self:setIntensityHW()
else
-- NOTE: We want to really kill the light, so do it manually (asking lipc to set it to 0 would in fact set it to 1)...
os.execute("echo -n 0 > " .. self.fl_intensity_file)
end
end

View File

@@ -117,7 +117,7 @@ end
-- restore kobo frontlight settings and probe kobo touch coordinates
if Device:isKobo() then
if Device.hasFrontlight then
if Device:hasFrontlight() then
local powerd = Device:getPowerDevice()
if powerd and powerd.restore_settings then
-- UIManager:init() should have sanely set up the frontlight_stuff by this point