mirror of
https://github.com/koreader/koreader
synced 2024-11-11 19:11:14 +00:00
7e98b9de4b
Make sure we only send Suspend/Resume events when we *actually* suspend/resume. This is done via the Device `_beforeSuspend`/`_afterResume` methods, and those were called by the *input handlers*, not the PM logic; which means they would fire, while the PM logic could actually take a smarter decision and *not* do what the event just sent implied ;). (i.e., sleep with a cover -> suspend + actual suspend, OK; but if you then resume with a button -> input assumes resume, but PM will actually suspend again!). Existing design issue made more apparent by #9448 ;). Also fixes/generalizes a few corner-cases related to screen_saver_lock handling (e.g., don't allow USBMS during a lock). And deal with the fallout of the main change to the Kobo frontlight ramp behavior ;).
89 lines
2.5 KiB
Lua
89 lines
2.5 KiB
Lua
local BasePowerD = require("device/generic/powerd")
|
|
local ffi = require("ffi")
|
|
local inkview = ffi.load("inkview")
|
|
|
|
local PocketBookPowerD = BasePowerD:new{
|
|
is_charging = nil,
|
|
|
|
fl_min = 0,
|
|
fl_max = 100,
|
|
fl_warmth_min = 0,
|
|
fl_warmth_max = 100,
|
|
}
|
|
|
|
function PocketBookPowerD:frontlightIntensityHW()
|
|
-- Always update fl_intensity (and perhaps fl_warmth) from the OS value whenever queried (it's fast).
|
|
-- This way koreader settings can stay in sync even if the value is changed behind its back.
|
|
self.fl_intensity = math.max(0, inkview.GetFrontlightState())
|
|
if self.device:hasNaturalLight() then
|
|
self.fl_warmth = math.max(0, inkview.GetFrontlightColor())
|
|
end
|
|
return self.fl_intensity
|
|
end
|
|
|
|
function PocketBookPowerD:frontlightIntensity()
|
|
if not self.device:hasFrontlight() then return 0 end
|
|
if self:isFrontlightOff() then return 0 end
|
|
--- @note: We actually have a working frontlightIntensityHW implementation,
|
|
--- use it instead of returning a cached self.fl_intensity like BasePowerD.
|
|
return self:frontlightIntensityHW()
|
|
end
|
|
|
|
function PocketBookPowerD:setIntensityHW(intensity)
|
|
local v2api = pcall(function()
|
|
inkview.SetFrontlightEnabled(intensity == 0 and 0 or 1)
|
|
end)
|
|
if intensity == 0 then
|
|
-- -1 is valid only for the old api, on newer firmwares that's just a bogus brightness level
|
|
if not v2api then
|
|
inkview.SetFrontlightState(-1)
|
|
end
|
|
else
|
|
inkview.SetFrontlightState(intensity)
|
|
end
|
|
end
|
|
|
|
function PocketBookPowerD:isFrontlightOn()
|
|
if not self.device:hasFrontlight() then return false end
|
|
-- Query directly instead of assuming from cached value.
|
|
local enabled = inkview.GetFrontlightState() >= 0
|
|
pcall(function()
|
|
enabled = inkview.GetFrontlightEnabled() > 0
|
|
end)
|
|
return enabled
|
|
end
|
|
|
|
function PocketBookPowerD:setWarmthHW(level)
|
|
return inkview.SetFrontlightColor(level)
|
|
end
|
|
|
|
function PocketBookPowerD:frontlightWarmthHW()
|
|
return inkview.GetFrontlightColor()
|
|
end
|
|
|
|
function PocketBookPowerD:getCapacityHW()
|
|
return inkview.GetBatteryPower()
|
|
end
|
|
|
|
function PocketBookPowerD:isChargingHW()
|
|
if inkview.IsCharging() > 0 then
|
|
return true
|
|
else
|
|
return false
|
|
end
|
|
end
|
|
|
|
function PocketBookPowerD:beforeSuspend()
|
|
-- Inhibit user input and emit the Suspend event.
|
|
self.device:_beforeSuspend()
|
|
end
|
|
|
|
function PocketBookPowerD:afterResume()
|
|
self:invalidateCapacityCache()
|
|
|
|
-- Restore user input and emit the Resume event.
|
|
self.device:_afterResume()
|
|
end
|
|
|
|
return PocketBookPowerD
|