mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-11 14:05:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

better html main page for case where we have both multiple relays and sensors

Browse Source
This commit is contained in:
openshwprojects
2023-04-10 10:13:54 +02:00
parent 813b9a3af9
commit fc863eb38a
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/httpserver/http_fns.c
View File

@ -155,6 +155,7 @@ int http_fn_index(http_request_t* request) {
int iValue;
bool bForceShowRGB;
const char* inputName;
int channelType;
bRawPWMs = CFG_HasFlag(OBK_FLAG_LED_RAWCHANNELSMODE);
bForceShowRGBCW = CFG_HasFlag(OBK_FLAG_LED_FORCESHOWRGBCWCONTROLLER);
@ -271,7 +272,6 @@ int http_fn_index(http_request_t* request) {
poststr(request, "<table>"); //Table default to 100% width in stylesheet
for (i = 0; i < CHANNEL_MAX; i++) {
int channelType;
channelType = CHANNEL_GetType(i);
// check ability to hide given channel from gui
@ -294,7 +294,45 @@ int http_fn_index(http_request_t* request) {
}
}
poststr(request, "</table>");
poststr(request, "<table>"); //Table default to 100% width in stylesheet
for (i = 0; i < CHANNEL_MAX; i++) {
// check ability to hide given channel from gui
if (BIT_CHECK(g_hiddenChannels, i)) {
continue; // hidden
}
channelType = CHANNEL_GetType(i);
if (h_isChannelRelay(i) || channelType == ChType_Toggle) {
const char* c;
const char *prefix;
if (i <= 1) {
hprintf255(request, "<tr>");
}
if (CHANNEL_Check(i)) {
c = "bgrn";
}
else {
c = "bred";
}
poststr(request, "<td><form action=\"index\">");
hprintf255(request, "<input type=\"hidden\" name=\"tgl\" value=\"%i\">", i);
if (CHANNEL_ShouldAddTogglePrefixToUI(i)) {
prefix = "Toggle ";
}
else {
prefix = "";
}
hprintf255(request, "<input class=\"%s\" type=\"submit\" value=\"%s%s\"/></form></td>", c, prefix, CHANNEL_GetLabel(i));
if (i == CHANNEL_MAX - 1) {
poststr(request, "</tr>");
}
}
}
poststr(request, "</table>");
poststr(request, "<table>"); //Table default to 100% width in stylesheet
for (i = 0; i < PLATFORM_GPIO_MAX; i++) {
int role;
@ -318,7 +356,6 @@ int http_fn_index(http_request_t* request) {
}
for (i = 0; i < CHANNEL_MAX; i++) {
int channelType;
// check ability to hide given channel from gui
if (BIT_CHECK(g_hiddenChannels, i)) {
@ -570,31 +607,7 @@ int http_fn_index(http_request_t* request) {
poststr(request, "</td></tr>");
}
else if (h_isChannelRelay(i) || channelType == ChType_Toggle) {
const char* c;
const char *prefix;
if (i <= 1) {
hprintf255(request, "<tr>");
}
if (CHANNEL_Check(i)) {
c = "bgrn";
}
else {
c = "bred";
}
poststr(request, "<td><form action=\"index\">");
hprintf255(request, "<input type=\"hidden\" name=\"tgl\" value=\"%i\">", i);
if (CHANNEL_ShouldAddTogglePrefixToUI(i)) {
prefix = "Toggle ";
}
else {
prefix = "";
}
hprintf255(request, "<input class=\"%s\" type=\"submit\" value=\"%s%s\"/></form></td>", c, prefix, CHANNEL_GetLabel(i));
if (i == CHANNEL_MAX - 1) {
poststr(request, "</tr>");
}
// HANDLED ABOVE in previous loop
}
else if ((bRawPWMs && h_isChannelPWM(i)) || (channelType == ChType_Dimmer) || (channelType == ChType_Dimmer256) || (channelType == ChType_Dimmer1000)) {
int maxValue;