diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c index 1d7b55f..96e4854 100644 --- a/TC1/http_server/app_httpd.c +++ b/TC1/http_server/app_httpd.c @@ -118,8 +118,6 @@ static int HttpGetPowerInfo(httpd_request_t *req) sprintf(up_time, "%d:%02d:%02d", h, m, s); char* powers = GetPowerRecord(idx); - static int p_count = 0; - p_count += 1; sprintf(power_info_json, POWER_INFO_JSON, power_record.idx, PW_NUM, p_count, powers, up_time); send_http(power_info_json, strlen(power_info_json), exit, &err); exit: diff --git a/TC1/http_server/app_httpd.h b/TC1/http_server/app_httpd.h index f03eb03..7032b32 100644 --- a/TC1/http_server/app_httpd.h +++ b/TC1/http_server/app_httpd.h @@ -59,7 +59,7 @@ 'start_time':%ld\ }" -#define POWER_INFO_JSON "{'idx':%d,'len':%d,'p_count':%d,'powers':[%s],'up_time':'%s'}" +#define POWER_INFO_JSON "{'idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s'}" int AppHttpdStart(void); int AppHttpdStop(); diff --git a/TC1/user_power.c b/TC1/user_power.c index 9e84cfd..d8011be 100644 --- a/TC1/user_power.c +++ b/TC1/user_power.c @@ -16,6 +16,7 @@ static uint32_t clock_count_last = 0; static uint32_t clock_count = 0; static uint32_t timer_count = 0; static uint32_t timer_irq_count = 0; +uint32_t p_count = 0; char power_record_str[1101] = { 0 }; @@ -77,6 +78,7 @@ static void PowerIrqHandler(void* arg) clock_count = mico_nanosecond_clock_value(); if (timer_irq_count == 0) clock_count_last = clock_count; timer_irq_count++; + p_count++; } void PowerInit(void) diff --git a/TC1/user_power.h b/TC1/user_power.h index af9c888..492cc0b 100644 --- a/TC1/user_power.h +++ b/TC1/user_power.h @@ -9,6 +9,7 @@ typedef struct } PowerRecord; extern PowerRecord power_record; +extern uint32_t p_count; char* GetPowerRecord(int idx); void PowerInit(void);