jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Mood light options and startpage from 1

Browse Source
This commit is contained in:
fvanroie 2021-01-29 21:03:39 +01:00
parent 6020d6479b
commit d6a40b8fd2
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/svc/hasp_http.cpp
View File

@ -1279,6 +1279,12 @@ void webHandleGpioConfig()
// case HASP_GPIO_LED_INVERTED: // case HASP_GPIO_LED_INVERTED:
httpMessage += F("Led"); httpMessage += F("Led");
break; break;
case HASP_GPIO_LED_R:
case HASP_GPIO_LED_G:
case HASP_GPIO_LED_B:
// case HASP_GPIO_LED_INVERTED:
httpMessage += F("Mood ");
break;
case HASP_GPIO_RELAY: case HASP_GPIO_RELAY:
// case HASP_GPIO_RELAY_INVERTED: // case HASP_GPIO_RELAY_INVERTED:
httpMessage += F("Relay"); httpMessage += F("Relay");
@ -1291,6 +1297,18 @@ void webHandleGpioConfig()
httpMessage += F("Unknown"); httpMessage += F("Unknown");
} }
switch(conf.type & 0xfe) {
case HASP_GPIO_LED_R:
httpMessage += F("Red");
break;
case HASP_GPIO_LED_G:
httpMessage += F("Green");
break;
case HASP_GPIO_LED_B:
httpMessage += F("Blue");
break;
}
httpMessage += F("</td><td>"); httpMessage += F("</td><td>");
httpMessage += conf.group; httpMessage += conf.group;
httpMessage += F("</td><td>"); httpMessage += F("</td><td>");
@ -1382,6 +1400,15 @@ void webHandleGpioOptions()
selected = (conf.type == HASP_GPIO_LED) || (conf.type == HASP_GPIO_LED_INVERTED); selected = (conf.type == HASP_GPIO_LED) || (conf.type == HASP_GPIO_LED_INVERTED);
httpMessage += getOption(HASP_GPIO_LED, F("Led"), selected); httpMessage += getOption(HASP_GPIO_LED, F("Led"), selected);
selected = (conf.type == HASP_GPIO_LED_R) || (conf.type == HASP_GPIO_LED_R_INVERTED);
httpMessage += getOption(HASP_GPIO_LED_R, F("Mood Red"), selected);
selected = (conf.type == HASP_GPIO_LED_G) || (conf.type == HASP_GPIO_LED_G_INVERTED);
httpMessage += getOption(HASP_GPIO_LED_G, F("Mood Green"), selected);
selected = (conf.type == HASP_GPIO_LED_B) || (conf.type == HASP_GPIO_LED_B_INVERTED);
httpMessage += getOption(HASP_GPIO_LED_B, F("Mood Blue"), selected);
selected = (conf.type == HASP_GPIO_RELAY) || (conf.type == HASP_GPIO_RELAY_INVERTED); selected = (conf.type == HASP_GPIO_RELAY) || (conf.type == HASP_GPIO_RELAY_INVERTED);
httpMessage += getOption(HASP_GPIO_RELAY, F("Relay"), selected); httpMessage += getOption(HASP_GPIO_RELAY, F("Relay"), selected);
@ -1568,7 +1595,7 @@ void webHandleHaspConfig()
httpMessage += settings[FPSTR(F_CONFIG_PAGES)].as<String>(); httpMessage += settings[FPSTR(F_CONFIG_PAGES)].as<String>();
httpMessage += F("'></br><b>Startup Page</b> <i><small>(required)</small></i><input id='startpage' required " httpMessage += F("'></br><b>Startup Page</b> <i><small>(required)</small></i><input id='startpage' required "
"name='startpage' type='number' min='0' max='3' value='"); "name='startpage' type='number' min='1' max='4' value='");
httpMessage += settings[FPSTR(F_CONFIG_STARTPAGE)].as<String>(); httpMessage += settings[FPSTR(F_CONFIG_STARTPAGE)].as<String>();
httpMessage += httpMessage +=
F("'></p><p><b>Startup Brightness</b> <i><small>(required)</small></i><input id='startpage' required " F("'></p><p><b>Startup Brightness</b> <i><small>(required)</small></i><input id='startpage' required "