+fix: clean code

Author: mlauke

smartswitch.espxx/include/Logic.h

@@ -27,6 +27,8 @@
 #include "Util.h"
 #include "debug.h"
 
+#define SECONDS_PER_HOUR 3600
+
 static char tsfmt[30];
 char *toDate(uint32_t utc_ts, int16_t offset)
 {
@@ -68,7 +70,7 @@ typedef struct
   BatteryLevel level;
 } BatteryState;
 
-static int seekToPvForecastData(SystemState *systemState)
+static int findPvForecastData(SystemState *systemState)
 {
   short i = 0;
 
@@ -78,7 +80,7 @@ static int seekToPvForecastData(SystemState *systemState)
   }
 
   bool foundPvData = false;
-  uint32_t ts = systemState->ts - (systemState->ts % 3600); // start with timestamp of last full hour
+  uint32_t ts = systemState->ts - (systemState->ts % SECONDS_PER_HOUR); // start with timestamp of last full hour
 
   for (; i <= SOLAR_FORECAST_HOURS; i++)
   {
@@ -92,7 +94,7 @@ static int seekToPvForecastData(SystemState *systemState)
 
 static BatteryState predictBatteryCapacityState(SystemConfig *systemConfig, SystemState *systemState)
 {
-  short index = seekToPvForecastData(systemState);
+  short index = findPvForecastData(systemState);
   if (index == -1)
   {
     return BatteryState{0, BatteryLevel::Min}; // no solar forecast data, assume battery will become empty
@@ -101,10 +103,10 @@ static BatteryState predictBatteryCapacityState(SystemConfig *systemConfig, Syst
   uint16_t hysteresis_Wh = systemConfig->loadPower_W * 20 / 60; // required capacity (Wh) if load is switched on for 20min
   uint32_t cap_bat_sim_wh = systemState->cap_bat_Wh;
   uint16_t cap_bat_min_Wh = systemConfig->cap_bat_min_Wh + (systemState->switchEnabled ? 0 : hysteresis_Wh);
-  uint32_t ts = systemState->ts - (systemState->ts % 3600); // full hour
-  uint16_t seconds = ts + 3600 - systemState->ts;           // remaining seconds in this hour
+  uint32_t ts = systemState->ts - (systemState->ts % SECONDS_PER_HOUR); // full hour
+  uint16_t seconds = ts + SECONDS_PER_HOUR - systemState->ts;           // remaining seconds in this hour
 
-  uint32_t wh = seconds * systemState->pv_forecast_ts_wh[index][1] / 3600; // remaining pv production in this hour
+  uint32_t wh = seconds * systemState->pv_forecast_ts_wh[index][1] / SECONDS_PER_HOUR; // remaining pv production in this hour
   uint16_t cons_wh;
 
   DEBUGF("%d => %u %u (s) %s %u/%u (Wh)\n", index, ts, systemState->ts, toDate(ts), wh, systemState->pv_forecast_ts_wh[index][1]);
@@ -115,8 +117,8 @@ static BatteryState predictBatteryCapacityState(SystemConfig *systemConfig, Syst
     // adaptive weight
     float weight = 1.0f - ((float)(hour) / (float)SOLAR_FORECAST_HOURS);
 
-    wh = wh * SOLAR_FORECAST_SAFETY_FACTOR * weight;     // apply safety factor + adaptive weight to production forecast
-    cons_wh = seconds * systemState->cons_W_norm / 3600; // remaining consumption in this hour
+    wh = wh * SOLAR_FORECAST_SAFETY_FACTOR * weight;                 // apply safety factor + adaptive weight to production forecast
+    cons_wh = seconds * systemState->cons_W_norm / SECONDS_PER_HOUR; // remaining consumption in this hour
 
     uint32_t cap_bat_sim_previos_wh = cap_bat_sim_wh; // safe previous to check battery capacity trend
 
@@ -136,7 +138,7 @@ static BatteryState predictBatteryCapacityState(SystemConfig *systemConfig, Syst
 
     ts = systemState->pv_forecast_ts_wh[index][0];
     wh = systemState->pv_forecast_ts_wh[index][1];
-    seconds = 3600; // full hour
+    seconds = SECONDS_PER_HOUR; // next calculation we have a full hour
   }
   DEBUGF("capacity %u Wh (bat) %u Wh (min) %u Wh (hys) %u Wh at %s\n", cap_bat_sim_wh, cap_bat_min_Wh, hysteresis_Wh, cons_wh, toDate(ts));
   return BatteryState{