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

Fix STATIC planner #55

Merged
merged 17 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
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
Rename to used_hours
  • Loading branch information
dala318 committed Dec 20, 2024
commit 0ba25d37689d2df634bff7f90ba96474870b92f7
4 changes: 2 additions & 2 deletions custom_components/nordpool_planner/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
CONF_DURATION_ENTITY,
CONF_END_TIME_ENTITY,
CONF_PRICES_ENTITY,
CONF_REMAINING_HOURS_ENTITY,
CONF_SEARCH_LENGTH_ENTITY,
CONF_START_TIME_ENTITY,
CONF_TYPE,
CONF_TYPE_MOVING,
CONF_TYPE_STATIC,
CONF_USED_HOURS_LOW_ENTITY,
DOMAIN,
)

Expand Down Expand Up @@ -138,7 +138,7 @@ def data_20_to_21(data: dict):

def data_21_to_22(data: dict):
if data[CONF_TYPE] == CONF_TYPE_STATIC:
data[CONF_REMAINING_HOURS_ENTITY] = True
data[CONF_USED_HOURS_LOW_ENTITY] = True
data[CONF_START_TIME_ENTITY] = True
return data

Expand Down
4 changes: 2 additions & 2 deletions custom_components/nordpool_planner/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
CONF_HIGH_COST_ENTITY,
CONF_LOW_COST_ENTITY,
CONF_PRICES_ENTITY,
CONF_REMAINING_HOURS_ENTITY,
CONF_SEARCH_LENGTH_ENTITY,
CONF_START_TIME_ENTITY,
CONF_STARTS_AT_ENTITY,
CONF_TYPE,
CONF_TYPE_LIST,
CONF_TYPE_MOVING,
CONF_TYPE_STATIC,
CONF_USED_HOURS_LOW_ENTITY,
DOMAIN,
)

Expand Down Expand Up @@ -59,7 +59,7 @@ async def async_step_user(
elif self.data[CONF_TYPE] == CONF_TYPE_STATIC:
self.data[CONF_START_TIME_ENTITY] = True
self.data[CONF_END_TIME_ENTITY] = True
self.data[CONF_REMAINING_HOURS_ENTITY] = True
self.data[CONF_USED_HOURS_LOW_ENTITY] = True

self.options = {}
np_entity = self.hass.states.get(self.data[CONF_PRICES_ENTITY])
Expand Down
2 changes: 1 addition & 1 deletion custom_components/nordpool_planner/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
CONF_END_TIME_ENTITY = "end_time_entity"
CONF_USED_TIME_RESET_ENTITY = "used_time_reset_entity"
CONF_START_TIME_ENTITY = "start_time_entity"
CONF_REMAINING_HOURS_ENTITY = "remaining_hours_entity"
CONF_USED_HOURS_LOW_ENTITY = "used_hours_low_entity"
23 changes: 9 additions & 14 deletions custom_components/nordpool_planner/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,21 @@
import logging

from homeassistant.components.sensor import (
RestoreSensor,
SensorDeviceClass,
SensorEntity,
SensorEntityDescription,
RestoreSensor,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
CONF_STATE,
STATE_UNAVAILABLE,
STATE_UNKNOWN,
EntityCategory,
)
from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, EntityCategory
from homeassistant.core import HomeAssistant

from . import NordpoolPlanner, NordpoolPlannerEntity
from .const import (
CONF_HIGH_COST_ENTITY,
CONF_LOW_COST_ENTITY,
CONF_REMAINING_HOURS_ENTITY,
CONF_STARTS_AT_ENTITY,
CONF_USED_HOURS_LOW_ENTITY,
DOMAIN,
)

Expand All @@ -47,8 +42,8 @@
device_class=SensorDeviceClass.TIMESTAMP,
)

REMAINING_HOURS_ENTITY_DESCRIPTION = SensorEntityDescription(
key=CONF_REMAINING_HOURS_ENTITY,
USED_HOURS_LOW_ENTITY_DESCRIPTION = SensorEntityDescription(
key=CONF_USED_HOURS_LOW_ENTITY,
device_class=SensorDeviceClass.DURATION,
entity_category=EntityCategory.DIAGNOSTIC,
)
Expand Down Expand Up @@ -79,11 +74,11 @@ async def async_setup_entry(
)
)

if config_entry.data.get(CONF_REMAINING_HOURS_ENTITY):
if config_entry.data.get(CONF_USED_HOURS_LOW_ENTITY):
entities.append(
NordpoolPlannerRemainingTimeSensor(
NordpoolPlannerUsedHoursSensor(
planner,
entity_description=REMAINING_HOURS_ENTITY_DESCRIPTION,
entity_description=USED_HOURS_LOW_ENTITY_DESCRIPTION,
)
)

Expand Down Expand Up @@ -170,7 +165,7 @@ def native_value(self):
# return state_attributes


class NordpoolPlannerRemainingTimeSensor(NordpoolPlannerSensor, RestoreSensor):
class NordpoolPlannerUsedHoursSensor(NordpoolPlannerSensor, RestoreSensor):
"""Start at specific sensor."""

async def async_added_to_hass(self) -> None:
Expand Down