From a2b60a8a014e18571f38e8917964968aeab76b4b Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Sun, 9 Feb 2020 00:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E4=BA=86=20=3F=20=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/main.h       | 5 ++---
 TC1/user_power.c | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TC1/main.h b/TC1/main.h
index 727b644..9a1c495 100644
--- a/TC1/main.h
+++ b/TC1/main.h
@@ -11,7 +11,7 @@
 
 #define ZTC1_NAME "zTC1-%s"
 
-#define USER_CONFIG_VERSION 2
+#define USER_CONFIG_VERSION 3
 #define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。
 
 #define SOCKET_NAME_LENGTH   32
@@ -41,12 +41,11 @@ typedef struct
 //用户保存参数结构体
 typedef struct
 {
+    char version;
     char mqtt_ip[SETTING_MQTT_STRING_LENGTH_MAX];        //mqtt service ip
     int mqtt_port;                                       //mqtt service port
     char mqtt_user[SETTING_MQTT_STRING_LENGTH_MAX];      //mqtt service user
     char mqtt_password[SETTING_MQTT_STRING_LENGTH_MAX];  //mqtt service user
-//  char mqtt_device_id[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user device name
-    char version;
     user_socket_config_t socket_configs[SOCKET_NUM];
     char user[maxNameLen];
     WiFiEvent last_wifi_status;
diff --git a/TC1/user_power.c b/TC1/user_power.c
index f3fc128..9469c6d 100644
--- a/TC1/user_power.c
+++ b/TC1/user_power.c
@@ -112,6 +112,7 @@ static void PowerIrqHandler(void* arg)
     }
     else
     {
+        os_log("PowerIrqHandler error past_ns[%ld] t_x[%ld] rest_x_ns[%ld]", past_ns, t_x, rest_x_ns);
         //一般不会出现这种情况, 所以不管了...哈哈哈~
         SetPowerRecord(&power_record, 123456);
         SetPowerRecord(&power_record, past_ns);