Skip to content

Commit

Permalink
Translations and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Bre77 committed Feb 4, 2024
1 parent a1fea61 commit 810a8b2
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 25 deletions.
25 changes: 14 additions & 11 deletions custom_components/teslemetry/binary_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from .entity import (
TeslemetryVehicleEntity,
TeslemetryEnergyLiveEntity,
TeslemetryEnergyInfoEntity
TeslemetryEnergyInfoEntity,
)
from .models import TeslemetryVehicleData, TeslemetryEnergyData

Expand Down Expand Up @@ -143,12 +143,8 @@ class TeslemetryBinarySensorEntityDescription(BinarySensorEntityDescription):
)

ENERGY_LIVE_DESCRIPTIONS: tuple[TeslemetryBinarySensorEntityDescription, ...] = (
TeslemetryBinarySensorEntityDescription(
key="backup_capable"
),
TeslemetryBinarySensorEntityDescription(
key="grid_services_active"
),
TeslemetryBinarySensorEntityDescription(key="backup_capable"),
TeslemetryBinarySensorEntityDescription(key="grid_services_active"),
)


Expand Down Expand Up @@ -186,7 +182,8 @@ async def async_setup_entry(
for description in ENERGY_INFO_DESCRIPTIONS
)

class TeslemetryBinarySensorEntity():

class TeslemetryBinarySensorEntity:
"""Base class for all Teslemetry binary sensors"""

entity_description: TeslemetryBinarySensorEntityDescription
Expand All @@ -211,13 +208,19 @@ def available(self) -> bool:
return super().available and self.has()


class TeslemetryVehicleBinarySensorEntity(TeslemetryBinarySensorEntity, TeslemetryVehicleEntity, BinarySensorEntity):
class TeslemetryVehicleBinarySensorEntity(
TeslemetryBinarySensorEntity, TeslemetryVehicleEntity, BinarySensorEntity
):
"""Base class for Teslemetry vehicle binary sensors."""


class TeslemetryEnergyLiveBinarySensorEntity(TeslemetryBinarySensorEntity, TeslemetryEnergyLiveEntity, BinarySensorEntity):
class TeslemetryEnergyLiveBinarySensorEntity(
TeslemetryBinarySensorEntity, TeslemetryEnergyLiveEntity, BinarySensorEntity
):
"""Base class for Teslemetry energy live binary sensors."""


class TeslemetryEnergyInfoBinarySensorEntity(TeslemetryBinarySensorEntity, TeslemetryEnergyInfoEntity, BinarySensorEntity):
class TeslemetryEnergyInfoBinarySensorEntity(
TeslemetryBinarySensorEntity, TeslemetryEnergyInfoEntity, BinarySensorEntity
):
"""Base class for Teslemetry energy info binary sensors."""
19 changes: 10 additions & 9 deletions custom_components/teslemetry/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,7 @@ class TeslemetrySensorEntityDescription(SensorEntityDescription):
suggested_display_precision=2,
device_class=SensorDeviceClass.POWER,
),
SensorEntityDescription(
key="island_status"
),

SensorEntityDescription(key="island_status"),
)

WALL_CONNECTOR_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
Expand Down Expand Up @@ -403,7 +400,7 @@ async def async_setup_entry(
)


class TeslemetrySensorEntity(SensorEntity):
class TeslemetrySensorEntity:
"""Base class for all Teslemetry sensors."""

entity_description: TeslemetrySensorEntityDescription
Expand All @@ -419,7 +416,9 @@ def available(self) -> bool:
return super().available and self.has()


class TeslemetryVehicleSensorEntity(TeslemetryVehicleEntity, TeslemetrySensorEntity):
class TeslemetryVehicleSensorEntity(
TeslemetrySensorEntity, TeslemetryVehicleEntity, SensorEntity
):
"""Base class for Teslemetry vehicle metric sensors."""

def __init__(
Expand All @@ -442,7 +441,7 @@ def available(self) -> bool:


class TeslemetryEnergyLiveSensorEntity(
TeslemetryEnergyLiveEntity, TeslemetrySensorEntity
TeslemetrySensorEntity, TeslemetryEnergyLiveEntity, SensorEntity
):
"""Base class for Teslemetry energy site metric sensors."""

Expand All @@ -457,7 +456,7 @@ def __init__(


class TeslemetryWallConnectorSensorEntity(
TeslemetryWallConnectorEntity, TeslemetrySensorEntity
TeslemetrySensorEntity, TeslemetryWallConnectorEntity, SensorEntity
):
"""Base class for Teslemetry energy site metric sensors."""

Expand Down Expand Up @@ -488,7 +487,9 @@ def available(self) -> bool:
)


class TeslemetryEnergyInfoSensorEntity(TeslemetryEnergyInfoEntity, SensorEntity):
class TeslemetryEnergyInfoSensorEntity(
TeslemetrySensorEntity, TeslemetryEnergyInfoEntity, SensorEntity
):
"""Base class for Teslemetry energy site metric sensors."""

def __init__(
Expand Down
7 changes: 2 additions & 5 deletions custom_components/teslemetry/switch.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from .const import DOMAIN
from .entity import (
TeslemetryVehicleEntity,
TeslemetryEnergyInfoEntity
)
from .entity import TeslemetryVehicleEntity, TeslemetryEnergyInfoEntity
from .models import TeslemetryVehicleData, TeslemetryEnergyData


Expand Down Expand Up @@ -88,7 +85,7 @@ class TeslemetrySwitchEntityDescription(SwitchEntityDescription):
scopes=[Scopes.ENERGY_CMDS],
),
TeslemetrySwitchEntityDescription(
key="user_settings_storm_mode_enabled", #this is also in the live data as storm_mode_enabled
key="user_settings_storm_mode_enabled", # this is also in the live data as storm_mode_enabled
on_func=lambda api: api.storm_mode(enabled=True),
off_func=lambda api: api.storm_mode(enabled=False),
scopes=[Scopes.ENERGY_CMDS],
Expand Down
27 changes: 27 additions & 0 deletions custom_components/teslemetry/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,18 @@
},
"vehicle_state_tpms_soft_warning_rr": {
"name": "Tire pressure warning rear right"
},
"backup_capable":{
"name": "Backup capable"
},
"grid_services_active":{
"name": "Grid services active"
},
"components_disallow_charge_from_grid_with_solar_installed":{
"name": "Disallow charge from grid with solar"
},
"components_grid_services_enabled":{
"name": "Grid services enabled"
}
},
"button": {
Expand Down Expand Up @@ -183,6 +195,12 @@
},
"vehicle_state_speed_limit_mode_current_limit_mph": {
"name": "Speed limit"
},
"backup_reserve_percent": {
"name": "Backup reserve"
},
"off_grid_vehicle_charging_reserve": {
"name": "Off grid reserve"
}
},
"select": {
Expand Down Expand Up @@ -397,6 +415,15 @@
},
"wall_connector_state": {
"name": "State"
},
"island_status":{
"name": "Island status"
},
"vpp_backup_reserve_percent":{
"name": "VPP backup reserve"
},
"version":{
"name": "Version"
}
},
"switch": {
Expand Down

0 comments on commit 810a8b2

Please sign in to comment.