Skip to content
Merged

fixes #3794

Show file tree
Hide file tree
Changes from all commits
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
12 changes: 6 additions & 6 deletions data/config/mosquitto/public/default-dynamic-security.json
Original file line number Diff line number Diff line change
Expand Up @@ -1099,19 +1099,19 @@
},
{
"acltype": "publishClientSend",
"topic": "openWB/set/general/consumer/config/switch_on_delay",
"topic": "openWB/set/general/chargemode_config/surplus/consumer/switch_on_delay",
"priority": 0,
"allow": true
},
{
"acltype": "publishClientSend",
"topic": "openWB/set/general/consumer/config/switch_off_delay",
"topic": "openWB/set/general/chargemode_config/surplus/consumer/switch_off_delay",
"priority": 0,
"allow": true
},
{
"acltype": "publishClientSend",
"topic": "openWB/set/general/consumer/config/switch_off_threshold",
"topic": "openWB/set/general/chargemode_config/surplus/consumer/switch_off_threshold",
"priority": 0,
"allow": true
},
Expand Down Expand Up @@ -1177,19 +1177,19 @@
},
{
"acltype": "publishClientReceive",
"topic": "openWB/general/consumer/config/switch_on_delay",
"topic": "openWB/general/chargemode_config/surplus/consumer/switch_on_delay",
"priority": 0,
"allow": true
},
{
"acltype": "publishClientReceive",
"topic": "openWB/general/consumer/config/switch_off_delay",
"topic": "openWB/general/chargemode_config/surplus/consumer/switch_off_delay",
"priority": 0,
"allow": true
},
{
"acltype": "publishClientReceive",
"topic": "openWB/general/consumer/config/switch_off_threshold",
"topic": "openWB/general/chargemode_config/surplus/consumer/switch_off_threshold",
"priority": 0,
"allow": true
}
Expand Down
12 changes: 6 additions & 6 deletions packages/helpermodules/update_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ class UpdateConfig:
"^openWB/general/chargemode_config/bat/power_reserve$",
"^openWB/general/chargemode_config/bat/power_reserve_active$",
"^openWB/general/chargemode_config/surplus/vehicle/retry_failed_phase_switches$",
"^openWB/general/consumer/config/switch_on_delay$",
"^openWB/general/consumer/config/switch_off_delay$",
"^openWB/general/consumer/config/switch_off_threshold$",
"^openWB/general/chargemode_config/surplus/consumer/switch_on_delay$",
"^openWB/general/chargemode_config/surplus/consumer/switch_off_delay$",
"^openWB/general/chargemode_config/surplus/consumer/switch_off_threshold$",
# obsolet, Daten hieraus müssen nach prices/ überführt werden
"^openWB/general/price_kwh$",
"^openWB/general/prices/bat$",
Expand Down Expand Up @@ -663,11 +663,11 @@ class UpdateConfig:
("openWB/general/chargemode_config/surplus/vehicle/phase_switch_delay", 7),
("openWB/general/chargemode_config/surplus/vehicle/retry_failed_phase_switches",
ChargemodeConfigSurplusVehicle().retry_failed_phase_switches),
("openWB/general/chargemode_config/surplus/consumer/switch_on_delay", 60),
("openWB/general/chargemode_config/surplus/consumer/switch_off_delay", 60),
("openWB/general/chargemode_config/surplus/consumer/switch_off_threshold", 0),
("openWB/general/chargemode_config/unbalanced_load", False),
("openWB/general/chargemode_config/unbalanced_load_limit", 18),
("openWB/general/consumer/config/switch_on_delay", 60),
("openWB/general/consumer/config/switch_off_delay", 60),
("openWB/general/consumer/config/switch_off_threshold", 0),
("openWB/general/control_interval", 10),
("openWB/general/extern", False),
("openWB/general/extern_display_mode", "primary"),
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/consumers/askoma/askoheat/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __init__(self,
@auto_str
class Askoheat(ConsumerSetup[AskoheatConfiguration]):
def __init__(self,
name: str = "Askoheat",
name: str = "Askoheat+",
type: str = "askoheat",
id: int = 0,
configuration: AskoheatConfiguration = None,
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/consumers/lambda_/lambda_/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def __init__(self,
class Lambda(ConsumerSetup[LambdaConfiguration]):
def __init__(self,
name: str = "Lambda Wärmepumpe",
type: str = "lambda",
type: str = "lambda_",
id: int = 0,
configuration: LambdaConfiguration = None,
usage: Tuple[ConsumerUsage, ...] = (ConsumerUsage.SUSPENDABLE_TUNABLE,
Expand Down