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

Merge branch 'main' of https://github.com/openshwprojects/OpenBK7231T_App

Browse Source
This commit is contained in:
openshwprojects
2022-02-19 15:04:57 +01:00
parent 6876a5a7be 77d5ad31a9
commit fa972be4eb
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/httpserver/new_http.c
View File

@ -300,6 +300,9 @@ typedef struct template_s {
template_t g_templates [] = {
{ Setup_Device_Empty, "Empty"},
// BK7231N devices
{ Setup_Device_BK7231N_CB2S_QiachipSmartSwitch, "[BK7231N][CB2S] QiaChip Smart Switch"},
// BK7231T devices
{ Setup_Device_TuyaWL_SW01_16A, "WL SW01 16A"},
{ Setup_Device_TuyaSmartLife4CH10A, "Smart Life 4CH 10A"},
{ Setup_Device_IntelligentLife_NF101A, "Intelligent Life NF101A"},

23
src/httpserver/rest_interface.c
View File

@ -17,6 +17,7 @@
extern UINT32 flash_read(char *user_buf, UINT32 count, UINT32 address);
static int http_rest_error(http_request_t *request, int code, char *msg);
static int http_rest_get(http_request_t *request);
static int http_rest_post(http_request_t *request);
@ -580,7 +581,6 @@ static int http_rest_post_pins(http_request_t *request){
char *json_str = request->bodystart;
int json_len = strlen(json_str);
http_setup(request, httpMimeTypeText);
memset(p, 0, sizeof(jsmn_parser));
memset(t, 0, sizeof(jsmntok_t)*128);
@ -589,22 +589,18 @@ static int http_rest_post_pins(http_request_t *request){
if (r < 0) {
ADDLOG_ERROR(LOG_FEATURE_API, "Failed to parse JSON: %d", r);
sprintf(tmp,"Failed to parse JSON: %d\n", r);
poststr(request, tmp);
poststr(request, NULL);
os_free(p);
os_free(t);
return 0;
return http_rest_error(request, 400, tmp);
}
/* Assume the top-level element is an object */
if (r < 1 || t[0].type != JSMN_OBJECT) {
ADDLOG_ERROR(LOG_FEATURE_API, "Object expected", r);
sprintf(tmp,"Object expected\n");
poststr(request, tmp);
poststr(request, NULL);
os_free(p);
os_free(t);
return 0;
return http_rest_error(request, 400, tmp);
}
/* Loop over all keys of the root object */
@ -618,9 +614,9 @@ static int http_rest_post_pins(http_request_t *request){
int roleval, pr;
jsmntok_t *g = &t[i + j + 2];
roleval = atoi(json_str + g->start);
pr = PIN_GetPinRoleForPinIndex(i);
pr = PIN_GetPinRoleForPinIndex(j);
if(pr != roleval) {
PIN_SetPinRoleForPinIndex(i,roleval);
PIN_SetPinRoleForPinIndex(j,roleval);
iChanged++;
}
}
@ -648,18 +644,23 @@ static int http_rest_post_pins(http_request_t *request){
}
if (iChanged){
PIN_SaveToFlash();
ADDLOG_DEBUG(LOG_FEATURE_API, "Changed %d - saved to flash", iChanged);
}
poststr(request, NULL);
os_free(p);
os_free(t);
return http_rest_error(request, 200, "OK");
return 0;
}
static int http_rest_error(http_request_t *request, int code, char *msg){
request->responseCode = HTTP_RESPONSE_SERVER_ERROR;
http_setup(request, httpMimeTypeJson);
hprintf128(request, "{\"error\":%d, \"msg\"=\"%s\"}", code, msg);
if (code != 200){
hprintf128(request, "{\"error\":%d, \"msg\":\"%s\"}", code, msg);
} else {
hprintf128(request, "{\"success\":%d, \"msg\":\"%s\"}", code, msg);
}
poststr(request,NULL);
return 0;
}