oneil1987/TX-Ultimate-Easy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lint

Browse Source
This commit is contained in:
Edward Firmo
2024-12-20 18:13:02 +01:00
parent b1b1a40d5e
commit ffe0d56576
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
View File

@@ -819,11 +819,15 @@ script:
break; break;
case 4: // 3 Gang case 4: // 3 Gang
if (is_model_us) { if (is_model_us) {
id(gb_lights_1) = { light_us_rl_1_4_left, light_us_rl_2_4_left, light_us_rl_3_4_left, light_us_rl_4_4_left }; id(gb_lights_1) = { light_us_rl_1_4_left, light_us_rl_2_4_left,
id(gb_lights_2) = { light_us_rl_1_4_right, light_us_rl_2_4_right, light_us_rl_3_4_right, light_us_rl_4_4_right }; light_us_rl_3_4_left, light_us_rl_4_4_left };
id(gb_lights_2) = { light_us_rl_1_4_right, light_us_rl_2_4_right,
light_us_rl_3_4_right, light_us_rl_4_4_right };
} else { } else {
id(gb_lights_1) = { light_eu_rl_1_4_bottom, light_eu_rl_2_4_bottom, light_eu_rl_3_4_bottom, light_eu_rl_4_4_bottom }; id(gb_lights_1) = { light_eu_rl_1_4_bottom, light_eu_rl_2_4_bottom,
id(gb_lights_2) = { light_eu_rl_1_4_top, light_eu_rl_2_4_top, light_eu_rl_3_4_top, light_eu_rl_4_4_top }; light_eu_rl_3_4_bottom, light_eu_rl_4_4_bottom };
id(gb_lights_2) = { light_eu_rl_1_4_top, light_eu_rl_2_4_top,
light_eu_rl_3_4_top, light_eu_rl_4_4_top };
} }
break; break;
} }
@@ -840,7 +844,7 @@ script:
static const uint32_t LIGHT_TRANSITION_TURN_OFF = ${LIGHT_TRANSITION_TURN_OFF}; static const uint32_t LIGHT_TRANSITION_TURN_OFF = ${LIGHT_TRANSITION_TURN_OFF};
static const uint8_t LIGHT_BRIGHTNESS_TURN_ON = ${LIGHT_BRIGHTNESS_TURN_ON}; static const uint8_t LIGHT_BRIGHTNESS_TURN_ON = ${LIGHT_BRIGHTNESS_TURN_ON};
ESP_LOGI("core_hw_leds.light_set_state", "Setting light group %d, index %d to state %s", ESP_LOGI("core_hw_leds.light_set_state", "Setting light group %d, index %d to state %s",
light_group, light_index, state ? "ON" : "OFF"); light_group, light_index, state ? "ON" : "OFF");
switch (light_group) { switch (light_group) {

13
ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
View File

@@ -148,8 +148,9 @@ script:
- lambda: |- - lambda: |-
const bool is_model_us = sl_tx_model_format->active_index().has_value() and const bool is_model_us = sl_tx_model_format->active_index().has_value() and
sl_tx_model_format->active_index().value() == 1; sl_tx_model_format->active_index().value() == 1;
const uint8_t num_gangs = (sl_tx_model_gang->active_index().has_value()) ? const uint8_t num_gangs = (sl_tx_model_gang->active_index().has_value())
(sl_tx_model_gang->active_index().value() + 1) : 0; ? (sl_tx_model_gang->active_index().value() + 1)
: 0;
if (num_gangs < 1 || num_gangs > 4) { if (num_gangs < 1 || num_gangs > 4) {
ESP_LOGE("core_hw_relays", "Invalid number of gangs: %" PRIu8, num_gangs); ESP_LOGE("core_hw_relays", "Invalid number of gangs: %" PRIu8, num_gangs);
@@ -171,25 +172,25 @@ script:
case 0: case 0:
relay_state = id(sw_relay_1).state; relay_state = id(sw_relay_1).state;
light_mode = is_model_us light_mode = is_model_us
? id(sl_relay_1_light_mode_us)->state ? id(sl_relay_1_light_mode_us)->state
: id(sl_relay_1_light_mode_eu)->state; : id(sl_relay_1_light_mode_eu)->state;
break; break;
case 1: case 1:
relay_state = id(sw_relay_2).state; relay_state = id(sw_relay_2).state;
light_mode = is_model_us light_mode = is_model_us
? id(sl_relay_2_light_mode_us)->state ? id(sl_relay_2_light_mode_us)->state
: id(sl_relay_2_light_mode_eu)->state; : id(sl_relay_2_light_mode_eu)->state;
break; break;
case 2: case 2:
relay_state = id(sw_relay_3).state; relay_state = id(sw_relay_3).state;
light_mode = is_model_us light_mode = is_model_us
? id(sl_relay_3_light_mode_us)->state ? id(sl_relay_3_light_mode_us)->state
: id(sl_relay_3_light_mode_eu)->state; : id(sl_relay_3_light_mode_eu)->state;
break; break;
case 3: case 3:
relay_state = id(sw_relay_4).state; relay_state = id(sw_relay_4).state;
light_mode = is_model_us light_mode = is_model_us
? id(sl_relay_4_light_mode_us)->state ? id(sl_relay_4_light_mode_us)->state
: id(sl_relay_4_light_mode_eu)->state; : id(sl_relay_4_light_mode_eu)->state;
break; break;
} }