mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-28 05:36:37 +00:00
Rename L8-HD (EU) and L8-HD (AU)
This commit is contained in:
parent
290b2da8b6
commit
3ba3fedc66
@ -302,12 +302,12 @@ static void gpio_setup_pin(uint8_t index)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER:
|
case hasp_gpio_type_t::SERIAL_DIMMER:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_AU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_EU: {
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED: {
|
||||||
const char command[9] = "\xEF\x01\x4D\xA3"; // Start Lanbon Dimmer
|
const char command[9] = "\xEF\x01\x4D\xA3"; // Start Lanbon Dimmer
|
||||||
#if defined(ARDUINO_ARCH_ESP32)
|
#if defined(ARDUINO_ARCH_ESP32)
|
||||||
Serial1.begin(115200UL, SERIAL_8N1, UART_PIN_NO_CHANGE, gpio->pin,
|
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.flush();
|
||||||
Serial1.write(0x20);
|
Serial1.write(0x20);
|
||||||
Serial1.write(0x20);
|
Serial1.write(0x20);
|
||||||
@ -428,8 +428,8 @@ void gpio_output_state(hasp_gpio_config_t* gpio)
|
|||||||
break;
|
break;
|
||||||
case LED:
|
case LED:
|
||||||
case SERIAL_DIMMER:
|
case SERIAL_DIMMER:
|
||||||
case SERIAL_DIMMER_AU:
|
case SERIAL_DIMMER_L8_HD:
|
||||||
case SERIAL_DIMMER_EU:
|
case SERIAL_DIMMER_L8_HD_INVERTED:
|
||||||
dispatch_state_brightness(topic, (hasp_event_t)gpio->power, gpio->val);
|
dispatch_state_brightness(topic, (hasp_event_t)gpio->power, gpio->val);
|
||||||
break;
|
break;
|
||||||
default:
|
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);
|
return gpio_set_dac_value(gpio);
|
||||||
|
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER:
|
case hasp_gpio_type_t::SERIAL_DIMMER:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_AU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_EU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED:
|
||||||
return gpio_set_serial_dimmer(gpio);
|
return gpio_set_serial_dimmer(gpio);
|
||||||
|
|
||||||
default:
|
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::HASP_DAC:
|
||||||
case hasp_gpio_type_t::PWM:
|
case hasp_gpio_type_t::PWM:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER:
|
case hasp_gpio_type_t::SERIAL_DIMMER:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_AU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_EU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED:
|
||||||
if(value.max == 1) {
|
if(value.max == 1) {
|
||||||
val = gpio->val; // only switch power, keep current val
|
val = gpio->val; // only switch power, keep current val
|
||||||
} else {
|
} 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::HASP_DAC:
|
||||||
case hasp_gpio_type_t::LED: // Don't include the moodlight
|
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:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_AU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD:
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_EU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED:
|
||||||
dimmer.add(gpioConfig[i].pin);
|
dimmer.add(gpioConfig[i].pin);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -90,8 +90,8 @@ enum hasp_gpio_type_t {
|
|||||||
PWM = 0x21,
|
PWM = 0x21,
|
||||||
HASP_DAC = 0x22,
|
HASP_DAC = 0x22,
|
||||||
SERIAL_DIMMER = 0x30,
|
SERIAL_DIMMER = 0x30,
|
||||||
SERIAL_DIMMER_EU = 0x31,
|
SERIAL_DIMMER_L8_HD_INVERTED = 0x31,
|
||||||
SERIAL_DIMMER_AU = 0x32,
|
SERIAL_DIMMER_L8_HD = 0x32,
|
||||||
BUZZER = 0x40,
|
BUZZER = 0x40,
|
||||||
HAPTIC = 0x41,
|
HAPTIC = 0x41,
|
||||||
|
|
||||||
|
@ -1734,11 +1734,11 @@ static void webHandleGpioConfig()
|
|||||||
// case hasp_gpio_type_t::SERIAL_DIMMER:
|
// case hasp_gpio_type_t::SERIAL_DIMMER:
|
||||||
// httpMessage += F(D_GPIO_SERIAL_DIMMER);
|
// httpMessage += F(D_GPIO_SERIAL_DIMMER);
|
||||||
// break;
|
// break;
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_EU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED:
|
||||||
httpMessage += F("L8-HD (EU)");
|
httpMessage += F("L8-HD (inv.)");
|
||||||
break;
|
break;
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_AU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD:
|
||||||
httpMessage += F("L8-HD (AU)");
|
httpMessage += F("L8-HD");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
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::HASP_DAC, F(D_GPIO_DAC), conf.type);
|
||||||
// httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER, F(D_GPIO_SERIAL_DIMMER), conf.type);
|
// httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER, F(D_GPIO_SERIAL_DIMMER), conf.type);
|
||||||
#if defined(LANBONL8)
|
#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_L8_HD, F("L8-HD"), 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_INVERTED, F("L8-HD (inv.)"), conf.type);
|
||||||
#endif
|
#endif
|
||||||
if(digitalPinHasPWM(webServer.arg(0).toInt())) {
|
if(digitalPinHasPWM(webServer.arg(0).toInt())) {
|
||||||
httpMessage += getOption(hasp_gpio_type_t::PWM, F(D_GPIO_PWM), conf.type);
|
httpMessage += getOption(hasp_gpio_type_t::PWM, F(D_GPIO_PWM), conf.type);
|
||||||
|
@ -1565,11 +1565,11 @@ void webHandleGpioConfig(AsyncWebServerRequest* request)
|
|||||||
// case hasp_gpio_type_t::SERIAL_DIMMER:
|
// case hasp_gpio_type_t::SERIAL_DIMMER:
|
||||||
// httpMessage += F(D_GPIO_SERIAL_DIMMER);
|
// httpMessage += F(D_GPIO_SERIAL_DIMMER);
|
||||||
// break;
|
// break;
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_EU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED:
|
||||||
httpMessage += F("L8-HD (EU)");
|
httpMessage += F("L8-HD");
|
||||||
break;
|
break;
|
||||||
case hasp_gpio_type_t::SERIAL_DIMMER_AU:
|
case hasp_gpio_type_t::SERIAL_DIMMER_L8_HD:
|
||||||
httpMessage += F("L8-HD (AU)");
|
httpMessage += F("L8-HD (inv.)");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
@ -1680,11 +1680,11 @@ void webHandleGpioOutput(AsyncWebServerRequest* request)
|
|||||||
// httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER, F(D_GPIO_SERIAL_DIMMER), selected);
|
// httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER, F(D_GPIO_SERIAL_DIMMER), selected);
|
||||||
|
|
||||||
#if defined(LANBONL8)
|
#if defined(LANBONL8)
|
||||||
selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_AU);
|
selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_L8_HD);
|
||||||
httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_AU, F("L8-HD (AU)"), selected);
|
httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_L8_HD, F("L8-HD"), selected);
|
||||||
|
|
||||||
selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_EU);
|
selected = (conf.type == hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED);
|
||||||
httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_EU, F("L8-HD (EU)"), selected);
|
httpMessage += getOption(hasp_gpio_type_t::SERIAL_DIMMER_L8_HD_INVERTED, F("L8-HD (inv.)"), selected);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(digitalPinHasPWM(request->arg((size_t)0).toInt())) {
|
if(digitalPinHasPWM(request->arg((size_t)0).toInt())) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user