Merge remote-tracking branch 'origin/master'

# Conflicts: # modules/daemon/daemon.c
2026-07-24 11:37:45 +08:00 · 2023-06-23 17:07:33 +08:00
parent c85c13f959 b4d4228ccc
commit 04975af252
14 changed files with 19 additions and 21 deletions
--- a/modules/daemon/daemon.h
+++ b/modules/daemon/daemon.h
@@ -38,6 +38,7 @@ typedef struct daemon_ins
 typedef struct
 {
    uint16_t reload_count;     // 实际上这是app唯一需要设置的值?
+    uint16_t init_count;       // 上线等待时间,有些模块需要收到主控的指令才会反馈报文,或pc等需要开机时间
    offline_callback callback; // 异常处理函数,当模块发生异常时会被调用
    alarm_state_e alarm_state; // 蜂鸣器状态
    alarm_level_e alarm_level;      //警报级别