From 3ba3fedc669703cd0cd359e7a072824a38b33f01 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Tue, 25 Oct 2022 18:34:43 +0200 Subject: [PATCH] Rename L8-HD (EU) and L8-HD (AU) --- src/sys/gpio/hasp_gpio.cpp | 22 +++++++++++----------- src/sys/gpio/hasp_gpio.h | 4 ++-- src/sys/svc/hasp_http.cpp | 12 ++++++------ src/sys/svc/hasp_http_async.cpp | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/sys/gpio/hasp_gpio.cpp b/src/sys/gpio/hasp_gpio.cpp index 15f18397..f712f9c2 100644 --- a/src/sys/gpio/hasp_gpio.cpp +++ b/src/sys/gpio/hasp_gpio.cpp @@ -302,12 +302,12 @@ static void gpio_setup_pin(uint8_t index) break; case hasp_gpio_type_t::SERIAL_DIMMER: - case hasp_gpio_type_t::SERIAL_DIMMER_AU: - case hasp_gpio_type_t::SERIAL_DIMMER_EU: { + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: { const char command[9] = "\xEF\x01\x4D\xA3"; // Start Lanbon Dimmer #if defined(ARDUINO_ARCH_ESP32) Serial1.begin(115200UL, SERIAL_8N1, UART_PIN_NO_CHANGE, gpio->pin, - gpio->type == hasp_gpio_type_t::SERIAL_DIMMER_EU); // true = EU, false = AU + gpio->type == hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED); // true = EU, false = AU Serial1.flush(); Serial1.write(0x20); Serial1.write(0x20); @@ -428,8 +428,8 @@ void gpio_output_state(hasp_gpio_config_t* gpio) break; case LED: case SERIAL_DIMMER: - case SERIAL_DIMMER_AU: - case SERIAL_DIMMER_EU: + case SERIAL_DIMMER_L8_HD: + case SERIAL_DIMMER_L8_HD_INVERTED: dispatch_state_brightness(topic, (hasp_event_t)gpio->power, gpio->val); break; default: @@ -592,8 +592,8 @@ static bool gpio_set_output_value(hasp_gpio_config_t* gpio, bool power, uint16_t return gpio_set_dac_value(gpio); case hasp_gpio_type_t::SERIAL_DIMMER: - case hasp_gpio_type_t::SERIAL_DIMMER_AU: - case hasp_gpio_type_t::SERIAL_DIMMER_EU: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: return gpio_set_serial_dimmer(gpio); default: @@ -623,8 +623,8 @@ static void gpio_set_normalized_value(hasp_gpio_config_t* gpio, hasp_update_valu case hasp_gpio_type_t::HASP_DAC: case hasp_gpio_type_t::PWM: case hasp_gpio_type_t::SERIAL_DIMMER: - case hasp_gpio_type_t::SERIAL_DIMMER_AU: - case hasp_gpio_type_t::SERIAL_DIMMER_EU: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: if(value.max == 1) { val = gpio->val; // only switch power, keep current val } else { @@ -831,8 +831,8 @@ void gpio_discovery(JsonObject& input, JsonArray& relay, JsonArray& light, JsonA case hasp_gpio_type_t::HASP_DAC: case hasp_gpio_type_t::LED: // Don't include the moodlight case hasp_gpio_type_t::SERIAL_DIMMER: - case hasp_gpio_type_t::SERIAL_DIMMER_AU: - case hasp_gpio_type_t::SERIAL_DIMMER_EU: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD: + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: dimmer.add(gpioConfig[i].pin); break; diff --git a/src/sys/gpio/hasp_gpio.h b/src/sys/gpio/hasp_gpio.h index c68a8405..3240bb09 100644 --- a/src/sys/gpio/hasp_gpio.h +++ b/src/sys/gpio/hasp_gpio.h @@ -90,8 +90,8 @@ enum hasp_gpio_type_t { PWM = 0x21, HASP_DAC = 0x22, SERIAL_DIMMER = 0x30, - SERIAL_DIMMER_EU = 0x31, - SERIAL_DIMMER_AU = 0x32, + SERIAL_DIMMER_L8_HD_INVERTED = 0x31, + SERIAL_DIMMER_L8_HD = 0x32, BUZZER = 0x40, HAPTIC = 0x41, diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index 795137b3..2b65e45d 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -1734,11 +1734,11 @@ static void webHandleGpioConfig() // case hasp_gpio_type_t::SERIAL_DIMMER: // httpMessage += F(D_GPIO_SERIAL_DIMMER); // break; - case hasp_gpio_type_t::SERIAL_DIMMER_EU: - httpMessage += F("L8-HD (EU)"); + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: + httpMessage += F("L8-HD (inv.)"); break; - case hasp_gpio_type_t::SERIAL_DIMMER_AU: - httpMessage += F("L8-HD (AU)"); + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD: + httpMessage += F("L8-HD"); break; #endif default: @@ -1822,8 +1822,8 @@ static void webHandleGpioOutput() httpMessage += getOption(hasp_gpio_type_t::HASP_DAC, F(D_GPIO_DAC), conf.type); // httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER, F(D_GPIO_SERIAL_DIMMER), conf.type); #if defined(LANBONL8) - httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_AU, F("L8-HD (AU)"), conf.type); - httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_EU, F("L8-HD (EU)"), conf.type); + httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_L8_HD, F("L8-HD"), conf.type); + httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED, F("L8-HD (inv.)"), conf.type); #endif if(digitalPinHasPWM(webServer.arg(0).toInt())) { httpMessage += getOption(hasp_gpio_type_t::PWM, F(D_GPIO_PWM), conf.type); diff --git a/src/sys/svc/hasp_http_async.cpp b/src/sys/svc/hasp_http_async.cpp index 2dd292c7..482a26fa 100644 --- a/src/sys/svc/hasp_http_async.cpp +++ b/src/sys/svc/hasp_http_async.cpp @@ -1565,11 +1565,11 @@ void webHandleGpioConfig(AsyncWebServerRequest* request) // case hasp_gpio_type_t::SERIAL_DIMMER: // httpMessage += F(D_GPIO_SERIAL_DIMMER); // break; - case hasp_gpio_type_t::SERIAL_DIMMER_EU: - httpMessage += F("L8-HD (EU)"); + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: + httpMessage += F("L8-HD"); break; - case hasp_gpio_type_t::SERIAL_DIMMER_AU: - httpMessage += F("L8-HD (AU)"); + case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD: + httpMessage += F("L8-HD (inv.)"); break; #endif default: @@ -1680,11 +1680,11 @@ void webHandleGpioOutput(AsyncWebServerRequest* request) // httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER, F(D_GPIO_SERIAL_DIMMER), selected); #if defined(LANBONL8) - selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_AU); - httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_AU, F("L8-HD (AU)"), selected); + selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_L8_HD); + httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_L8_HD, F("L8-HD"), selected); - selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_EU); - httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_EU, F("L8-HD (EU)"), selected); + selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED); + httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED, F("L8-HD (inv.)"), selected); #endif if(digitalPinHasPWM(request->arg((size_t)0).toInt())) {