redo nextwaterboost to datetimes

custom_components/peaqhvac/service/hvac/water_heater/models/next_water_boost_model.py

@@ -42,17 +42,20 @@
 def get_demand(temp) -> Demand:
     if temp is None:
         return Demand.NoDemand
-    if 0 < temp < 100:
-        if temp >= 40:
-            return Demand.NoDemand
-        if temp > 35:
-            return Demand.LowDemand
-        if temp >= 25:
-            return Demand.MediumDemand
-        if temp < 25:
-            return Demand.HighDemand
+    if temp > 70 or temp == 0:
+        return Demand.ErrorDemand
+    if temp >= 40:
+        return Demand.NoDemand
+    if temp > 35:
+        return Demand.LowDemand
+    if temp >= 25:
+        return Demand.MediumDemand
+    if temp < 25:
+        return Demand.HighDemand
     return Demand.ErrorDemand
 
+from dataclasses import dataclass, field
+from datetime import datetime, timedelta
 
 @dataclass
 class NextWaterBoostModel:
@@ -89,7 +92,7 @@ def cold_limit(self) -> datetime:
             hourdiff = (self.current_temp - self.target_temp) / -self.temp_trend
         except ZeroDivisionError:
             hourdiff = DELAY_LIMIT
-        return self.now_dt + timedelta(hours=hourdiff)
+        return max(self.now_dt + timedelta(hours=hourdiff), self._now_dt)
 
     @property
     def is_cold(self) -> bool:

custom_components/peaqhvac/service/hvac/water_heater/water_heater_next_start.py

@@ -193,6 +193,7 @@ def find_lowest_2hr_combination(self, start_index: datetime, end_index: datetime
         min_sum = float('inf')
         min_start_index = None
         current: datetime = start_index
+        print(start_index, end_index)
         while current < end_index:
             try:
                 current_sum = self.model.price_dict[current] + self.model.price_dict[current + timedelta(hours=1)]