GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2026-05-12 03:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

新加的能用了

Browse Source
This commit is contained in:
zogodo
2019-11-01 22:40:52 +08:00
parent 2e8691d2b6
commit e4db360d81
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
TC1/http_server/app_httpd.c
View File

@@ -65,7 +65,7 @@ exit:
static int HttpGetTc1Status(httpd_request_t *req) static int HttpGetTc1Status(httpd_request_t *req)
{ {
const unsigned char* sockets = GetSocketStatus(); const unsigned char* sockets = GetSocketStatus();
char* tc1_status = malloc(256); char* tc1_status = malloc(384);
sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode, sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode,
sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key, sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key,
ELAND_AP_SSID, ELAND_AP_KEY, "MQTT.ADDR", 1883, ip_status.ip, ip_status.mask, ip_status.gateway, time(NULL)); ELAND_AP_SSID, ELAND_AP_KEY, "MQTT.ADDR", 1883, ip_status.ip, ip_status.mask, ip_status.gateway, time(NULL));
@@ -108,7 +108,9 @@ static int HttpGetPowerInfo(httpd_request_t *req)
sscanf(buf, "%d", &idx); sscanf(buf, "%d", &idx);
char* powers = GetPowerRecord(idx); char* powers = GetPowerRecord(idx);
sprintf(power_info_json, POWER_INFO_JSON, power_record.idx, PW_NUM, powers); static int p_count = 0;
p_count += 1;
sprintf(power_info_json, POWER_INFO_JSON, power_record.idx, PW_NUM, p_count, powers);
send_http(power_info_json, strlen(power_info_json), exit, &err); send_http(power_info_json, strlen(power_info_json), exit, &err);
exit: exit:
return err; return err;

4
TC1/http_server/app_httpd.h
View File

@@ -56,10 +56,10 @@
'ip':'%s',\ 'ip':'%s',\
'mask':'%s',\ 'mask':'%s',\
'gateway':'%s',\ 'gateway':'%s',\
'start_time':%d\ 'start_time':%ld\
}" }"
#define POWER_INFO_JSON "{'idx':%d,'len':%d,'powers':[%s]}" #define POWER_INFO_JSON "{'idx':%d,'len':%d,'p_count':%d,'powers':[%s]}"
int AppHttpdStart(void); int AppHttpdStart(void);
int AppHttpdStop(); int AppHttpdStop();

2
TC1/http_server/web_data.c
View File

File diff suppressed because one or more lines are too long