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.

Sign up for GitHub

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

Add required step param to OpenthermNumber to prevent error on HA restart #15

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add required step param to OpenthermNumber to prevent error on HA restart #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd6d971
Add step param to OpenthermNumber
ov1d1u Mar 17, 2023
35abe30
Import NotRequired from typing
ov1d1u Nov 16, 2023
b499b4f
Merge pull request #1 from ov1d1u/dev
ov1d1u Nov 17, 2023
cc7aad0
Update __init__.py
Bugracer Mar 26, 2024
2e9bfb4
Fix for negative outside temp
SebuZet Nov 29, 2023
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
2 changes: 1 addition & 1 deletion components/opentherm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ async def to_code(config: Dict[str, Any]) -> None:
generate.define_readers(const.INPUT_SENSOR, input_sensors)
generate.add_messages(var, input_sensors, schema.INPUTS)

cg.add_library("ihormelnyk/OpenTherm Library", "1.1.3")
cg.add_library("ihormelnyk/OpenTherm Library", "1.1.4")
4 changes: 2 additions & 2 deletions components/opentherm/hub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ namespace message_data {
uint16_t parse_u16(const unsigned long response) { return (uint16_t) (response & 0xffff); }
int16_t parse_s16(const unsigned long response) { return (int16_t) (response & 0xffff); }
float parse_f88(const unsigned long response) {
unsigned int data = response & 0xffff;
return (data & 0x8000) ? -(0x10000L - data) / 256.0f : data / 256.0f;
int32_t data = response & 0xffff;
return (data & 0x8000)? -(0x10000 - data) / 256.0f : data / 256.0f;
}

unsigned int write_flag8_lb_0(const bool value, const unsigned int data) { return value ? data | 0b0000000000000001 : data & 0b1111111111111110; }
Expand Down
3 changes: 3 additions & 0 deletions components/opentherm/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
CONF_max_value = "max_value"
CONF_auto_min_value = "auto_min_value"
CONF_auto_max_value = "auto_max_value"
CONF_step = "step"

OpenthermInput = generate.opentherm_ns.class_("OpenthermInput")

Expand All @@ -26,6 +27,8 @@ def input_schema(entity: schema.InputSchema) -> cv.Schema:
schema = schema.extend({ cv.Optional(CONF_auto_min_value, False): cv.boolean })
if CONF_auto_max_value in entity:
schema = schema.extend({ cv.Optional(CONF_auto_max_value, False): cv.boolean })
if CONF_step in entity:
schema = schema.extend({ cv.Optional(CONF_step, False): cv.float_ })
schema = schema.add_extra(validate_min_value_less_than_max_value)
return schema

Expand Down
7 changes: 4 additions & 3 deletions components/opentherm/number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import number
from esphome.const import CONF_ID, CONF_UNIT_OF_MEASUREMENT
from esphome.const import CONF_ID, CONF_UNIT_OF_MEASUREMENT, CONF_STEP

from . import const, schema, validate, input, generate

Expand All @@ -15,15 +15,16 @@
async def new_openthermnumber(config: Dict[str, Any]) -> cg.Pvariable:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
await number.register_number(var, config, min_value = config[input.CONF_min_value], max_value = config[input.CONF_max_value])
await number.register_number(var, config, min_value = config[input.CONF_min_value], max_value = config[input.CONF_max_value], step = config[input.CONF_step])
input.generate_setters(var, config)
return var

def get_entity_validation_schema(entity: schema.InputSchema) -> cv.Schema:
return number.NUMBER_SCHEMA \
.extend({
cv.GenerateID(): cv.declare_id(OpenthermNumber),
cv.Optional(CONF_UNIT_OF_MEASUREMENT, entity["unit_of_measurement"]): cv.string_strict
cv.Optional(CONF_UNIT_OF_MEASUREMENT, entity["unit_of_measurement"]): cv.string_strict,
cv.Optional(CONF_STEP, entity["step"]): cv.float_,
}) \
.extend(input.input_schema(entity)) \
.extend(cv.COMPONENT_SCHEMA)
Expand Down
12 changes: 10 additions & 2 deletions components/opentherm/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# This file contains a schema for all supported sensors, binary sensors and
# inputs of the OpenTherm component.

from typing import Dict, Generic, Tuple, TypeVar, TypedDict
from typing_extensions import NotRequired
from typing import Dict, Generic, Tuple, TypeVar, TypedDict, NotRequired

from esphome.const import (
UNIT_CELSIUS,
Expand Down Expand Up @@ -476,6 +475,7 @@ class AutoConfigure(TypedDict):

class InputSchema(EntitySchema):
unit_of_measurement: str
step: float
range: Tuple[int, int]
auto_max_value: NotRequired[AutoConfigure]
auto_min_value: NotRequired[AutoConfigure]
Expand All @@ -484,6 +484,7 @@ class InputSchema(EntitySchema):
"t_set": InputSchema({
"description": "Control setpoint: temperature setpoint for the boiler's supply water",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "TSet",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -493,6 +494,7 @@ class InputSchema(EntitySchema):
"t_set_ch2": InputSchema({
"description": "Control setpoint 2: temperature setpoint for the boiler's supply water on the second heating circuit",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "TsetCH2",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -502,6 +504,7 @@ class InputSchema(EntitySchema):
"cooling_control": InputSchema({
"description": "Cooling control signal",
"unit_of_measurement": UNIT_PERCENT,
"step": 1.0,
"message": "CoolingControl",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -510,6 +513,7 @@ class InputSchema(EntitySchema):
"t_dhw_set": InputSchema({
"description": "Domestic hot water temperature setpoint",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "TdhwSet",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -520,6 +524,7 @@ class InputSchema(EntitySchema):
"max_t_set": InputSchema({
"description": "Maximum allowable CH water setpoint",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "MaxTSet",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -530,6 +535,7 @@ class InputSchema(EntitySchema):
"t_room_set": InputSchema({
"description": "Current room temperature setpoint (informational)",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "TrSet",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -538,6 +544,7 @@ class InputSchema(EntitySchema):
"t_room_set_ch2": InputSchema({
"description": "Current room temperature setpoint on CH2 (informational)",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "TrSetCH2",
"keep_updated": True,
"message_data": "f88",
Expand All @@ -546,6 +553,7 @@ class InputSchema(EntitySchema):
"t_room": InputSchema({
"description": "Current sensed room temperature (informational)",
"unit_of_measurement": UNIT_CELSIUS,
"step": 0.1,
"message": "Tr",
"keep_updated": True,
"message_data": "f88",
Expand Down