Skip to content

Commit f21f31a

Browse files
Bre77Bre77
committed
Fixes
1 parent 0cf9c4e commit f21f31a

File tree

2 files changed

+74
-19
lines changed

2 files changed

+74
-19
lines changed

‎homeassistant/components/teslemetry/coordinator.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@
2424
if TYPE_CHECKING:
2525
from . import TeslemetryConfigEntry
2626

27-
<<<<<<< ours
28-
from .const import DOMAIN, ENERGY_HISTORY_FIELDS, LOGGER
29-
=======
3027
from homeassistant.util import dt as dt_util
3128

32-
from .const import ENERGY_HISTORY_FIELDS, LOGGER
33-
>>>>>>> theirs
29+
from .const import DOMAIN, ENERGY_HISTORY_FIELDS, LOGGER
3430
from .helpers import flatten
3531

3632
RETRY_EXCEPTIONS = (

‎homeassistant/components/teslemetry/translations/en.json‎

Lines changed: 73 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"end_time": "End time",
88
"end_time_description": "The time this schedule ends, e.g. 01:05 for 1:05 AM.",
99
"location_description": "The approximate location the vehicle must be at to use this schedule. Defaults to Home Assistant's configured location.",
10+
"not_available": "Not available",
1011
"one_time": "One-time",
1112
"one_time_description": "If this is a one-time schedule.",
1213
"precondition_time": "Precondition time",
@@ -18,7 +19,6 @@
1819
"schedule_name_description": "The name of the schedule.",
1920
"start_time": "Start time",
2021
"start_time_description": "The time this schedule begins, e.g. 01:05 for 1:05 AM.",
21-
"unavailable": "Unavailable",
2222
"vehicle": "Vehicle",
2323
"vehicle_to_remove_schedule": "Vehicle to remove schedule from.",
2424
"vehicle_to_schedule": "Vehicle to schedule.",
@@ -30,10 +30,13 @@
3030
"already_configured": "Account is already configured",
3131
"oauth_error": "Received invalid token data.",
3232
"oauth_failed": "Error while obtaining access token.",
33+
"oauth_implementation_unavailable": "No OAuth2 implementations are currently available.",
3334
"oauth_timeout": "Timeout resolving OAuth token.",
3435
"oauth_unauthorized": "OAuth authorization error while obtaining access token.",
3536
"reauth_account_mismatch": "The reauthentication account does not match the original account",
36-
"reauth_successful": "Re-authentication was successful"
37+
"reauth_successful": "Re-authentication was successful",
38+
"reconfigure_account_mismatch": "The reconfiguration account does not match the original account",
39+
"reconfigure_successful": "Reconfiguration was successful"
3740
},
3841
"error": {
3942
"cannot_connect": "Failed to connect",
@@ -269,6 +272,17 @@
269272
"name": "Wake"
270273
}
271274
},
275+
"calendar": {
276+
"charge_schedule_data_charge_schedules": {
277+
"name": "Charging schedule"
278+
},
279+
"tariff_content_v2": {
280+
"name": "Buy tariff"
281+
},
282+
"tariff_content_v2_sell_tariff": {
283+
"name": "Sell tariff"
284+
}
285+
},
272286
"climate": {
273287
"climate_state_cabin_overheat_protection": {
274288
"name": "Cabin overheat protection"
@@ -516,7 +530,13 @@
516530
}
517531
},
518532
"charge_state_conn_charge_cable": {
519-
"name": "Charge cable"
533+
"name": "Charge cable",
534+
"state": {
535+
"gb_ac": "GB/AC",
536+
"gb_dc": "GB/DC",
537+
"iec": "IEC",
538+
"sae": "SAE"
539+
}
520540
},
521541
"charge_state_est_battery_range": {
522542
"name": "Estimate battery range"
@@ -633,8 +653,8 @@
633653
"abort": "Abort",
634654
"enabled": "Enabled",
635655
"fault": "Fault",
636-
"standby": "Standby",
637-
"unavailable": "Unavailable"
656+
"not_available": "Not available",
657+
"standby": "Standby"
638658
}
639659
},
640660
"di_state_r": {
@@ -643,8 +663,8 @@
643663
"abort": "Abort",
644664
"enabled": "Enabled",
645665
"fault": "Fault",
646-
"standby": "Standby",
647-
"unavailable": "Unavailable"
666+
"not_available": "Not available",
667+
"standby": "Standby"
648668
}
649669
},
650670
"di_state_rel": {
@@ -653,8 +673,8 @@
653673
"abort": "Abort",
654674
"enabled": "Enabled",
655675
"fault": "Fault",
656-
"standby": "Standby",
657-
"unavailable": "Unavailable"
676+
"not_available": "Not available",
677+
"standby": "Standby"
658678
}
659679
},
660680
"di_state_rer": {
@@ -663,8 +683,8 @@
663683
"abort": "Abort",
664684
"enabled": "Enabled",
665685
"fault": "Fault",
666-
"standby": "Standby",
667-
"unavailable": "Unavailable"
686+
"not_available": "Not available",
687+
"standby": "Standby"
668688
}
669689
},
670690
"di_stator_temp_f": {
@@ -1029,9 +1049,6 @@
10291049
"vehicle_state_tpms_pressure_rr": {
10301050
"name": "Tire pressure rear right"
10311051
},
1032-
"version": {
1033-
"name": "Version"
1034-
},
10351052
"vin": {
10361053
"name": "Vehicle",
10371054
"state": {
@@ -1090,12 +1107,27 @@
10901107
}
10911108
},
10921109
"exceptions": {
1110+
"auth_failed": {
1111+
"message": "Authentication failed, please reauthenticate"
1112+
},
1113+
"auth_failed_invalid_token": {
1114+
"message": "Access token is invalid, please reauthenticate"
1115+
},
1116+
"auth_failed_migration": {
1117+
"message": "Failed to migrate to OAuth, please reauthenticate"
1118+
},
1119+
"auth_failed_subscription_required": {
1120+
"message": "Teslemetry subscription required"
1121+
},
10931122
"command_error": {
10941123
"message": "Command returned error: {error}"
10951124
},
10961125
"command_exception": {
10971126
"message": "Command returned exception: {message}"
10981127
},
1128+
"command_no_response": {
1129+
"message": "Command had no response"
1130+
},
10991131
"command_no_result": {
11001132
"message": "Command had no result"
11011133
},
@@ -1123,6 +1155,33 @@
11231155
"no_vehicle_data_for_device": {
11241156
"message": "No vehicle data for device ID: {device_id}"
11251157
},
1158+
"not_ready_api_error": {
1159+
"message": "Error communicating with Teslemetry API"
1160+
},
1161+
"not_ready_connection_error": {
1162+
"message": "Unable to connect to Teslemetry"
1163+
},
1164+
"oauth_implementation_not_available": {
1165+
"message": "OAuth implementation not available, try reauthenticating"
1166+
},
1167+
"set_scheduled_charging_time": {
1168+
"message": "Scheduled charging time is required when enabling"
1169+
},
1170+
"set_scheduled_departure_off_peak": {
1171+
"message": "Off-peak charging end time is required when enabling"
1172+
},
1173+
"set_scheduled_departure_preconditioning": {
1174+
"message": "Preconditioning departure time is required when enabling"
1175+
},
1176+
"token_data_malformed": {
1177+
"message": "Token data malformed, try reauthenticating"
1178+
},
1179+
"update_failed": {
1180+
"message": "Error fetching data from Teslemetry API"
1181+
},
1182+
"update_failed_invalid_data": {
1183+
"message": "Received invalid data from API"
1184+
},
11261185
"wake_up_failed": {
11271186
"message": "Failed to wake up vehicle: {message}"
11281187
},

0 commit comments

Comments
 (0)