h3n3/NSPanel_HA_Blueprint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change button bar state when relay changes with local control

Browse Source 
Solves #1904
This commit is contained in:
Edward Firmo
2024-03-20 20:31:20 +01:00
parent a3f54d5c43
commit ad8cc7788b
1 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
esphome/nspanel_esphome_core.yaml
View File

@@ -1582,12 +1582,16 @@ switch:
restore_mode: RESTORE_DEFAULT_OFF restore_mode: RESTORE_DEFAULT_OFF
on_turn_on: on_turn_on:
then: then:
- lambda: - lambda: |-
if (id(relay_settings) & RelaySettings::Relay1_Local)
update_bitwise_setting(id(buttons_settings), true, ButtonSettings::ButtonLeft_State);
refresh_relays->execute(1); refresh_relays->execute(1);
refresh_hardware_buttons_bars->execute(1); refresh_hardware_buttons_bars->execute(1);
on_turn_off: on_turn_off:
then: then:
- lambda: - lambda: |-
if (id(relay_settings) & RelaySettings::Relay1_Local)
update_bitwise_setting(id(buttons_settings), false, ButtonSettings::ButtonLeft_State);
refresh_relays->execute(1); refresh_relays->execute(1);
refresh_hardware_buttons_bars->execute(1); refresh_hardware_buttons_bars->execute(1);
##### PHYSICAL SWITCH 2 ###### ##### PHYSICAL SWITCH 2 ######
@@ -1599,12 +1603,16 @@ switch:
restore_mode: RESTORE_DEFAULT_OFF restore_mode: RESTORE_DEFAULT_OFF
on_turn_on: on_turn_on:
then: then:
- lambda: - lambda: |-
if (id(relay_settings) & RelaySettings::Relay2_Local)
update_bitwise_setting(id(buttons_settings), true, ButtonSettings::ButtonRight_State);
refresh_relays->execute(2); refresh_relays->execute(2);
refresh_hardware_buttons_bars->execute(2); refresh_hardware_buttons_bars->execute(2);
on_turn_off: on_turn_off:
then: then:
- lambda: - lambda: |-
if (id(relay_settings) & RelaySettings::Relay2_Local)
update_bitwise_setting(id(buttons_settings), false, ButtonSettings::ButtonRight_State);
refresh_relays->execute(2); refresh_relays->execute(2);
refresh_hardware_buttons_bars->execute(2); refresh_hardware_buttons_bars->execute(2);
@@ -2451,56 +2459,32 @@ script:
switch (int(display_mode->state)) { switch (int(display_mode->state)) {
case 1: // EU model case 1: // EU model
if (button_mask & 1 and id(buttons_settings) & ButtonSettings::ButtonLeft_Enabled) { // Left button if (button_mask & 1 and id(buttons_settings) & ButtonSettings::ButtonLeft_Enabled) { // Left button
disp1->fill_area(48, 307, 118, 3, disp1->fill_area(48, 307, 118, 3, (id(buttons_settings) & ButtonSettings::ButtonLeft_State) ? id(buttons_color_on) : id(buttons_color_off));
(((id(relay_settings) & RelaySettings::Relay1_Local) and relay_1->state) or (id(buttons_settings) & ButtonSettings::ButtonLeft_State)) ? disp1->fill_area(47, 308, 120, 1, (id(buttons_settings) & ButtonSettings::ButtonLeft_State) ? id(buttons_color_on) : id(buttons_color_off));
id(buttons_color_on) : id(buttons_color_off));
disp1->fill_area(47, 308, 120, 1,
(((id(relay_settings) & RelaySettings::Relay1_Local) and relay_1->state) or (id(buttons_settings) & ButtonSettings::ButtonLeft_State)) ?
id(buttons_color_on) : id(buttons_color_off));
} }
if (button_mask & 2 and id(buttons_settings) & ButtonSettings::ButtonRight_Enabled) { // Right button if (button_mask & 2 and id(buttons_settings) & ButtonSettings::ButtonRight_Enabled) { // Right button
disp1->fill_area(289, 307, 118, 3, disp1->fill_area(289, 307, 118, 3, (id(buttons_settings) & ButtonSettings::ButtonRight_State) ? id(buttons_color_on) : id(buttons_color_off));
(((id(relay_settings) & RelaySettings::Relay2_Local) and relay_2->state) or (id(buttons_settings) & ButtonSettings::ButtonRight_State)) ? disp1->fill_area(288, 308, 120, 1, (id(buttons_settings) & ButtonSettings::ButtonRight_State) ? id(buttons_color_on) : id(buttons_color_off));
id(buttons_color_on) : id(buttons_color_off));
disp1->fill_area(288, 308, 120, 1,
(((id(relay_settings) & RelaySettings::Relay2_Local) and relay_2->state) or (id(buttons_settings) & ButtonSettings::ButtonRight_State)) ?
id(buttons_color_on) : id(buttons_color_off));
} }
break; break;
case 2: // US Portrait case 2: // US Portrait
if (button_mask & 1 and id(buttons_settings) & ButtonSettings::ButtonLeft_Enabled) { // Left button if (button_mask & 1 and id(buttons_settings) & ButtonSettings::ButtonLeft_Enabled) { // Left button
disp1->fill_area(17, 466, 118, 3, disp1->fill_area(17, 466, 118, 3, (id(buttons_settings) & ButtonSettings::ButtonLeft_State) ? id(buttons_color_on) : id(buttons_color_off));
(((id(relay_settings) & RelaySettings::Relay1_Local) and relay_1->state) or (id(buttons_settings) & ButtonSettings::ButtonLeft_State)) ? disp1->fill_area(16, 467, 120, 1, (id(buttons_settings) & ButtonSettings::ButtonLeft_State) ? id(buttons_color_on) : id(buttons_color_off));
id(buttons_color_on) : id(buttons_color_off));
disp1->fill_area(16, 467, 120, 1,
(((id(relay_settings) & RelaySettings::Relay1_Local) and relay_1->state) or (id(buttons_settings) & ButtonSettings::ButtonLeft_State)) ?
id(buttons_color_on) : id(buttons_color_off));
} }
if (button_mask & 2 and id(buttons_settings) & ButtonSettings::ButtonRight_Enabled) { // Right button if (button_mask & 2 and id(buttons_settings) & ButtonSettings::ButtonRight_Enabled) { // Right button
disp1->fill_area(184, 466, 118, 3, disp1->fill_area(184, 466, 118, 3, (id(buttons_settings) & ButtonSettings::ButtonRight_State) ? id(buttons_color_on) : id(buttons_color_off));
(((id(relay_settings) & RelaySettings::Relay2_Local) and relay_2->state) or (id(buttons_settings) & ButtonSettings::ButtonRight_State)) ? disp1->fill_area(183, 467, 120, 1, (id(buttons_settings) & ButtonSettings::ButtonRight_State) ? id(buttons_color_on) : id(buttons_color_off));
id(buttons_color_on) : id(buttons_color_off));
disp1->fill_area(183, 467, 120, 1,
(((id(relay_settings) & RelaySettings::Relay2_Local) and relay_2->state) or (id(buttons_settings) & ButtonSettings::ButtonRight_State)) ?
id(buttons_color_on) : id(buttons_color_off));
} }
break; break;
case 3: // US Landscape case 3: // US Landscape
if (button_mask & 1 and id(buttons_settings) & ButtonSettings::ButtonLeft_Enabled) { // Left button if (button_mask & 1 and id(buttons_settings) & ButtonSettings::ButtonLeft_Enabled) { // Left button
disp1->fill_area(467, 174, 3, 118, disp1->fill_area(467, 174, 3, 118, (id(buttons_settings) & ButtonSettings::ButtonLeft_State) ? id(buttons_color_on) : id(buttons_color_off));
(((id(relay_settings) & RelaySettings::Relay1_Local) and relay_1->state) or (id(buttons_settings) & ButtonSettings::ButtonLeft_State)) ? disp1->fill_area(468, 173, 1, 120, (id(buttons_settings) & ButtonSettings::ButtonLeft_State) ? id(buttons_color_on) : id(buttons_color_off));
id(buttons_color_on) : id(buttons_color_off));
disp1->fill_area(468, 173, 1, 120,
(((id(relay_settings) & RelaySettings::Relay1_Local) and relay_1->state) or (id(buttons_settings) & ButtonSettings::ButtonLeft_State)) ?
id(buttons_color_on) : id(buttons_color_off));
} }
if (button_mask & 2 and id(buttons_settings) & ButtonSettings::ButtonRight_Enabled) { // Right button if (button_mask & 2 and id(buttons_settings) & ButtonSettings::ButtonRight_Enabled) { // Right button
disp1->fill_area(467, 28, 3, 118, disp1->fill_area(467, 28, 3, 118, (id(buttons_settings) & ButtonSettings::ButtonRight_State) ? id(buttons_color_on) : id(buttons_color_off));
(((id(relay_settings) & RelaySettings::Relay2_Local) and relay_2->state) or (id(buttons_settings) & ButtonSettings::ButtonRight_State)) ? disp1->fill_area(468, 27, 1, 120, (id(buttons_settings) & ButtonSettings::ButtonRight_State) ? id(buttons_color_on) : id(buttons_color_off));
id(buttons_color_on) : id(buttons_color_off));
disp1->fill_area(468, 27, 1, 120,
(((id(relay_settings) & RelaySettings::Relay2_Local) and relay_2->state) or (id(buttons_settings) & ButtonSettings::ButtonRight_State)) ?
id(buttons_color_on) : id(buttons_color_off));
} }
break; break;
} }