mirror of
https://github.com/koreader/koreader
synced 2024-11-16 06:12:56 +00:00
f6743a45db
* Enforce a known rotation on startup, to make sure we handle touch input coordinates properly. * Proper FrontLight warmth support (thanks to @cairnsh & @pazos in #4291)! * Fix the PageTurn buttons mapping to match Nickel's defaults * Properly remap PageTurn buttons depending on the current rotation. * Actually enable the Mk.7 screen refresh codepath on *all* Mk.7 devices (I'd messed up the device check...). * Full accelerometer handling (includes a touch of refactoring regarding orientation handling in general). * Fix insidiously broken USBMS behavior in Nickel after we exit on FW >4.8. Fix #4291 Fix #3002
213 lines
7.1 KiB
Lua
213 lines
7.1 KiB
Lua
local BasePowerD = require("device/generic/powerd")
|
|
local SysfsLight = require ("device/sysfs_light")
|
|
local PluginShare = require("pluginshare")
|
|
|
|
local battery_sysfs = "/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/"
|
|
|
|
local CervantesPowerD = BasePowerD:new{
|
|
fl = nil,
|
|
fl_warmth = nil,
|
|
auto_warmth = false,
|
|
max_warmth_hour = 23,
|
|
|
|
fl_min = 0,
|
|
fl_max = 100,
|
|
fl_warmth_min = 0,
|
|
fl_warmth_max = 100,
|
|
capacity_file = battery_sysfs .. 'capacity',
|
|
status_file = battery_sysfs .. 'status'
|
|
}
|
|
|
|
function CervantesPowerD:_syncLightOnStart()
|
|
-- We can't read value from the OS or hardware.
|
|
-- Use last values stored in koreader settings.
|
|
local new_intensity = G_reader_settings:readSetting("frontlight_intensity") or nil
|
|
local is_frontlight_on = G_reader_settings:readSetting("is_frontlight_on") or nil
|
|
local new_warmth, auto_warmth = nil
|
|
|
|
if self.fl_warmth ~= nil then
|
|
new_warmth = G_reader_settings:readSetting("frontlight_warmth") or nil
|
|
auto_warmth = G_reader_settings:readSetting("frontlight_auto_warmth") or nil
|
|
end
|
|
|
|
if new_intensity ~= nil then
|
|
self.hw_intensity = new_intensity
|
|
end
|
|
|
|
if is_frontlight_on ~= nil then
|
|
self.initial_is_fl_on = is_frontlight_on
|
|
end
|
|
|
|
local max_warmth_hour =
|
|
G_reader_settings:readSetting("frontlight_max_warmth_hour")
|
|
if max_warmth_hour then
|
|
self.max_warmth_hour = max_warmth_hour
|
|
end
|
|
if auto_warmth then
|
|
self.auto_warmth = true
|
|
self:calculateAutoWarmth()
|
|
elseif new_warmth ~= nil then
|
|
self.fl_warmth = new_warmth
|
|
end
|
|
|
|
if self.initial_is_fl_on == false and self.hw_intensity == 0 then
|
|
self.hw_intensity = 1
|
|
end
|
|
end
|
|
|
|
function CervantesPowerD:init()
|
|
-- Default values in case self:_syncLightOnStart() does not find
|
|
-- any previously saved setting (and for unit tests where it will
|
|
-- not be called)
|
|
self.hw_intensity = 20
|
|
self.initial_is_fl_on = true
|
|
self.autowarmth_job_running = false
|
|
|
|
if self.device.hasFrontlight() then
|
|
if self.device.hasNaturalLight() then
|
|
local nl_config = G_reader_settings:readSetting("natural_light_config")
|
|
if nl_config then
|
|
for key,val in pairs(nl_config) do
|
|
self.device.frontlight_settings[key] = val
|
|
end
|
|
end
|
|
self.fl = SysfsLight:new(self.device.frontlight_settings)
|
|
self.fl_warmth = 0
|
|
self:_syncLightOnStart()
|
|
else
|
|
local kobolight = require("ffi/kobolight")
|
|
local ok, light = pcall(kobolight.open)
|
|
if ok then
|
|
self.fl = light
|
|
self:_syncLightOnStart()
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
function CervantesPowerD:saveSettings()
|
|
if self.device.hasFrontlight() then
|
|
-- Store BasePowerD values into settings (and not our hw_intensity, so
|
|
-- that if frontlight was toggled off, we save and restore the previous
|
|
-- untoggled intensity and toggle state at next startup)
|
|
local cur_intensity = self.fl_intensity
|
|
local cur_is_fl_on = self.is_fl_on
|
|
local cur_warmth = self.fl_warmth
|
|
local cur_auto_warmth = self.auto_warmth
|
|
local cur_max_warmth_hour = self.max_warmth_hour
|
|
-- Save intensity to koreader settings
|
|
G_reader_settings:saveSetting("frontlight_intensity", cur_intensity)
|
|
G_reader_settings:saveSetting("is_frontlight_on", cur_is_fl_on)
|
|
if cur_warmth ~= nil then
|
|
G_reader_settings:saveSetting("frontlight_warmth", cur_warmth)
|
|
G_reader_settings:saveSetting("frontlight_auto_warmth", cur_auto_warmth)
|
|
G_reader_settings:saveSetting("frontlight_max_warmth_hour", cur_max_warmth_hour)
|
|
end
|
|
end
|
|
end
|
|
|
|
function CervantesPowerD:frontlightIntensityHW()
|
|
return self.hw_intensity
|
|
end
|
|
|
|
function CervantesPowerD:isFrontlightOnHW()
|
|
if self.initial_is_fl_on ~= nil then -- happens only once after init()
|
|
-- give initial state to BasePowerD, which will
|
|
-- reset our self.hw_intensity to 0 if self.initial_is_fl_on is false
|
|
local ret = self.initial_is_fl_on
|
|
self.initial_is_fl_on = nil
|
|
return ret
|
|
end
|
|
return self.hw_intensity > 0
|
|
end
|
|
|
|
function CervantesPowerD:turnOffFrontlightHW()
|
|
self:_setIntensity(0) -- will call setIntensityHW(0)
|
|
end
|
|
|
|
function CervantesPowerD:setIntensityHW(intensity)
|
|
if self.fl == nil then return end
|
|
if self.fl_warmth == nil then
|
|
self.fl:setBrightness(intensity)
|
|
else
|
|
self.fl:setNaturalBrightness(intensity, self.fl_warmth)
|
|
end
|
|
self.hw_intensity = intensity
|
|
-- Now that we have set intensity, we need to let BasePowerD
|
|
-- know about possibly changed frontlight state (if we came
|
|
-- from light toggled off to some intensity > 0).
|
|
self:_decideFrontlightState()
|
|
end
|
|
|
|
function CervantesPowerD:setWarmth(warmth)
|
|
if self.fl == nil then return end
|
|
if not warmth and self.auto_warmth then
|
|
self:calculateAutoWarmth()
|
|
end
|
|
self.fl_warmth = warmth or self.fl_warmth
|
|
self.fl:setWarmth(self.fl_warmth)
|
|
end
|
|
|
|
function CervantesPowerD:calculateAutoWarmth()
|
|
local current_time = os.date("%H") + os.date("%M")/60
|
|
local max_hour = self.max_warmth_hour
|
|
local diff_time = max_hour - current_time
|
|
if diff_time < 0 then
|
|
diff_time = diff_time + 24
|
|
end
|
|
if diff_time < 12 then
|
|
-- We are before bedtime. Use a slower progression over 5h.
|
|
self.fl_warmth = math.max(20 * (5 - diff_time), 0)
|
|
elseif diff_time > 22 then
|
|
-- Keep warmth at maximum for two hours after bedtime.
|
|
self.fl_warmth = 100
|
|
else
|
|
-- Between 2-4h after bedtime, return to zero.
|
|
self.fl_warmth = math.max(100 - 50 * (22 - diff_time), 0)
|
|
end
|
|
self.fl_warmth = math.floor(self.fl_warmth + 0.5)
|
|
|
|
-- Enable background job for setting Warmth, if not already done.
|
|
if not self.autowarmth_job_running then
|
|
table.insert(PluginShare.backgroundJobs, {
|
|
when = 180,
|
|
repeated = true,
|
|
executable = function()
|
|
if self.auto_warmth then
|
|
self:setWarmth()
|
|
end
|
|
end,
|
|
})
|
|
self.autowarmth_job_running = true
|
|
end
|
|
end
|
|
|
|
function CervantesPowerD:getCapacityHW()
|
|
return self:read_int_file(self.capacity_file)
|
|
end
|
|
|
|
function CervantesPowerD:isChargingHW()
|
|
return self:read_str_file(self.status_file) == "Charging\n"
|
|
end
|
|
|
|
function CervantesPowerD:beforeSuspend()
|
|
if self.fl == nil then return end
|
|
-- just turn off frontlight without remembering its state
|
|
self.fl:setBrightness(0)
|
|
end
|
|
|
|
function CervantesPowerD:afterResume()
|
|
if self.fl == nil then return end
|
|
-- just re-set it to self.hw_intensity that we haven't change on Suspend
|
|
if self.fl_warmth == nil then
|
|
self.fl:setBrightness(self.hw_intensity)
|
|
else
|
|
if self.auto_warmth then
|
|
self:calculateAutoWarmth()
|
|
end
|
|
self.fl:setNaturalBrightness(self.hw_intensity, self.fl_warmth)
|
|
end
|
|
end
|
|
|
|
return CervantesPowerD
|