Browse Source

【3.0.0.35】 修改了中断恢复的Bug

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
47b8746894
2 changed files with 4 additions and 4 deletions
  1. 2 2
      inc/AppConfig.h
  2. 2 2
      src/AppTaskMain.c

+ 2 - 2
inc/AppConfig.h

@@ -2,7 +2,7 @@
  * @Author       : ChenJie
  * @Date         : 2021-10-14 09:27:15
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-11-05 14:17:55
+ * @LastEditTime : 2021-11-05 14:52:10
  * @Description  : App Config H file 配置文件,可以针对不同参数进行更改
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\inc\AppConfig.h
  */
@@ -14,7 +14,7 @@
 #define DATA_MODULE_TYPE (1)           //1表示NB模块,2表示4G cat1
 #define EOLSTATE (0)                   //1表示下线检测跳过,使用默认值,0表示使用下线检测
 #define DEFAULT_SN "RLTEST00000000001" //默认上传的SN编码
-#define APPSWVERSION 0x03000022        //数据模块软件版本号
+#define APPSWVERSION 0x03000023        //数据模块软件版本号
 #define RELAYCONFIG 0                  //继电器配置
 #define TCP_ADD "iotp.fast-fun.cn"     //数据上传的地址
 #define TCP_PORT 8712                  //数据上传的端口

+ 2 - 2
src/AppTaskMain.c

@@ -3,7 +3,7 @@
  * @Date         : 2021-10-14 09:27:15
  * @Version      : V3.0
  * @LastEditors  : ChenJie
- * @LastEditTime : 2021-11-04 14:14:26
+ * @LastEditTime : 2021-11-05 14:47:02
  * @Description  : 主要负责:1.工作模式转换2.定时器定时3.定时保存运行数据4.异常状态重启
  * @FilePath     : \PLAT\project\ec616_0h00\apps\qx_app\src\AppTaskMain.c
  */
@@ -99,7 +99,6 @@ static void MainTask(void *arg)
                 xTimerStart(sleep_timer, 0);
                 WorkTimerEnd = FALSE;
                 NVIC_EnableIRQ(PadWakeup1_IRQn);
-                PadInterrupt = 0x00;
                 UartInterruptcount = 0;
                 PadInterrupt_clrCounter = 0;
                 PROC_MAIN_STATE_SWITCH(PROCESS_STATE_LISTEN);
@@ -108,6 +107,7 @@ static void MainTask(void *arg)
             if ((BMS_Fota_update_flag != FALSE) || (TCPWorkState != 0x00) || (BattWorkStateDelay != BATT_IDLE_SYM) || (battWorkState != BATT_IDLE_SYM) || (PadInterrupt != 0x00))
             {
                 xTimerReset(work_timer, 0);
+                PadInterrupt = 0x00;
             }
             if ((TcpErrorcount >= 10 && getbit(PadInterrupt, 0) == 0x00 && battWorkState != BATT_CHARGE_SYM) || (NB_Fota_update_flag == TRUE))
             {