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

前端显示版本号

Browse Source
This commit is contained in:
zogodo
2020-02-08 22:24:40 +08:00
parent 2cf0aba49e
commit fdd13c9441
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TC1/http_server/app_httpd.c
View File

@@ -105,10 +105,10 @@ 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(391); char* tc1_status = malloc(412);
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,
ap_name, ELAND_AP_KEY, "MQTT.ADDR", 1883, ip_status.ip, ip_status.mask, ip_status.gateway, 0L); ap_name, ELAND_AP_KEY, "MQTT.ADDR", 1883, VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, 0L);
OSStatus err = kNoErr; OSStatus err = kNoErr;
send_http(tc1_status, strlen(tc1_status), exit, &err); send_http(tc1_status, strlen(tc1_status), exit, &err);

1
TC1/http_server/app_httpd.h
View File

@@ -54,6 +54,7 @@
'ap_pwd':'%s',\ 'ap_pwd':'%s',\
'mqtt_addr':'%s',\ 'mqtt_addr':'%s',\
'mqtt_port':%d,\ 'mqtt_port':%d,\
'version':'%s',\
'ip':'%s',\ 'ip':'%s',\
'mask':'%s',\ 'mask':'%s',\
'gateway':'%s',\ 'gateway':'%s',\

10
TC1/http_server/index.html
View File

@@ -43,7 +43,7 @@
</head> </head>
<body> <body>
<fieldset class="socket"> <fieldset class="socket">
<legend>Power Controll</legend> <legend>Power Control</legend>
<table id="socket_tb"> <table id="socket_tb">
<tr> <tr>
<td> <td>
@@ -169,6 +169,10 @@
<fieldset class="connect"> <fieldset class="connect">
<legend>System Status</legend> <legend>System Status</legend>
<table> <table>
<tr>
<td class="right">Version:</td>
<td class="info" id="version"></td>
</tr>
<tr> <tr>
<td class="right">IP:</td> <td class="right">IP:</td>
<td class="info" id="ip"></td> <td class="info" id="ip"></td>
@@ -215,7 +219,7 @@
<th>On</th> <th>On</th>
</tr> </tr>
<tr> <tr>
<td colspan="4">Plese Sync</td> <td colspan="4">Please Sync</td>
</tr> </tr>
</table> </table>
<button onclick="GetTimedTask()">Sync</button> <button onclick="GetTimedTask()">Sync</button>
@@ -292,6 +296,7 @@ var mode_rd2 = document.getElementById("mode2");
var mqtt_addr_ipt = document.getElementById("mqtt_addr"); var mqtt_addr_ipt = document.getElementById("mqtt_addr");
var mqtt_port_ipt = document.getElementById("mqtt_port"); var mqtt_port_ipt = document.getElementById("mqtt_port");
var info_version = document.getElementById("version");
var info_ip = document.getElementById("ip"); var info_ip = document.getElementById("ip");
var info_mask = document.getElementById("mask"); var info_mask = document.getElementById("mask");
var info_gateway = document.getElementById("gateway"); var info_gateway = document.getElementById("gateway");
@@ -320,6 +325,7 @@ HttpGet("/status", function (re) {
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_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;

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

@@ -4,7 +4,7 @@
#include "mico.h" #include "mico.h"
#include "micokit_ext.h" #include "micokit_ext.h"
#define VERSION "v0.10.1" #define VERSION "v0.11.0"
#define TYPE 1 #define TYPE 1
#define TYPE_NAME "zTC1" #define TYPE_NAME "zTC1"

1
TODO.txt
View File

@@ -3,3 +3,4 @@
2. 添加定时任务 2. 添加定时任务
5. OTA固件升级 5. OTA固件升级
6. 登录 6. 登录
8. ota进度