Browse Source

1.开看门狗
2. 调整看门狗时间为3.28s
3. 解决报警后不能再次报警的问题
4. 延长复位延时计数为6s

wxl 1 month ago
parent
commit
acaff075d0
4 changed files with 5 additions and 5 deletions
  1. 1 1
      Drivers/Board/board.h
  2. 2 2
      Users/app_nb/app_nb.c
  3. 1 1
      Users/main.c
  4. 1 1
      Users/param/param.c

+ 1 - 1
Drivers/Board/board.h

@@ -26,7 +26,7 @@
 //#define APP_DEBUG_PRINT // 调试打印开关
 
 // #define DEBUG_LOW_POWER
-//#define DOG_ENABLE // WXL2026-5-12
+#define DOG_ENABLE // WXL2026-5-12
 //  #define DEBUG_BILL
 //  #define DEBUG_RESET_LOG_NOT_SEND // wxl2026-5-8 调试阶段,单片机初始运行不记日志,正常运行阶段记上电日志
 //  #define DEBUG_SAVE_BAK 0

+ 2 - 2
Users/app_nb/app_nb.c

@@ -571,10 +571,10 @@ uint8_t err_upload_check(void)
 
     all_alarm_status(&alarmbit);
     temp = (upload_dat.err_mem_dat & (*alarmbit)) ^ (*alarmbit); // ¼ì²éÊÇ·ñÓÐÒì³£bit±»ÖÃλ
-
+		 upload_dat.err_mem_dat = *alarmbit;
     if (temp != 0)
     {
-        upload_dat.err_mem_dat = *alarmbit;
+       
         return NB_UPLOAD_ERR;
     }
     return 0;

+ 1 - 1
Users/main.c

@@ -539,7 +539,7 @@ int32_t main(void)
     rt_base_t level;
 
 #ifdef DOG_ENABLE
-    watchdog_init(WdtResetEn, WdtT6s55); // 看门狗初始化
+    watchdog_init(WdtResetEn, WdtT3s28); // 看门狗初始化
 #endif
 
     feed_dog();

+ 1 - 1
Users/param/param.c

@@ -764,7 +764,7 @@ uint8_t write_diff_patch_to_flash(DIFF_PACKET_DEF *Packet)
 			write_flash_memory((uint8_t *)&PatchInfo, DIFF_UPDATE_INFO_START, sizeof(PATCH_INFO_DEF));
 #endif
 			LOG("last packet ok\r\n");
-			NbRun.reset_mcu_cnt = 5;
+			NbRun.reset_mcu_cnt = 6;
 			return 1; // ×îºóÒ»°ü
 		}
 	}