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

Ch command for easier channel JSON access

Browse Source
This commit is contained in:
openshwprojects
2023-04-13 09:08:41 +02:00
parent 7fcc57dd32
commit 0541402e6d
2 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/httpserver/json_interface.c
View File

@ -460,6 +460,24 @@ static int http_tasmota_json_status_FWR(void* request, jsonCb_t printer) {
printer(request, "}");
return 0;
}
static int http_obk_json_channels(void* request, jsonCb_t printer) {
int i;
int iCnt = 0;
char tmp[8];
printer(request, "{");
for (i = 0; i < CHANNEL_MAX; i++) {
if (CHANNEL_IsInUse(i)) {
if (iCnt) {
printer(request, ",");
}
iCnt++;
sprintf(tmp, "Ch%i", i);
JSON_PrintKeyValue_Int(request, printer, tmp, CHANNEL_Get(i), false);
}
}
printer(request, "}");
}
// Test command: http://192.168.0.159/cm?cmnd=STATUS%204
static int http_tasmota_json_status_MEM(void* request, jsonCb_t printer) {
printer(request, "\"StatusMEM\":{");
@ -702,6 +720,7 @@ static int http_tasmota_json_status_generic(void* request, jsonCb_t printer) {
return 0;
}
int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, jsonCb_t printer, int flags) {
int i;
if (!wal_strnicmp(cmd, "POWER", 5)) {
@ -916,14 +935,14 @@ int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, js
}
else if (!wal_strnicmp(cmd, "SetChannelType", 14)) {
// OBK-specific
int i = atoi(arg);
i = atoi(arg);
i = CHANNEL_GetType(i);
printer(request, "%i", i);
}
else if (!wal_strnicmp(cmd, "GetChannel", 10) || !wal_strnicmp(cmd, "SetChannel", 10) || !wal_strnicmp(cmd, "AddChannel", 10)) {
// OBK-specific
int i = atoi(arg);
i = atoi(arg);
i = CHANNEL_Get(i);
printer(request, "%i", i);
@ -972,6 +991,9 @@ int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, js
printer(request, "\"Flags\":\"%ld\"", *((long int*)&g_cfg.genericFlags));
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "Ch", 2)) {
http_obk_json_channels(request, printer);
}
else {
printer(request, "{");
printer(request, "}");