github/psa_car_controller
1
0
Fork 0
mirror of https://github.com/flobz/psa_car_controller.git synced 2026-08-22 17:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from mbrentini/patch-2

Browse Source 
Update car_model.py
This commit is contained in:
Florian BEZANNIER
2021-10-14 22:20:24 +02:00
committed by GitHub
parent a64243fc2c c8486bf75d
commit 7a418c73e8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/car_model.py
+1 -1
View File
@@ -60,7 +60,7 @@ car_models = [
ElecModel("Mokka-e", 46, "opel:mokkae:20:48", r"VXKUKZKX.*"), # VXKUKZKXZM
ElecModel("Zaphira-e", 68, "peugeot:etraveler:21:75:opel", r"VXEVZZKX.*"), # VXEVZZKXZMZ
ElecModel("E-C4", 46, "citroen:ec4:21:50", r"VR7BCZKX.*"), # VR7BCZKXCM
CarModel("SUV 3008", 10.8, 43),
CarModel("SUV 3008 Hybrid 225", 13.2, 43, reg=r"VF3M4DGZ.*"), #VF3M4DGZUMS
CarModel("308", 0, 56, reg=r"VF3L35GG.*"),
CarModel("208", 0, 44, reg=r"VR3UPHN[SE].*"), # VR3UPHNSSM VR3UPHNEKM
CarModel("2008", 0, 44, reg=r"VR3USHNS.*"), # VR3USHNSKM
test/test_unit.py
+4 -4
View File
@@ -198,7 +198,7 @@ class TestUnit(unittest.TestCase):
Database.record_position(None, car.vin, 30, latitude, longitude, 22, date2, 30, 28, False)
trips = Trips.get_trips(self.vehicule_list)
res = trips[car.vin].get_trips_as_dict()
assert compare_dict(res, [{'consumption_km': 5.684210526315789,
assert compare_dict(res, [{'consumption_km': 6.947368421052632,
'start_at': date0,
'consumption_by_temp': None,
'positions': {'lat': [latitude],
@@ -209,7 +209,7 @@ class TestUnit(unittest.TestCase):
'mileage': 30.0,
'altitude_diff': 0,
'id': 1,
'consumption': 1.08,
'consumption': 1.32,
'consumption_fuel_km': 10.53}])
def test_none_mileage(self):
@@ -227,7 +227,7 @@ class TestUnit(unittest.TestCase):
trips = Trips.get_trips(self.vehicule_list)
res = trips[car.vin].get_trips_as_dict()
print(res)
assert compare_dict(res, [{'consumption_km': 5.684210526315789,
assert compare_dict(res, [{'consumption_km': 6.947368421052632,
'start_at': start,
'consumption_by_temp': None,
'positions': {'lat': [latitude],
@@ -238,7 +238,7 @@ class TestUnit(unittest.TestCase):
'mileage': 30.0,
'altitude_diff': 0,
'id': 1,
'consumption': 1.08,
'consumption': 1.32,
'consumption_fuel_km': 10.53}])
def test_db_callback(self):
test/utils.py
+1 -1
View File
@@ -20,7 +20,7 @@ date4 = date3 + timedelta(minutes=1)
vehicule_list = Cars()
vehicule_list.extend(
[Car("VR3UHZKX", "vid", "Peugeot"), Car("VXXXXX", "XXXX", "Peugeot", label="SUV 3008")])
[Car("VR3UHZKX", "vid", "Peugeot"), Car("VXXXXX", "XXXX", "Peugeot", label="SUV 3008 Hybrid 225")])
car = vehicule_list[0]
DB_DIR = DATA_DIR + "tmp.db"