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

led_map interface, allow getting command results in old post command api

Browse Source
This commit is contained in:
openshwprojects
2023-03-17 15:24:07 +01:00
parent 69621200e0
commit 1e508c064d
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/httpserver/json_interface.c
View File

@ -879,7 +879,17 @@ int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, js
printer(request, "\"SSID1\":\"%s\"", CFG_GetWiFiSSID());
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "LED_Map", 7)) {
printer(request, "{");
printer(request, "\"Map\":[%i,%i,%i,%i,%i]",
(int)g_cfg.ledRemap.r, (int)g_cfg.ledRemap.g, (int)g_cfg.ledRemap.b, (int)g_cfg.ledRemap.c, (int)g_cfg.ledRemap.w);
printer(request, "}");
}
else {
printer(request, "{");
printer(request, "}");
}
return 0;
}

29
src/httpserver/rest_interface.c
View File

@ -1681,13 +1681,38 @@ static int http_rest_post_channels(http_request_t* request) {
}
static int http_rest_post_cmd(http_request_t* request) {
commandResult_t res;
int code;
const char *reply;
const char *type;
const char* cmd = request->bodystart;
res = CMD_ExecuteCommand(cmd, COMMAND_FLAG_SOURCE_CONSOLE);
reply = CMD_GetResultString(res);
if (1) {
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "[WebApp Cmd '%s' Result] %s", cmd, CMD_GetResultString(res));
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "[WebApp Cmd '%s' Result] %s", cmd, reply);
}
return http_rest_error(request, 200, "OK");
if (res != CMD_RES_OK) {
type = "error";
if (res == CMD_RES_UNKNOWN_COMMAND) {
code = 501;
}
else {
code = 400;
}
}
else {
type = "success";
code = 200;
}
request->responseCode = code;
http_setup(request, httpMimeTypeJson);
hprintf255(request, "{\"%s\":%d, \"msg\":\"%s\", \"res\":", type, code, reply);
JSON_ProcessCommandReply(cmd, skipToNextWord(cmd), request, (jsonCb_t)hprintf255, COMMAND_FLAG_SOURCE_HTTP);
hprintf255(request, "}", code, reply);
poststr(request, NULL);
return 0;
}