From 273fbb2ec34c616ea4a390f76b36e94558b3410d Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Thu, 14 Apr 2016 17:24:40 +0200 Subject: [PATCH 1/3] Bump base --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index 8e39d6149..3ca13f3f2 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 8e39d61493257c05fe039f34fa1a6e3ae5f0eab6 +Subproject commit 3ca13f3f2cb1f3267ce5c7fa309c29a345387f12 From dfe321d87a66e5ca39299552868526a7cd2d9ed8 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Thu, 14 Apr 2016 17:36:06 +0200 Subject: [PATCH 2/3] Fix a hasFrontLight call in reader.lua... (it's a function, not a bool ;'( ). Fix #1961 --- reader.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reader.lua b/reader.lua index 117dac0c3..1f14dc5e6 100755 --- a/reader.lua +++ b/reader.lua @@ -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 From d4e5746eb3fe78c38c619f8a2d3bf0522a14bf35 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Thu, 14 Apr 2016 21:05:19 +0200 Subject: [PATCH 3/3] Unbreak toggling the fL on Kindles Fix #1960 --- frontend/device/kindle/powerd.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/device/kindle/powerd.lua b/frontend/device/kindle/powerd.lua index de1e80213..644a27a41 100644 --- a/frontend/device/kindle/powerd.lua +++ b/frontend/device/kindle/powerd.lua @@ -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