[AutoWarmth] optimisations and fixes to progressive warmth setting (#9442)

plugins/autowarmth.koplugin/main.lua

@@ -129,7 +129,7 @@ function AutoWarmth:leavePowerSavingState(from_resume)
     if resume_date.day == SunTime.date.day and resume_date.month == SunTime.date.month
         and resume_date.year == SunTime.date.year then
         local now_s = SunTime:getTimeInSec(resume_date)
-        self:scheduleNextWarmthChange(now_s, self.sched_warmth_index, from_resume)
+        self:scheduleNextWarmthChange(now_s, self.sched_warmth_index > 1 and self.sched_warmth_index - 1 or 1, from_resume)
         -- Reschedule 1sec after midnight
         UIManager:scheduleIn(24*3600 + 1 - now_s, self.scheduleMidnightUpdate, self)
     else
@@ -203,7 +203,7 @@ function AutoWarmth:scheduleMidnightUpdate(from_resume)
                 -- which map to warmth 0, 10, 20, 30 ... 100)
                 if frac(next_warmth * device_warmth_fit_scale) == 0 then
                     table.insert(self.sched_times_s, time1_s + delta_t * i)
-                    table.insert(self.sched_warmths, math.floor(math.min(self.warmth[index1], 100) + delta_w * i))
+                    table.insert(self.sched_warmths, next_warmth)
                 end
             end
         end
@@ -305,11 +305,11 @@ function AutoWarmth:scheduleNextWarmthChange(time_s, search_pos, from_resume)
     local next_warmth = actual_warmth
     for i = self.sched_warmth_index, #self.sched_warmths do
         if self.sched_times_s[i] <= time_s then
-            actual_warmth = self.sched_warmths[i] or actual_warmth
+            actual_warmth = self.sched_warmths[i]
             local j = i
-            while j <= #self.sched_warmths and self.sched_times_s[j] <= time_s + delay_s do
+            while from_resume and j <= #self.sched_warmths and self.sched_times_s[j] <= time_s + delay_s do
                 -- Most times only one iteration through this loop
-                next_warmth = self.sched_warmths[j] or next_warmth
+                next_warmth = self.sched_warmths[j]
                 j = j + 1
             end
         else
@@ -324,6 +324,13 @@ function AutoWarmth:scheduleNextWarmthChange(time_s, search_pos, from_resume)
         if next_sched_time_s > 0 then
             -- This setWarmth will call scheduleNextWarmthChange which will schedule setWarmth again.
             UIManager:scheduleIn(next_sched_time_s, self.setWarmth, self, self.sched_warmths[self.sched_warmth_index], true)
+        elseif self.sched_warmth_index < #self.sched_warmths then
+            -- If this really happens under strange conditions, wait until the next full minute to
+            -- minimize wakeups from standby.
+            UIManager:scheduleIn(61 - tonumber(os.date("%S")),
+                self.setWarmth, self, self.sched_warmths[self.sched_warmth_index], true)
+        else
+            logger.dbg("AutoWarmth: schedule is over, waiting for midnight update")
         end
     end
 
@@ -332,7 +339,7 @@ function AutoWarmth:scheduleNextWarmthChange(time_s, search_pos, from_resume)
         -- schedule setting of another valid warmth (=`next_warmth`) again (one time).
         -- On sane devices this schedule does no harm.
         -- see https://github.com/koreader/koreader/issues/8363
-        UIManager:scheduleIn(delay_s, self.setWarmth, self, next_warmth, true) -- no setWarmth rescheduling, force warmth
+        UIManager:scheduleIn(delay_s, self.setWarmth, self, next_warmth, false) -- no setWarmth rescheduling, force warmth
     end
 
     -- Check if AutoWarmth shall toggle frontlight daytime and twilight
@@ -654,15 +661,7 @@ end
 function AutoWarmth:getScheduleMenu()
     local function store_times(touchmenu_instance, new_time, num)
         self.scheduler_times[num] = new_time
-        if num == 1 then
-            if new_time then
-                self.scheduler_times[midnight_index] = new_time + 24 -- next day
-            else
-                self.scheduler_times[midnight_index] = nil
-            end
-        end
-        G_reader_settings:saveSetting("autowarmth_scheduler_times",
-            self.scheduler_times)
+        G_reader_settings:saveSetting("autowarmth_scheduler_times", self.scheduler_times)
         self:scheduleMidnightUpdate()
         if touchmenu_instance then self:updateItems(touchmenu_instance) end
     end
@@ -690,6 +689,8 @@ function AutoWarmth:getScheduleMenu()
                     title_text = _("Set time"),
                     info_text = _("Enter time in hours and minutes."),
                     hour = hh,
+                    hour_min = -1,
+                    hour_max = 24,
                     min = mm,
                     ok_text = _("Set time"),
                     callback = function(time)
@@ -749,7 +750,7 @@ function AutoWarmth:getScheduleMenu()
     end
 
     local retval = {
-        getScheduleMenuEntry(_("Solar midnight"), 1, false),
+        getScheduleMenuEntry(_("Solar midnight (previous day)"), 1, false),
         getScheduleMenuEntry(_("Astronomical dawn"), 2, false),
         getScheduleMenuEntry(_("Nautical dawn"), 3, false),
         getScheduleMenuEntry(_("Civil dawn"), 4),
@@ -759,6 +760,7 @@ function AutoWarmth:getScheduleMenu()
         getScheduleMenuEntry(_("Civil dusk"), 8),
         getScheduleMenuEntry(_("Nautical dusk"), 9, false),
         getScheduleMenuEntry(_("Astronomical dusk"), 10, false),
+        getScheduleMenuEntry(_("Solar midnight"), 11, false),
     }
 
     return tidy_menu(retval, self.easy_mode)

plugins/autowarmth.koplugin/suntime.lua

@@ -551,14 +551,16 @@ end
     -- Sometimes at high latitudes noon or midnight does not get calculated.
     -- Maybe there is a minor bug in the calculateNoon/calculateMidnight functions.
     if self.rise and self.set then
-        if not self.noon then
+        if not self.noon and self.rise and self.set then
             self.noon = (self.rise + self.set) / 2
         end
-        if not self.midnight then
+        if not self.midnight and self.noon then
             self.midnight = self.noon + 12
         end
-        if not self.midnight_beginning then
+        if not self.midnight_beginning and self.midnight then
             self.midnight_beginning = self.midnight - 24
+        elseif not self.midnight and self.midnight_beginning then
+            self.midnight = self.midnight_beginning + 24
         end
     elseif self.rise and not self.set then -- only sunrise on that day
         self.midnight = nil
@@ -580,17 +582,18 @@ end
     self.times[11] = self.midnight
 end
 
--- Get time in seconds (either actual time in hours or date struct)
+-- Get time in seconds, rounded to ms (either actual time in hours or date struct)
 function SunTime:getTimeInSec(val)
     if not val then
         val = os.date("*t")
     end
 
     if type(val) == "table" then
-        return val.hour*3600 + val.min*60 + val.sec
+        val = val.hour*3600 + val.min*60 + val.sec
+    else
+        val = val*3600
     end
-
-    return val*3600
+    return math.floor(val * 1000 ) / 1000
 end
 
 return SunTime