Merge remote-tracking branch 'origin/master' into multi-day-charge-control

# Conflicts: # psa_car_controller/psacc/application/charge_control.py
2026-08-26 10:17:18 +00:00 · 2022-04-20 12:36:53 +02:00
parent e02d211bcb 4a6585647e
commit 7345fb4c3e
12 changed files with 99 additions and 50 deletions
@@ -203,7 +203,7 @@ class TestUnit(unittest.TestCase):
                                         'end_level': 85,
                                         'co2': co2,
                                         'kw': 20.7,
-                                         'price': 3.84,
+                                         'price': 4.29,
                                         'charging_mode': 'slow'}])
        assert get_figures(car)
        row = {"start_at": date0.strftime('%Y-%m-%dT%H:%M:%S.000Z'),