mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-10 10:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pins and log

Browse Source
This commit is contained in:
openshwprojects
2022-04-17 03:47:06 +02:00
parent 8786b4eb41
commit 0ec2c400ef
3 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/httpserver/http_fns.c
View File

@ -80,16 +80,36 @@ int http_fn_empty_url(http_request_t *request) {
poststr(request, NULL);
return 0;
}
int h_isChannelPWM(int tg_ch){
int i;
for(i = 0; i < GPIO_MAX; i++) {
int ch = PIN_GetPinChannelForPinIndex(i);
if(tg_ch != ch)
continue;
int role = PIN_GetPinRoleForPinIndex(i);
if(role == IOR_PWM) {
return true;
}
}
return false;
}
int h_isChannelRelay(int tg_ch) {
int i;
for(i = 0; i < GPIO_MAX; i++) {
int ch = PIN_GetPinChannelForPinIndex(i);
if(tg_ch != ch)
continue;
int role = PIN_GetPinRoleForPinIndex(i);
if(role == IOR_Relay || role == IOR_Relay_n || role == IOR_LED || role == IOR_LED_n) {
return true;
}
}
return false;
}
int http_fn_index(http_request_t *request) {
int relayFlags;
int pwmFlags;
int j, i;
char tmpA[128];
relayFlags = 0;
pwmFlags = 0;
http_setup(request, httpMimeTypeHTML);
poststr(request,htmlHeader);
poststr(request,"<style>.r { background-color: red; } .g { background-color: green; }</style>");
@ -117,16 +137,7 @@ int http_fn_index(http_request_t *request) {
CHANNEL_Set(j,newPWMValue,1);
}
for(i = 0; i < GPIO_MAX; i++) {
int role = PIN_GetPinRoleForPinIndex(i);
int ch = PIN_GetPinChannelForPinIndex(i);
if(role == IOR_Relay || role == IOR_Relay_n || role == IOR_LED || role == IOR_LED_n) {
BIT_SET(relayFlags,ch);
}
if(role == IOR_PWM) {
BIT_SET(pwmFlags,ch);
}
}
for(i = 0; i < CHANNEL_MAX; i++) {
int channelType;
@ -164,7 +175,7 @@ int http_fn_index(http_request_t *request) {
hprintf128(request,"Humidity Channel %i value %f Percent<br>",i, fValue);
} else if(BIT_CHECK(relayFlags,i) || channelType == ChType_Toggle) {
} else if(h_isChannelRelay(i) || channelType == ChType_Toggle) {
const char *c;
if(CHANNEL_Check(i)) {
c = "r";
@ -175,7 +186,7 @@ int http_fn_index(http_request_t *request) {
hprintf128(request,"<input type=\"hidden\" name=\"tgl\" value=\"%i\">",i);
hprintf128(request,"<input class=\"%s\" type=\"submit\" value=\"Toggle %i\"/></form>",c,i);
}
else if(BIT_CHECK(pwmFlags,i)) {
else if(h_isChannelPWM(i)) {
int pwmValue;
pwmValue = CHANNEL_Get(i);
@ -818,8 +829,6 @@ int http_fn_cfg_quick(http_request_t *request) {
}
int http_fn_cfg_ha(http_request_t *request) {
int relayFlags = 0;
int pwmFlags = 0;
int relayCount = 0;
int pwmCount = 0;
const char *baseName;
@ -842,18 +851,16 @@ int http_fn_cfg_ha(http_request_t *request) {
int role = PIN_GetPinRoleForPinIndex(i);
int ch = PIN_GetPinChannelForPinIndex(i);
if(role == IOR_Relay || role == IOR_Relay_n || role == IOR_LED || role == IOR_LED_n) {
BIT_SET(relayFlags,ch);
relayCount++;
}
if(role == IOR_PWM) {
BIT_SET(pwmFlags,ch);
pwmCount++;
}
}
if(relayCount > 0) {
poststr(request,"switch:\n");
for(i = 0; i < CHANNEL_MAX; i++) {
if(BIT_CHECK(relayFlags,i)) {
if(h_isChannelRelay(i)) {
poststr(request," - platform: mqtt\n");
hprintf128(request," name: \"%s %i\"\n",baseName,i);
hprintf128(request," state_topic: \"%s/%i/get\"\n",baseName,i);
@ -869,7 +876,7 @@ int http_fn_cfg_ha(http_request_t *request) {
if(pwmCount > 0) {
poststr(request,"light:\n");
for(i = 0; i < CHANNEL_MAX; i++) {
if(BIT_CHECK(pwmFlags,i)) {
if(h_isChannelPWM(i)) {
poststr(request," - platform: mqtt\n");
hprintf128(request," name: \"%s %i\"\n",baseName,i);
hprintf128(request," state_topic: \"%s/%i/get\"\n",baseName,i);