Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored to use new Revenue function from EIB/PyCheckwatt #53

Merged
merged 9 commits into from
Jan 27, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Option for CRW name added
faanskit committed Jan 27, 2024
commit f20d0e52a574f38fb63c4b4a52cc115110f12d59
9 changes: 7 additions & 2 deletions custom_components/checkwatt/__init__.py
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
from .const import (
BASIC_TEST,
CONF_CM10_SENSOR,
CONF_CWR_NAME,
CONF_POWER_SENSORS,
CONF_PUSH_CW_TO_RANK,
CONF_UPDATE_INTERVAL_ALL,
@@ -177,6 +178,8 @@ async def _async_update_data(self) -> CheckwattResp: # noqa: C901
use_power_sensors = self._entry.options.get(CONF_POWER_SENSORS)
push_to_cw_rank = self._entry.options.get(CONF_PUSH_CW_TO_RANK)
use_cm10_sensor = self._entry.options.get(CONF_CM10_SENSOR)
cwr_name = self._entry.options.get(CONF_CWR_NAME)
_LOGGER.debug("Configured name for CheckWattRank: %s", cwr_name)

async with CheckwattManager(
username, password, INTEGRATION_NAME
@@ -256,7 +259,7 @@ async def _async_update_data(self) -> CheckwattResp: # noqa: C901
!= dt_util.start_of_local_day(self.last_cw_rank_push)
):
_LOGGER.debug("Pushing to CheckWattRank")
if await self.push_to_checkwatt_rank(cw_inst):
if await self.push_to_checkwatt_rank(cw_inst, cwr_name):
self.last_cw_rank_push = dt_util.now()

resp: CheckwattResp = {
@@ -378,7 +381,7 @@ async def _async_update_data(self) -> CheckwattResp: # noqa: C901
except CheckwattError as err:
raise UpdateFailed(str(err)) from err

async def push_to_checkwatt_rank(self, cw_inst):
async def push_to_checkwatt_rank(self, cw_inst, cwr_name):
"""Push data to CheckWattRank."""
if self.today_net_revenue is not None:
if (
@@ -401,6 +404,8 @@ async def push_to_checkwatt_rank(self, cw_inst):
}
if BASIC_TEST:
payload["display_name"] = "xxTESTxx"
elif cwr_name != "":
payload["display_name"] = cwr_name
else:
payload["display_name"] = cw_inst.customer_details["Meter"][0][
"DisplayName"
13 changes: 12 additions & 1 deletion custom_components/checkwatt/config_flow.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,13 @@
from homeassistant.data_entry_flow import FlowResult
from homeassistant.exceptions import HomeAssistantError

from .const import CONF_CM10_SENSOR, CONF_POWER_SENSORS, CONF_PUSH_CW_TO_RANK, DOMAIN
from .const import (
CONF_CM10_SENSOR,
CONF_CWR_NAME,
CONF_POWER_SENSORS,
CONF_PUSH_CW_TO_RANK,
DOMAIN,
)

CONF_TITLE = "CheckWatt"

@@ -74,6 +80,7 @@ async def async_step_user(
CONF_POWER_SENSORS: False,
CONF_PUSH_CW_TO_RANK: False,
CONF_CM10_SENSOR: True,
CONF_CWR_NAME: "",
},
)

@@ -120,6 +127,10 @@ async def async_step_init(
CONF_CM10_SENSOR,
default=self.config_entry.options.get(CONF_CM10_SENSOR),
): bool,
vol.Optional(
CONF_CWR_NAME,
default=self.config_entry.options.get(CONF_CWR_NAME),
): str,
}
),
)
1 change: 1 addition & 0 deletions custom_components/checkwatt/const.py
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
CONF_POWER_SENSORS: Final = "show_details"
CONF_PUSH_CW_TO_RANK: Final = "push_to_cw_rank"
CONF_CM10_SENSOR: Final = "cm10_sensor"
CONF_CWR_NAME: Final = "cwr_name"

# Misc
P_UNKNOWN = "Unknown"
3 changes: 2 additions & 1 deletion custom_components/checkwatt/strings.json
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@
"data": {
"show_details": "Provide energy sensors",
"push_to_cw_rank": "Push data to CheckWattRank",
"cm10_sensor": "Provide CM10 sensor"
"cm10_sensor": "Provide CM10 sensor",
"cwr_name": "System name for CheckWattRank"
},
"description": "Select options",
"title": "CheckWatt"
3 changes: 2 additions & 1 deletion custom_components/checkwatt/translations/en.json
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@
"data": {
"show_details": "Provide energy sensors",
"push_to_cw_rank": "Push data to CheckWattRank",
"cm10_sensor": "Provide CM10 sensor"
"cm10_sensor": "Provide CM10 sensor",
"cwr_name": "System name for CheckWattRank"
},
"description": "Select options",
"title": "CheckWatt"
3 changes: 2 additions & 1 deletion custom_components/checkwatt/translations/sv.json
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@
"data": {
"show_details": "Skapa energisensorer",
"push_to_cw_rank": "Skicka data till CheckWattRank",
"cm10_sensor": "Skapa CM10 sensor"
"cm10_sensor": "Skapa CM10 sensor",
"cwr_name": "Systemnamn till CheckWattRank"
},
"description": "Dina val",
"title": "CheckWatt"