From c282a491c740c5242ed311dfe0aa3ba808408e03 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 17 Aug 2024 16:22:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9C=8B=E9=97=A8=E7=8B=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- usrc/app_main.cpp | 13 ++++++++++++- usrc/base/protocol_processer_mgr.cpp | 2 +- usrc/project_configs.h | 2 +- zsdk | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/usrc/app_main.cpp b/usrc/app_main.cpp index 2dd1589..7add538 100644 --- a/usrc/app_main.cpp +++ b/usrc/app_main.cpp @@ -73,6 +73,16 @@ void idtable_init() { #define REG_PROCESSER(processer) ProtocolProcesserMgr::ins()->regProcesser(processer); +/* IWDG init function */ +void MX_IWDG_Init(void) { + hiwdg.Instance = IWDG; + hiwdg.Init.Prescaler = IWDG_PRESCALER_256; + hiwdg.Init.Reload = 501; + if (HAL_IWDG_Init(&hiwdg) != HAL_OK) { + Error_Handler(); + } +} + void umain() { gBoardFlagSetResetFlag(); @@ -132,9 +142,10 @@ void umain() { SysMgr::ins()->initedFinished(); SysMgr::ins()->dumpSysInfo(); ZLOGI(TAG, "="); + MX_IWDG_Init(); while (true) { osDelay(30); debug_light_ctrl(); - // ZLOGW(TAG, "main loop"); + HAL_IWDG_Refresh(&hiwdg); } } diff --git a/usrc/base/protocol_processer_mgr.cpp b/usrc/base/protocol_processer_mgr.cpp index 2f8970f..294179e 100644 --- a/usrc/base/protocol_processer_mgr.cpp +++ b/usrc/base/protocol_processer_mgr.cpp @@ -9,7 +9,7 @@ static osThreadId PacketRxThreadId; static void onPacketRxThreadStart(void const* argument) { while (true) { zcanbus_schedule(); - osDelay(1); + osDelay(3); } } diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 9ebe3a3..e72d75a 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -15,7 +15,7 @@ * @brief 基础配置 * */ -#define SOFTWARE_VERSION 1 // 软件版本 +#define SOFTWARE_VERSION 101 // 软件版本 #define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "transmit_disinfection_micro" // 工程名称 #define SN_HEADER "SN" // SN号前缀 diff --git a/zsdk b/zsdk index 2ec58da..8bf4171 160000 --- a/zsdk +++ b/zsdk @@ -1 +1 @@ -Subproject commit 2ec58da3d9802e851e67149e3801f7fa6607621d +Subproject commit 8bf4171e2ef60e8d4cd40e8467e19ae7805e9f26