GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-12 21:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并web请求

Browse Source
This commit is contained in:
zogodo
2020-02-17 21:42:41 +08:00
parent ac6ca89c6e
commit a6ec6cb8c0
5 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
TC1/http_server/app_httpd.c
View File

@@ -51,7 +51,7 @@
static bool is_http_init; static bool is_http_init;
static bool is_handlers_registered; static bool is_handlers_registered;
struct httpd_wsgi_call g_app_handlers[]; struct httpd_wsgi_call g_app_handlers[];
char power_info_json[1536] = { 0 }; char power_info_json[1548] = { 0 };
char up_time[16] = "00:00:00"; char up_time[16] = "00:00:00";
/* /*
@@ -158,7 +158,8 @@ static int HttpGetPowerInfo(httpd_request_t *req)
sprintf(up_time, "%d:%02d:%02d", h, m, s); sprintf(up_time, "%d:%02d:%02d", h, m, s);
char* powers = GetPowerRecord(idx); char* powers = GetPowerRecord(idx);
sprintf(power_info_json, POWER_INFO_JSON, power_record.idx, PW_NUM, p_count, powers, up_time); char* sockets = GetSocketStatus();
sprintf(power_info_json, POWER_INFO_JSON, sockets, power_record.idx, PW_NUM, p_count, powers, up_time);
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;

2
TC1/http_server/app_httpd.h
View File

@@ -59,7 +59,7 @@
'start_time':%ld\ 'start_time':%ld\
}" }"
#define POWER_INFO_JSON "{'idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s'}" #define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s'}"
int AppHttpdStart(void); int AppHttpdStart(void);
int AppHttpdStop(); int AppHttpdStop();

48
TC1/http_server/index.html
View File

@@ -306,32 +306,28 @@ var ap_pswd = "";
var station_name = ""; var station_name = "";
var station_pswd = ""; var station_pswd = "";
function GetTc1Status() { HttpGet("/status", function (re) {
HttpGet("/status", function (re) { var status = JSON.parse(re);
var status = JSON.parse(re); var status_arr = status.sockets.split(",");
var status_arr = status.sockets.split(","); for (var i = 0; i < status_arr.length; i++) {
for (var i = 0; i < status_arr.length; i++) { checkboxs[i].checked = status_arr[i] == "1";
checkboxs[i].checked = status_arr[i] == "1"; }
station_name = status.station_ssid; station_name = status.station_ssid;
station_pswd = status.station_pwd; station_pswd = status.station_pwd;
ap_name = status.ap_ssid; ap_name = status.ap_ssid;
ap_pswd = status.ap_pwd; ap_pswd = status.ap_pwd;
//mode = status.mode; //mode = status.mode;
ChangeMode(status.mode); ChangeMode(status.mode);
mqtt_addr_ipt.value = status.mqtt_addr; mqtt_addr_ipt.value = status.mqtt_addr;
mqtt_port_ipt.value = status.mqtt_port; mqtt_port_ipt.value = status.mqtt_port;
info_version.innerHTML = status.version; info_version.innerHTML = status.version;
info_ip.innerHTML = status.ip; info_ip.innerHTML = status.ip;
info_mask.innerHTML = status.mask; info_mask.innerHTML = status.mask;
info_gateway.innerHTML = status.gateway; info_gateway.innerHTML = status.gateway;
uptime.innerHTML = status.start_time; uptime.innerHTML = status.start_time;
} });
window.setTimeout(GetTc1Status, 3000);
});
}
GetTc1Status();
var power_idx = 0; var power_idx = 0;
var position = 0; var position = 0;
@@ -354,6 +350,10 @@ function GetPowerRecord() {
var w_v = (17.1 * power.p_count) / 1000 / 36000; var w_v = (17.1 * power.p_count) / 1000 / 36000;
w.innerHTML = w_v.toFixed(2); //累加功率 w.innerHTML = w_v.toFixed(2); //累加功率
uptime.innerHTML = power.up_time; uptime.innerHTML = power.up_time;
var status_arr = power.sockets.split(",");
for (var i = 0; i < status_arr.length; i++) {
checkboxs[i].checked = status_arr[i] == "1";
}
window.setTimeout(GetPowerRecord, 3000); window.setTimeout(GetPowerRecord, 3000);
}, power_idx.toString()); }, power_idx.toString());
} }

2
TC1/http_server/web_data.c
View File

File diff suppressed because one or more lines are too long

2
TC1/main.h
View File

@@ -13,7 +13,7 @@
#define mqtt_log(M, ...) do { custom_log("MQTT", M, ##__VA_ARGS__); web_log("MQTT", M, ##__VA_ARGS__) } while(0) #define mqtt_log(M, ...) do { custom_log("MQTT", M, ##__VA_ARGS__); web_log("MQTT", M, ##__VA_ARGS__) } while(0)
#define wifi_log(M, ...) do { custom_log("WIFI", M, ##__VA_ARGS__); web_log("WIFI", M, ##__VA_ARGS__) } while(0) #define wifi_log(M, ...) do { custom_log("WIFI", M, ##__VA_ARGS__); web_log("WIFI", M, ##__VA_ARGS__) } while(0)
#define VERSION "v1.0.15" #define VERSION "v1.0.16"
#define TYPE 1 #define TYPE 1
#define TYPE_NAME "zTC1" #define TYPE_NAME "zTC1"