From 47d76f95673236a53a7cf21675172e3e83d1d1d1 Mon Sep 17 00:00:00 2001 From: zogodo <742782908@qq.com> Date: Thu, 10 Oct 2019 23:30:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=E5=85=AC=E5=8A=9F=E7=8E=87OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TC1/http_server/app_httpd.c | 1 - TC1/main.c | 2 +- TC1/user_power.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c index e4d944e..4b84b0c 100644 --- a/TC1/http_server/app_httpd.c +++ b/TC1/http_server/app_httpd.c @@ -109,7 +109,6 @@ static int HttpGetPowerInfo(httpd_request_t *req) char* powers = GetPowerRecord(idx); sprintf(power_info_json, POWER_INFO_JSON, power_record.idx, PW_NUM, powers); - power_record.idx++; //test send_http(power_info_json, strlen(power_info_json), exit, &err); exit: return err; diff --git a/TC1/main.c b/TC1/main.c index 1891560..6f536bf 100644 --- a/TC1/main.c +++ b/TC1/main.c @@ -161,7 +161,7 @@ int application_start(void) //发送功率数据 if (power_last != power || main_num > 4) { - //SetPowerRecord(&power_record, power); + SetPowerRecord(&power_record, power); power_last = power; main_num =0; sprintf(power_buf, "{\"mac\":\"%s\",\"power\":\"%u.%u\",\"total_time\":%u}", diff --git a/TC1/user_power.c b/TC1/user_power.c index 1f0bab8..b11ed7e 100644 --- a/TC1/user_power.c +++ b/TC1/user_power.c @@ -10,7 +10,7 @@ mico_timer_t power_timer; -PowerRecord power_record = { 44, { +PowerRecord power_record = { 1, { 0,1,2,3,4,5,6,7,8,9, 10,11,12,13,14,15,16,17,18,19, 20,21,22,23,24,25,26,27,28,29,