From ac242913d5aa8db23bea24aa012762727e569dcd Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Sat, 9 Nov 2019 11:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/user_power.c | 51 +++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/TC1/user_power.c b/TC1/user_power.c
index e4ab7c8..10f1bed 100644
--- a/TC1/user_power.c
+++ b/TC1/user_power.c
@@ -17,33 +17,6 @@ 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 };
-
-void SetPowerRecord(PowerRecord* pr, uint32_t pw)
-{
-    pr->powers[(++pr->idx)% PW_NUM] = pw;
-}
-
-char* GetPowerRecord(int idx)
-{
-    if (idx > power_record.idx) return "";
-
-    int i = idx > 0 ? idx : (power_record.idx - PW_NUM + 1);
-    i = i < 0 ? 0 : i;
-    char* tmp = power_record_str;
-    for (; i <= power_record.idx; i++)
-    {
-        sprintf(tmp, "%u,", (unsigned int)power_record.powers[i%PW_NUM]);
-        tmp += strlen(tmp);
-    }
-    *(--tmp) = 0;
-    return power_record_str;
-}
-
-/*
 static void PowerTimerHandler(void* arg)
 {
     uint32_t timer = 0;
@@ -76,6 +49,30 @@ static void PowerTimerHandler(void* arg)
     }
 }
 */
+uint32_t p_count = 0;
+
+char power_record_str[1101] = { 0 };
+
+void SetPowerRecord(PowerRecord* pr, uint32_t pw)
+{
+    pr->powers[(++pr->idx)% PW_NUM] = pw;
+}
+
+char* GetPowerRecord(int idx)
+{
+    if (idx > power_record.idx) return "";
+
+    int i = idx > 0 ? idx : (power_record.idx - PW_NUM + 1);
+    i = i < 0 ? 0 : i;
+    char* tmp = power_record_str;
+    for (; i <= power_record.idx; i++)
+    {
+        sprintf(tmp, "%u,", (unsigned int)power_record.powers[i%PW_NUM]);
+        tmp += strlen(tmp);
+    }
+    *(--tmp) = 0;
+    return power_record_str;
+}
 
 float n_1s = 0;            //功率中断次数
 mico_time_t t_x = 0;       //当前秒*1000