Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Lykke committed Aug 14, 2023
1 parent b9cabc8 commit 01cc111
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 68 deletions.
7 changes: 6 additions & 1 deletion src/car.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def executeCommand(self, config, command, value):
vwc = WeConnect(credentials)
vwc.set_logging_level(self.logger.level)
vwc.login()

vin = self.getVin(config, vwc)

self.logger.debug(command)
Expand Down Expand Up @@ -66,7 +67,11 @@ def getCarStates(self) -> CarStates:
return CarStates()

def getVin(self, config, vwc):
vin = config['vin']
vin = ""

if ('vin' in config):
vin = config['vin']

if len(vin) == 0:
vin = vwc.get_real_car_data(
)['realCars'][0]['vehicleIdentificationNumber']
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ class WeConnect implements AccessoryPlugin {
success = true;
} catch (dataError) {
this.log.error(
"Get current state on data received: " + dataError
`Get current state on data received: ${data} with error: ${dataError}`
);
}
});
Expand Down
99 changes: 33 additions & 66 deletions src/vsr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ class VSR:
__vsr_fields = [
('0x0101010001', '0x0101010001', 'status', 'utc_time'),
('0x0101010002', '0x0101010002', 'status', 'distance_covered'),
('0x0202FFFFFF', '0x020203A227', 'milCarSent', 'mil_distance_covered'),
('0x0202FFFFFF', '0x020203A331', 'warning', 'textId'),
('0x0203FFFFFF', '0x0203010001', 'intervals', 'distance_to_oil_change'),
('0x0203FFFFFF', '0x0203010002', 'intervals', 'time_to_oil_change'),
('0x0203FFFFFF', '0x0203010003', 'intervals', 'distance_to_inspection'),
Expand All @@ -27,13 +25,10 @@ class VSR:
('0x0204FFFFFF', '0x0204040002', 'oil_level', 'minimum_warning'),
('0x0204FFFFFF', '0x0204040003', 'oil_level', 'dipstick_percentage'),
('0x0204FFFFFF', '0x0204040004', 'oil_level', 'display'),
('0x0204FFFFFF', '0x0204040006', 'oil_level', 'percentage'),
('0x0204FFFFFF', '0x02040C0001', 'intervals', 'ad_blue_range'),
('0x0301FFFFFF', '0x0301010001', 'status',
'parking_light', {'1': 'on', '2': 'off'}),
('0x0301FFFFFF', '0x0301010001', 'status', 'parking_light', {'1':'on','2':'off'}),
('0x0301FFFFFF', '0x0301020001', 'status', 'temperature_outside'),
('0x0301FFFFFF', '0x0301030001', 'status',
'parking_brake', {'0': 'inactive', '1': 'active'}),
('0x0301FFFFFF', '0x0301030001', 'status', 'parking_brake', {'0':'inactive', '1':'active'}),
('0x0301FFFFFF', '0x0301030002', 'status', 'state_of_charge'),
('0x0301FFFFFF', '0x0301030003', 'status', 'bem'),
('0x0301FFFFFF', '0x0301030004', 'status', 'speed'),
Expand All @@ -43,73 +38,45 @@ class VSR:
('0x0301FFFFFF', '0x0301030008', 'status', 'secondary_range'),
('0x0301FFFFFF', '0x0301030009', 'status', 'secondary_drive'),
('0x0301FFFFFF', '0x030103000A', 'status', 'fuel_level'),
('0x0301FFFFFF', '0x030103000B', 'status',
'fuel_method', {'0': 'measured', '1': 'calculated'}),
('0x0301FFFFFF', '0x030103000B', 'status', 'fuel_method', {'0':'measured', '1':'calculated'}),
('0x0301FFFFFF', '0x030103000D', 'status', 'cng_level'),
('0x0301FFFFFF', '0x0301040001', 'doors', 'lock_left_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040002', 'doors', 'open_left_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040003', 'doors', 'safety_left_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040004', 'doors', 'lock_left_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040005', 'doors', 'open_left_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040006', 'doors', 'safety_left_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040007', 'doors', 'lock_right_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040008', 'doors', 'open_right_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040009', 'doors', 'safety_right_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030104000A', 'doors', 'lock_right_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030104000B', 'doors', 'open_right_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030104000C', 'doors', 'safety_right_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030104000D', 'doors', 'lock_trunk', {
'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030104000E', 'doors', 'open_trunk', {
'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030104000F', 'doors', 'safety_trunk',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040010', 'doors', 'lock_hood', {
'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040011', 'doors', 'open_hood', {
'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040012', 'doors', 'safety_hood', {
'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301050001', 'windows', 'state_left_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301040001', 'doors', 'lock_left_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040002', 'doors', 'open_left_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040003', 'doors', 'safety_left_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040004', 'doors', 'lock_left_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040005', 'doors', 'open_left_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040006', 'doors', 'safety_left_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040007', 'doors', 'lock_right_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040008', 'doors', 'open_right_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040009', 'doors', 'safety_right_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030104000A', 'doors', 'lock_right_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030104000B', 'doors', 'open_right_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030104000C', 'doors', 'safety_right_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030104000D', 'doors', 'lock_trunk', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030104000E', 'doors', 'open_trunk', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030104000F', 'doors', 'safety_trunk', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040010', 'doors', 'lock_hood', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040011', 'doors', 'open_hood', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301040012', 'doors', 'safety_hood', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050001', 'windows', 'state_left_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050002', 'windows', 'position_left_front'),
('0x0301FFFFFF', '0x0301050003', 'windows', 'state_left_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301050003', 'windows', 'state_left_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050004', 'windows', 'position_left_rear'),
('0x0301FFFFFF', '0x0301050005', 'windows', 'state_right_front',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301050005', 'windows', 'state_right_front', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050006', 'windows', 'position_right_front'),
('0x0301FFFFFF', '0x0301050007', 'windows', 'state_right_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301050007', 'windows', 'state_right_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050008', 'windows', 'position_right_rear'),
('0x0301FFFFFF', '0x0301050009', 'windows', 'state_convertible_top',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301050009', 'windows', 'state_convertible_top', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030105000A', 'windows', 'position_convertible_top'),
('0x0301FFFFFF', '0x030105000B', 'windows', 'state_roof',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030105000B', 'windows', 'state_roof', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030105000C', 'windows', 'position_roof'),
('0x0301FFFFFF', '0x030105000D', 'windows', 'state_roof_rear',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030105000D', 'windows', 'state_roof_rear', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x030105000E', 'windows', 'position_roof_rear'),
('0x0301FFFFFF', '0x030105000F', 'windows', 'state_service_flap',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x030105000F', 'windows', 'state_service_flap', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050010', 'windows', 'position_service_flap'),
('0x0301FFFFFF', '0x0301050011', 'windows', 'state_spoiler',
{'0': 'n/a', '1': 'open', '2': 'locked', '3': 'closed'}),
('0x0301FFFFFF', '0x0301050011', 'windows', 'state_spoiler', {'0':'n/a', '1':'open', '2':'locked', '3':'closed'}),
('0x0301FFFFFF', '0x0301050012', 'windows', 'position_spoiler'),

('0x0301FFFFFF', '0x0301060001', 'tyre_pressure', 'current_left_front'),
('0x0301FFFFFF', '0x0301060002', 'tyre_pressure', 'desired_left_front'),
('0x0301FFFFFF', '0x0301060003', 'tyre_pressure', 'current_left_rear'),
Expand Down Expand Up @@ -139,8 +106,8 @@ class VSR:
('0x0301FFFFFF', '0x030106000C', 'tyre_pressure', 'difference_left_rear'),
('0x0301FFFFFF', '0x030106000D', 'tyre_pressure', 'difference_right_front'),
('0x0301FFFFFF', '0x030106000E', 'tyre_pressure', 'difference_right_rear'),

]
]

def __init__(self):
pass
Expand Down

0 comments on commit 01cc111

Please sign in to comment.