Merge pull request #213 from flobz/develop

Develop

libs/car_model.py

@@ -70,6 +70,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
 ]

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()

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/<string:vin>')