TuxMonkey/bf_original_balance_chassis
1
0
Fork 0
mirror of https://gitee.com/dlmu-cone/bf_original_balance_chassis synced 2026-07-24 03:27:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	modules/daemon/daemon.c
This commit is contained in:
chenfu
2023-06-23 17:07:33 +08:00
parent c85c13f959 b4d4228ccc
commit 04975af252
14 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/daemon/daemon.c
View File

@@ -14,8 +14,10 @@ DaemonInstance *DaemonRegister(Daemon_Init_Config_s *config)
memset(instance, 0, sizeof(DaemonInstance));
instance->owner_id = config->owner_id;
instance->reload_count = config->reload_count == 0 ? 100 : config->reload_count;
instance->reload_count = config->reload_count == 0 ? 100 : config->reload_count; // 默认值为100
instance->callback = config->callback;
instance->temp_count = config->init_count == 0 ? 100 : config->init_count; // 默认值为100,初始计数
instance->alarm_state = config->alarm_state;
instance->alarm_level = config->alarm_level;
instance->temp_count = config->reload_count;
@@ -51,7 +53,7 @@ void DaemonTask()
{
BuzzerPlay(dins->alarm_level);
}
}
}
}

1
modules/daemon/daemon.h
View File

@@ -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; //警报级别