From 1a3955ce145aebedd2555b5965fc2c08bdd035ec Mon Sep 17 00:00:00 2001 From: Florian Hinrichsen Date: Tue, 13 Jul 2021 13:52:53 +0200 Subject: [PATCH 1/3] Add Peugeot 508 Hybrid --- libs/car_model.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/car_model.py b/libs/car_model.py index add4d1b..e4d8280 100644 --- a/libs/car_model.py +++ b/libs/car_model.py @@ -69,6 +69,7 @@ carmodels = [ CarModel("DS7 Crossback E-Tense", 11.5, 43, reg="VR1J45GBUK.*"), CarModel("DS7 Crossback E-Tense 300 4x4", 11.5, 43, reg=" VR1J45GBUL.*"), CarModel("508 SW Hybrid", 11.5, 45, reg=r"VR3F4DGZ.*"), # VR3F4DGZTL + CarModel("508 Hybrid", 11.5, 43, reg=r"VR3F3DGZ.*"), # VR3F3DGZTM CarModel("Grandland X Hybrid", 13.2, 43, reg=r"W0VZ4DGZ.*"), #W0VZ4DGZ2L CarModel("Grandland X Hybrid 4x4", 13.2, 43, reg=r"W0VZ45GB.*") #W0VZ45GB3L ] From 5c969ecffafc1adfc6e614a5dc940a5fef286f52 Mon Sep 17 00:00:00 2001 From: Florian Bezannier Date: Thu, 2 Sep 2021 11:41:24 +0200 Subject: [PATCH 2/3] fix charge_hour --- web/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/views.py b/web/views.py index 82d09fd..27f3ef2 100644 --- a/web/views.py +++ b/web/views.py @@ -159,7 +159,7 @@ def charge_now(vin, charge): @app.route('/charge_hour') def change_charge_hour(): - return jsonify(CONFIG.myp.change_charge_hour(request.form['vin'], request.form['hour'], request.form['minute'])) + return jsonify(CONFIG.myp.change_charge_hour(request.args['vin'], request.args['hour'], request.args['minute'])) @app.route('/wakeup/') From 7b58cb0e5033ec73b97e960c0989cb925c96fa20 Mon Sep 17 00:00:00 2001 From: Florian Bezannier Date: Thu, 2 Sep 2021 11:44:02 +0200 Subject: [PATCH 3/3] handle bad mileage --- trip.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/trip.py b/trip.py index a3bfe75..15a8960 100644 --- a/trip.py +++ b/trip.py @@ -159,12 +159,17 @@ class Trips(list): logger.debugv("%s mileage:%.1f level:%s level_fuel:%s", res[x]['Timestamp'], res[x]['mileage'], res[x]['level'], res[x]['level_fuel']) next_el = res[x + 2] - distance = end["mileage"] - start["mileage"] - duration = (end["Timestamp"] - start["Timestamp"]).total_seconds() / 3600 try: + distance = end["mileage"] - start["mileage"] + duration = (end["Timestamp"] - start["Timestamp"]).total_seconds() / 3600 speed_average = distance / duration + except TypeError: + logger.exception("Bad value : ") + distance = 0 + speed_average = 0 except ZeroDivisionError: speed_average = 0 + if TripParser.is_low_speed(speed_average, duration) or trip_parser.is_refuel(start, end, distance): start = end trip = Trip()