This commit is contained in:
parent
85ea0ad683
commit
b8bdca571e
|
@ -70,6 +70,10 @@
|
||||||
"time.h": "c",
|
"time.h": "c",
|
||||||
"ch32v30x.h": "c",
|
"ch32v30x.h": "c",
|
||||||
"lwutil.h": "c",
|
"lwutil.h": "c",
|
||||||
"netdev.h": "c"
|
"netdev.h": "c",
|
||||||
|
"drv_log.h": "c",
|
||||||
|
"drv_usart.h": "c",
|
||||||
|
"signal.h": "c",
|
||||||
|
"xtr1common": "c"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* @Author: mbw
|
* @Author: mbw
|
||||||
* @Date: 2024-10-23 17:14:16
|
* @Date: 2024-10-23 17:14:16
|
||||||
* @LastEditors: mbw && 1600520629@qq.com
|
* @LastEditors: mbw && 1600520629@qq.com
|
||||||
* @LastEditTime: 2025-02-22 19:15:35
|
* @LastEditTime: 2025-04-08 14:36:58
|
||||||
* @FilePath: \ble_bjq_ch303rct6_ml307\applications\main.c
|
* @FilePath: \ble_bjq_ch303rct6_ml307\applications\main.c
|
||||||
* @Descrt_thread_
|
* @Descrt_thread_
|
||||||
*
|
*
|
||||||
|
@ -115,18 +115,15 @@ int _Self_Check_Mode(void)
|
||||||
LED_STOP(g);
|
LED_STOP(g);
|
||||||
LED_STOP(y);
|
LED_STOP(y);
|
||||||
rt_thread_mdelay(500);
|
rt_thread_mdelay(500);
|
||||||
LED_CTRL(g, "500,2500", 1);
|
LED_CTRL(g, "500,2500", -1);
|
||||||
LED_START(g);
|
LED_START(g);
|
||||||
rt_thread_mdelay(1000);
|
rt_thread_mdelay(1000);
|
||||||
LED_CTRL(y, "500,2500", 1);
|
LED_CTRL(y, "500,2500", -1);
|
||||||
LED_START(y);
|
LED_START(y);
|
||||||
rt_thread_mdelay(1000);
|
rt_thread_mdelay(1000);
|
||||||
LED_CTRL(r, "500,2500", 1);
|
LED_CTRL(r, "500,2500", -1);
|
||||||
LED_START(r);
|
LED_START(r);
|
||||||
rt_thread_mdelay(1000);
|
rt_thread_mdelay(1000);
|
||||||
LED_STOP(r);
|
|
||||||
LED_STOP(g);
|
|
||||||
LED_STOP(y);
|
|
||||||
BEEP_SELF_CHECK;
|
BEEP_SELF_CHECK;
|
||||||
return RT_EOK;
|
return RT_EOK;
|
||||||
}
|
}
|
||||||
|
@ -153,14 +150,375 @@ void Preheat_Timer_Callback(void *parameter)
|
||||||
LOG_D("预热完成");
|
LOG_D("预热完成");
|
||||||
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
||||||
}
|
}
|
||||||
int main(void)
|
|
||||||
|
int APP_Calibration_Handle(void)
|
||||||
|
{
|
||||||
|
// 定义超时时间,单位为毫秒
|
||||||
|
#define TIMEOUT_MS (3 * 60 * 1000)
|
||||||
|
|
||||||
|
LED_STOP(r);
|
||||||
|
LED_STOP(y);
|
||||||
|
LED_CTRL(g, "1000,500", -1);
|
||||||
|
LED_START(g);
|
||||||
|
|
||||||
|
uint32_t ticks = 0, gas_calibration_voltage;
|
||||||
|
LOG_D("标定开始");
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
gas_calibration_voltage = Get_Gas_VoltageAdcInt1000x();
|
||||||
|
LOG_D("ticks[%d] gas_calibration_voltage = %d", ticks++, gas_calibration_voltage);
|
||||||
|
|
||||||
|
if (ticks > TIMEOUT_MS)
|
||||||
|
{
|
||||||
|
ticks = 0; // 加这个的原因是,如果刚开始没标定,但是时间到了,此时刚通气开始标定,可能直接就读到值了,所以加这个判断
|
||||||
|
if (gas_calibration_voltage > (MQ_VOLTAGE_ALARM_DEFAULT - 1500) && gas_calibration_voltage < (MQ_VOLTAGE_ALARM_DEFAULT + 1000))
|
||||||
|
{
|
||||||
|
uint8_t calibration_buf[2] = {0};
|
||||||
|
calibration_buf[0] = gas_calibration_voltage & 0xFF; // 低字节
|
||||||
|
calibration_buf[1] = (gas_calibration_voltage >> 8) & 0xFF; // 高字节
|
||||||
|
LOG_D("calibration_buf[0] = %X calibration_buf[1] = %X", calibration_buf[0], calibration_buf[1]);
|
||||||
|
Flash_Sys_Cfg(kAlarmLValueId, calibration_buf, 2);
|
||||||
|
LOG_D("标定完成");
|
||||||
|
// 标定完成打开绿灯常亮,蜂鸣器叫一下
|
||||||
|
BEEP_CALIBRATION_OK;
|
||||||
|
LED_STOP(g);
|
||||||
|
LED_ON(g);
|
||||||
|
Flash_Set_Calibration_State(kSysGasCalibStatus);
|
||||||
|
g_Calibration_status = kSysGasCalibStatus;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (g_Calibration_status == kSysGasCalibStatus)
|
||||||
|
{
|
||||||
|
return RT_EOK;
|
||||||
|
}
|
||||||
|
rt_thread_mdelay(1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 已经标定了
|
||||||
|
void APP_Handle(void)
|
||||||
{
|
{
|
||||||
// 定义超时时间,单位为毫秒
|
|
||||||
#define TIMEOUT_MS 3 * 60 * 1000
|
|
||||||
#define WORK_TIMER_CNT (1000 * 60 * 60)
|
#define WORK_TIMER_CNT (1000 * 60 * 60)
|
||||||
rt_err_t result = RT_EINVAL;
|
rt_err_t result = RT_EINVAL;
|
||||||
rt_uint32_t received_event;
|
rt_uint32_t received_event;
|
||||||
rt_thread_mdelay(100);
|
|
||||||
|
TuFlashProductTimeLimitFrame LimitTime;
|
||||||
|
if (Flash_GetProductTimeLimit(&LimitTime, kExpirationTimeId) == READY)
|
||||||
|
{
|
||||||
|
// 计算出 到期时间对应的RTC秒数
|
||||||
|
Sensor_device.expiration_seconds = DateTime2Seconds(LimitTime.Struct.year,
|
||||||
|
LimitTime.Struct.month, LimitTime.Struct.day, LimitTime.Struct.hour,
|
||||||
|
LimitTime.Struct.minute, LimitTime.Struct.second);
|
||||||
|
LOG_D("h308_expiration_time:%04d-%02d-%02d,%02d:%02d",
|
||||||
|
LimitTime.Struct.year, LimitTime.Struct.month, LimitTime.Struct.day,
|
||||||
|
LimitTime.Struct.hour, LimitTime.Struct.minute, LimitTime.Struct.second);
|
||||||
|
}
|
||||||
|
rt_timer_init(&work_cnt_timer,
|
||||||
|
"work_cnt_timer",
|
||||||
|
Work_Cnt_Timer_Callback,
|
||||||
|
RT_NULL,
|
||||||
|
WORK_TIMER_CNT,
|
||||||
|
RT_TIMER_FLAG_PERIODIC);
|
||||||
|
rt_timer_start(&work_cnt_timer);
|
||||||
|
rt_timer_init(&preheat_timer,
|
||||||
|
"preheat_timer",
|
||||||
|
Preheat_Timer_Callback,
|
||||||
|
RT_NULL,
|
||||||
|
TIMEOUT_MS,
|
||||||
|
RT_TIMER_FLAG_SOFT_TIMER | RT_TIMER_FLAG_ONE_SHOT);
|
||||||
|
// 检测上电/掉电复位标志
|
||||||
|
if (RCC_GetFlagStatus(RCC_FLAG_PORRST) != RESET) // TODO:这块超级电容会造成掉电重启,并且标志是上电复位,只能通过其超级电容造成复位时事件创建失败进行判断,不治本
|
||||||
|
{
|
||||||
|
Send_Laser_Alarm_Event(kPowerOnEvent);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Send_Laser_Alarm_Event(kPreheatingEvent); // 这一句的作用是设备不是掉电重启的情况,直接进入预热模式
|
||||||
|
}
|
||||||
|
RCC_ClearFlag();
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
result = rt_event_recv(&alarm_event,
|
||||||
|
Get_Sys_Event_Flag(kPowerOnEvent) | // 上电
|
||||||
|
Get_Sys_Event_Flag(kPowerDownEvent) | // 掉电
|
||||||
|
Get_Sys_Event_Flag(kPreheatingEvent) | // 预热
|
||||||
|
Get_Sys_Event_Flag(kNormalDetectionEvents) | // 正常检测
|
||||||
|
Get_Sys_Event_Flag(kSensorFailureEvent) | // 寿命到期
|
||||||
|
Get_Sys_Event_Flag(kAlarmEvent) | // 报警
|
||||||
|
Get_Sys_Event_Flag(kAlarmRcyEvent) | // 报警恢复
|
||||||
|
Get_Sys_Event_Flag(kSelfCheckEvent) | // 自检
|
||||||
|
Get_Sys_Event_Flag(kFaultEvent) | // 故障模式
|
||||||
|
Get_Sys_Event_Flag(kFaultRcyEvent) | // 故障恢复
|
||||||
|
Get_Sys_Event_Flag(KMuteEvent), // 消音
|
||||||
|
RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
|
||||||
|
RT_WAITING_FOREVER, &received_event);
|
||||||
|
if (result == RT_EOK)
|
||||||
|
{
|
||||||
|
if (is_event_initialized == RT_TRUE)
|
||||||
|
{
|
||||||
|
if (received_event & Get_Sys_Event_Flag(kPowerOnEvent)) // 上电
|
||||||
|
{
|
||||||
|
LOG_D("上电模式");
|
||||||
|
LOG_D("is_event_initialized :%d", is_event_initialized);
|
||||||
|
SysControl.status = kPowerOnEvent;
|
||||||
|
|
||||||
|
Flash_Write_Record(kRecordPowerOn);
|
||||||
|
Send_Laser_Alarm_Event(kPreheatingEvent);
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kPreheatingEvent)) // 预热
|
||||||
|
{
|
||||||
|
LOG_D("预热模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kPreheatingEvent;
|
||||||
|
LED_G_PREAT;
|
||||||
|
rt_timer_start(&preheat_timer);
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kNormalDetectionEvents)) // 正常检测
|
||||||
|
{
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kNormalDetectionEvents;
|
||||||
|
rt_uint16_t voltage = Get_Gas_VoltageAdcInt1000x();
|
||||||
|
if (Sensor_device.detection_flag == kSensorAlarm)
|
||||||
|
{
|
||||||
|
if ((voltage > Sensor_device.alarm_value) && (voltage < MQ_VOLTAGE_HIGH_LIMIT))
|
||||||
|
{
|
||||||
|
Send_Laser_Alarm_Event(kAlarmEvent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (Sensor_device.detection_flag == kSensorFault)
|
||||||
|
{
|
||||||
|
if ((voltage < MQ_VOLTAGE_LOW_LIMIT) || (voltage > MQ_VOLTAGE_HIGH_LIMIT))
|
||||||
|
{
|
||||||
|
Send_Laser_Alarm_Event(kFaultEvent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// if (SysControl.last_status == kSelfCheckEvent)
|
||||||
|
// {
|
||||||
|
// rt_thread_mdelay(5000);
|
||||||
|
// // 第5s关闭电磁阀
|
||||||
|
// LOG_I("自检机械手动作");
|
||||||
|
// EMV_FORWARD_ON(50);
|
||||||
|
// rt_thread_mdelay(10);
|
||||||
|
// EMV_BACKWARD_ON(50);
|
||||||
|
// if (Flash_Get_Valve_Num())
|
||||||
|
// {
|
||||||
|
// rt_uint8_t mac_addr[6] = {0};
|
||||||
|
// Flash_Get_Mac_Addr(mac_addr, 1);
|
||||||
|
// Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
||||||
|
// if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
||||||
|
// {
|
||||||
|
// LOG_D("电磁阀动作完成");
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// LOG_E("电磁阀动作失败");
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kAlarmExceptionEvent)) // 浓度异常
|
||||||
|
{
|
||||||
|
LOG_D("浓度异常模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kAlarmExceptionEvent;
|
||||||
|
|
||||||
|
LED_R_ALARM;
|
||||||
|
LOG_D("LED_R_ALARM");
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kAlarmEvent)) // 报警
|
||||||
|
{
|
||||||
|
LOG_D("报警模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kAlarmEvent;
|
||||||
|
LED_R_ALARM;
|
||||||
|
BEEP_ALARM;
|
||||||
|
|
||||||
|
LOG_I("报警机械手动作");
|
||||||
|
EMV_FORWARD_ON(50);
|
||||||
|
rt_thread_mdelay(10);
|
||||||
|
EMV_BACKWARD_ON(50);
|
||||||
|
|
||||||
|
Flash_Write_Record(kRecordAlarm); // 写入flash报警信息
|
||||||
|
if (Flash_Get_Valve_Num())
|
||||||
|
{
|
||||||
|
rt_uint8_t mac_addr[6];
|
||||||
|
Flash_Get_Mac_Addr(mac_addr, 1);
|
||||||
|
Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
||||||
|
if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
||||||
|
{
|
||||||
|
LOG_D("电磁阀动作完成");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG_E("电磁阀动作失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307AlarmEvent);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kAlarmRcyEvent)) // 报警恢复
|
||||||
|
{
|
||||||
|
LOG_D("报警恢复模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kAlarmRcyEvent;
|
||||||
|
Flash_Write_Record(kRecordAlarmRcy);
|
||||||
|
|
||||||
|
BEEP_STOP;
|
||||||
|
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307AlarmRcyEvent);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kFaultEvent)) // 故障
|
||||||
|
{
|
||||||
|
LOG_D("故障模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kFaultEvent;
|
||||||
|
|
||||||
|
Flash_Write_Record(kRecordFault);
|
||||||
|
|
||||||
|
LED_Y_FAULT;
|
||||||
|
// BEEP_FAULT;
|
||||||
|
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307FaultEvent);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kFaultRcyEvent)) // 故障恢复
|
||||||
|
{
|
||||||
|
LOG_D("故障恢复模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kFaultRcyEvent;
|
||||||
|
|
||||||
|
Flash_Write_Record(kRecordFaultRcy);
|
||||||
|
|
||||||
|
BEEP_STOP;
|
||||||
|
|
||||||
|
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307FaultRcyEvent);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(KMuteEvent)) // 消音
|
||||||
|
{
|
||||||
|
LOG_D("消音模式");
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = KMuteEvent;
|
||||||
|
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307SilenceEvent);
|
||||||
|
#endif
|
||||||
|
BEEP_STOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kPowerDownEvent)) // 掉电
|
||||||
|
{
|
||||||
|
LOG_D("掉电模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kPowerDownEvent;
|
||||||
|
GAS_POWER_CLOSE;
|
||||||
|
// 写入掉电记录
|
||||||
|
Flash_Write_Record(kRecordPowerDown);
|
||||||
|
|
||||||
|
Flash_Set_WorkDuration(work_duration); // 写入工作时长
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307PowerDownEvent);
|
||||||
|
#endif
|
||||||
|
if (Flash_Get_Valve_Num())
|
||||||
|
{
|
||||||
|
rt_uint8_t mac_addr[6];
|
||||||
|
Flash_Get_Mac_Addr(mac_addr, 1);
|
||||||
|
Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
||||||
|
if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
||||||
|
{
|
||||||
|
LOG_D("电磁阀动作完成");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG_E("电磁阀动作失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rt_uint8_t cnt = 0;
|
||||||
|
while ((ml307_power_down_flag == 0) && (cnt < 30)) // 等待接收到物联网模组关机完成
|
||||||
|
{
|
||||||
|
rt_thread_mdelay(1000);
|
||||||
|
LOG_D("cnt = %d", cnt);
|
||||||
|
cnt++;
|
||||||
|
}
|
||||||
|
__disable_irq(); // 关闭中断
|
||||||
|
NVIC_SystemReset(); // 直接重启系统
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kSelfCheckEvent)) // 自检
|
||||||
|
{
|
||||||
|
LOG_D("自检模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
LOG_D("Self Check Mode SysControl.last_status:%d", SysControl.last_status);
|
||||||
|
SysControl.status = kSelfCheckEvent;
|
||||||
|
|
||||||
|
_Self_Check_Mode();
|
||||||
|
|
||||||
|
rt_thread_mdelay(5000);
|
||||||
|
// 第5s关闭电磁阀
|
||||||
|
LOG_I("自检机械手动作");
|
||||||
|
EMV_FORWARD_ON(50);
|
||||||
|
rt_thread_mdelay(10);
|
||||||
|
EMV_BACKWARD_ON(50);
|
||||||
|
if (Flash_Get_Valve_Num())
|
||||||
|
{
|
||||||
|
rt_uint8_t mac_addr[6] = {0};
|
||||||
|
Flash_Get_Mac_Addr(mac_addr, 1);
|
||||||
|
Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
||||||
|
if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
||||||
|
{
|
||||||
|
LOG_D("电磁阀动作完成");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG_E("电磁阀动作失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if (IOT_MODULE_SWITCH == 1)
|
||||||
|
Ml307_Send_Event(kMl307SelfCheckEvent);
|
||||||
|
#endif
|
||||||
|
LED_STOP(r);
|
||||||
|
LED_STOP(g);
|
||||||
|
LED_STOP(y);
|
||||||
|
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
||||||
|
}
|
||||||
|
else if (received_event & Get_Sys_Event_Flag(kSensorFailureEvent)) // 失效
|
||||||
|
{
|
||||||
|
LOG_D("传感器失效模式");
|
||||||
|
|
||||||
|
SysControl.last_status = SysControl.status;
|
||||||
|
SysControl.status = kSensorFailureEvent;
|
||||||
|
|
||||||
|
if (Flash_GetNum_Records(kRecordSensoEndOfLife) == 0)
|
||||||
|
{
|
||||||
|
Flash_Write_Record(kRecordSensoEndOfLife);
|
||||||
|
}
|
||||||
|
LED_Y_END_OF_LIFE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
if (Get_VIN_VoltageInt1000x() > 10000)
|
if (Get_VIN_VoltageInt1000x() > 10000)
|
||||||
{
|
{
|
||||||
SYS_EventInit();
|
SYS_EventInit();
|
||||||
|
@ -170,43 +528,6 @@ int main(void)
|
||||||
// 读取历史记录总数
|
// 读取历史记录总数
|
||||||
g_Calibration_status = Flash_Get_Calibration_State();
|
g_Calibration_status = Flash_Get_Calibration_State();
|
||||||
rt_thread_mdelay(10);
|
rt_thread_mdelay(10);
|
||||||
if (g_Calibration_status == kSysGasCalibStatus)
|
|
||||||
{
|
|
||||||
TuFlashProductTimeLimitFrame LimitTime;
|
|
||||||
if (Flash_GetProductTimeLimit(&LimitTime, kExpirationTimeId) == READY)
|
|
||||||
{
|
|
||||||
// 计算出 到期时间对应的RTC秒数
|
|
||||||
Sensor_device.expiration_seconds = DateTime2Seconds(LimitTime.Struct.year,
|
|
||||||
LimitTime.Struct.month, LimitTime.Struct.day, LimitTime.Struct.hour,
|
|
||||||
LimitTime.Struct.minute, LimitTime.Struct.second);
|
|
||||||
LOG_D("h308_expiration_time:%04d-%02d-%02d,%02d:%02d",
|
|
||||||
LimitTime.Struct.year, LimitTime.Struct.month, LimitTime.Struct.day,
|
|
||||||
LimitTime.Struct.hour, LimitTime.Struct.minute, LimitTime.Struct.second);
|
|
||||||
}
|
|
||||||
rt_timer_init(&work_cnt_timer,
|
|
||||||
"work_cnt_timer",
|
|
||||||
Work_Cnt_Timer_Callback,
|
|
||||||
RT_NULL,
|
|
||||||
WORK_TIMER_CNT,
|
|
||||||
RT_TIMER_FLAG_PERIODIC);
|
|
||||||
rt_timer_start(&work_cnt_timer);
|
|
||||||
rt_timer_init(&preheat_timer,
|
|
||||||
"preheat_timer",
|
|
||||||
Preheat_Timer_Callback,
|
|
||||||
RT_NULL,
|
|
||||||
TIMEOUT_MS,
|
|
||||||
RT_TIMER_FLAG_SOFT_TIMER | RT_TIMER_FLAG_ONE_SHOT);
|
|
||||||
// 检测上电/掉电复位标志
|
|
||||||
if (RCC_GetFlagStatus(RCC_FLAG_PORRST) != RESET) // TODO:这块超级电容会造成掉电重启,并且标志是上电复位,只能通过其超级电容造成复位时事件创建失败进行判断,不治本
|
|
||||||
{
|
|
||||||
Send_Laser_Alarm_Event(kPowerOnEvent);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Send_Laser_Alarm_Event(kPreheatingEvent); // 这一句的作用是设备不是掉电重启的情况,直接进入预热模式
|
|
||||||
}
|
|
||||||
RCC_ClearFlag();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -217,292 +538,22 @@ int main(void)
|
||||||
BSP_VIN_Detection_Init();
|
BSP_VIN_Detection_Init();
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
if (g_Calibration_status == kNotCalibrated) // 没标定
|
switch (g_Calibration_status)
|
||||||
{
|
{
|
||||||
LED_STOP(r);
|
case kNotCalibrated: // 没标定
|
||||||
LED_STOP(y);
|
|
||||||
LED_CTRL(g, "1000,500", -1);
|
|
||||||
LED_START(g);
|
|
||||||
|
|
||||||
uint32_t ticks = 0, gas_calibration_voltage;
|
|
||||||
while (1)
|
|
||||||
{
|
{
|
||||||
gas_calibration_voltage = Get_Gas_VoltageAdcInt1000x();
|
APP_Calibration_Handle();
|
||||||
LOG_D("ticks[%d] gas_calibration_voltage = %d", ticks++, gas_calibration_voltage);
|
break;
|
||||||
|
|
||||||
if (g_Calibration_status == kNotCalibrated) // 没标定
|
|
||||||
{
|
|
||||||
if (ticks > TIMEOUT_MS)
|
|
||||||
{
|
|
||||||
if (gas_calibration_voltage > (MQ_VOLTAGE_ALARM_DEFAULT - 800) && gas_calibration_voltage < (MQ_VOLTAGE_ALARM_DEFAULT + 800))
|
|
||||||
{
|
|
||||||
uint8_t calibration_buf[2] = {0};
|
|
||||||
calibration_buf[0] = gas_calibration_voltage & 0xFF; // 低字节
|
|
||||||
calibration_buf[1] = (gas_calibration_voltage >> 8) & 0xFF; // 高字节
|
|
||||||
LOG_D("calibration_buf[0] = %X calibration_buf[1] = %X", calibration_buf[0], calibration_buf[1]);
|
|
||||||
Flash_Sys_Cfg(kAlarmLValueId, calibration_buf, 2);
|
|
||||||
// 标定完成打开绿灯常亮,蜂鸣器叫一下
|
|
||||||
BEEP_CALIBRATION_OK;
|
|
||||||
LED_STOP(g);
|
|
||||||
LED_ON(g);
|
|
||||||
Flash_Set_Calibration_State(kSysGasCalibStatus);
|
|
||||||
g_Calibration_status = kSysGasCalibStatus;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rt_thread_mdelay(1000);
|
|
||||||
}
|
}
|
||||||
}
|
case kSysGasCalibStatus:
|
||||||
else
|
|
||||||
{
|
|
||||||
result = rt_event_recv(&alarm_event,
|
|
||||||
Get_Sys_Event_Flag(kPowerOnEvent) | // 上电
|
|
||||||
Get_Sys_Event_Flag(kPowerDownEvent) | // 掉电
|
|
||||||
Get_Sys_Event_Flag(kPreheatingEvent) | // 预热
|
|
||||||
Get_Sys_Event_Flag(kNormalDetectionEvents) | // 正常检测
|
|
||||||
Get_Sys_Event_Flag(kSensorFailureEvent) | // 寿命到期
|
|
||||||
Get_Sys_Event_Flag(kAlarmEvent) | // 报警
|
|
||||||
Get_Sys_Event_Flag(kAlarmRcyEvent) | // 报警恢复
|
|
||||||
Get_Sys_Event_Flag(kSelfCheckEvent) | // 自检
|
|
||||||
Get_Sys_Event_Flag(kFaultEvent) | // 故障模式
|
|
||||||
Get_Sys_Event_Flag(kFaultRcyEvent) | // 故障恢复
|
|
||||||
Get_Sys_Event_Flag(KMuteEvent), // 消音
|
|
||||||
RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
|
|
||||||
RT_WAITING_FOREVER, &received_event);
|
|
||||||
if (result == RT_EOK)
|
|
||||||
{
|
{
|
||||||
if (is_event_initialized == RT_TRUE)
|
APP_Handle();
|
||||||
{
|
break;
|
||||||
if (received_event & Get_Sys_Event_Flag(kPowerOnEvent)) // 上电
|
|
||||||
{
|
|
||||||
LOG_D("上电模式");
|
|
||||||
LOG_D("is_event_initialized :%d", is_event_initialized);
|
|
||||||
SysControl.status = kPowerOnEvent;
|
|
||||||
|
|
||||||
Flash_Write_Record(kRecordPowerOn);
|
|
||||||
Send_Laser_Alarm_Event(kPreheatingEvent);
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kPreheatingEvent)) // 预热
|
|
||||||
{
|
|
||||||
LOG_D("预热模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kPreheatingEvent;
|
|
||||||
LED_G_PREAT;
|
|
||||||
rt_timer_start(&preheat_timer);
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kNormalDetectionEvents)) // 正常检测
|
|
||||||
{
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kNormalDetectionEvents;
|
|
||||||
rt_uint16_t voltage = Get_Gas_VoltageAdcInt1000x();
|
|
||||||
if (Sensor_device.detection_flag == kSensorAlarm)
|
|
||||||
{
|
|
||||||
if ((voltage > Sensor_device.alarm_value) && (voltage < MQ_VOLTAGE_HIGH_LIMIT))
|
|
||||||
{
|
|
||||||
Send_Laser_Alarm_Event(kAlarmEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (Sensor_device.detection_flag == kSensorFault)
|
|
||||||
{
|
|
||||||
if ((voltage < MQ_VOLTAGE_LOW_LIMIT) || (voltage > MQ_VOLTAGE_HIGH_LIMIT))
|
|
||||||
{
|
|
||||||
Send_Laser_Alarm_Event(kFaultEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (SysControl.last_status == kSelfCheckEvent)
|
|
||||||
{
|
|
||||||
rt_thread_mdelay(5000);
|
|
||||||
// 第5s关闭电磁阀
|
|
||||||
LOG_I("自检机械手动作");
|
|
||||||
EMV_FORWARD_ON(50);
|
|
||||||
rt_thread_mdelay(10);
|
|
||||||
EMV_BACKWARD_ON(50);
|
|
||||||
if (Flash_Get_Valve_Num())
|
|
||||||
{
|
|
||||||
rt_uint8_t mac_addr[6];
|
|
||||||
Flash_Get_Mac_Addr(mac_addr, 1);
|
|
||||||
Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
|
||||||
if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
|
||||||
{
|
|
||||||
LOG_D("电磁阀动作完成");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LOG_E("电磁阀动作失败");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kAlarmExceptionEvent)) // 浓度异常
|
|
||||||
{
|
|
||||||
LOG_D("浓度异常模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kAlarmExceptionEvent;
|
|
||||||
|
|
||||||
LED_R_ALARM;
|
|
||||||
LOG_D("LED_R_ALARM");
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kAlarmEvent)) // 报警
|
|
||||||
{
|
|
||||||
LOG_D("报警模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kAlarmEvent;
|
|
||||||
LED_R_ALARM;
|
|
||||||
BEEP_ALARM;
|
|
||||||
Flash_Write_Record(kRecordAlarm); // 写入flash报警信息
|
|
||||||
if (Flash_Get_Valve_Num())
|
|
||||||
{
|
|
||||||
rt_uint8_t mac_addr[6];
|
|
||||||
Flash_Get_Mac_Addr(mac_addr, 1);
|
|
||||||
Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
|
||||||
if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
|
||||||
{
|
|
||||||
LOG_D("电磁阀动作完成");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LOG_E("电磁阀动作失败");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307AlarmEvent);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kAlarmRcyEvent)) // 报警恢复
|
|
||||||
{
|
|
||||||
LOG_D("报警恢复模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kAlarmRcyEvent;
|
|
||||||
|
|
||||||
Flash_Write_Record(kRecordAlarmRcy);
|
|
||||||
|
|
||||||
BEEP_STOP;
|
|
||||||
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307AlarmRcyEvent);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kFaultEvent)) // 故障
|
|
||||||
{
|
|
||||||
LOG_D("故障模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kFaultEvent;
|
|
||||||
|
|
||||||
Flash_Write_Record(kRecordFault);
|
|
||||||
|
|
||||||
LED_Y_FAULT;
|
|
||||||
// BEEP_FAULT;
|
|
||||||
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307FaultEvent);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kFaultRcyEvent)) // 故障恢复
|
|
||||||
{
|
|
||||||
LOG_D("故障恢复模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kFaultRcyEvent;
|
|
||||||
|
|
||||||
Flash_Write_Record(kRecordFaultRcy);
|
|
||||||
|
|
||||||
BEEP_STOP;
|
|
||||||
|
|
||||||
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307FaultRcyEvent);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(KMuteEvent)) // 消音
|
|
||||||
{
|
|
||||||
LOG_D("消音模式");
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = KMuteEvent;
|
|
||||||
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307SilenceEvent);
|
|
||||||
#endif
|
|
||||||
BEEP_STOP;
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kPowerDownEvent)) // 掉电
|
|
||||||
{
|
|
||||||
LOG_D("掉电模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kPowerDownEvent;
|
|
||||||
GAS_POWER_CLOSE;
|
|
||||||
// 写入掉电记录
|
|
||||||
Flash_Write_Record(kRecordPowerDown);
|
|
||||||
|
|
||||||
Flash_Set_WorkDuration(work_duration); // 写入工作时长
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307PowerDownEvent);
|
|
||||||
#endif
|
|
||||||
if (Flash_Get_Valve_Num())
|
|
||||||
{
|
|
||||||
rt_uint8_t mac_addr[6];
|
|
||||||
Flash_Get_Mac_Addr(mac_addr, 1);
|
|
||||||
Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
|
|
||||||
if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
|
|
||||||
{
|
|
||||||
LOG_D("电磁阀动作完成");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LOG_E("电磁阀动作失败");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rt_uint8_t cnt = 0;
|
|
||||||
while ((ml307_power_down_flag == 0) && (cnt < 20)) // 等待接收到物联网模组关机完成
|
|
||||||
{
|
|
||||||
rt_thread_mdelay(1000);
|
|
||||||
LOG_D("cnt = %d", cnt);
|
|
||||||
cnt++;
|
|
||||||
}
|
|
||||||
__disable_irq(); // 关闭中断
|
|
||||||
NVIC_SystemReset(); // 直接重启系统
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kSelfCheckEvent)) // 自检
|
|
||||||
{
|
|
||||||
LOG_D("自检模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
LOG_D("Self Check Mode SysControl.last_status:%d", SysControl.last_status);
|
|
||||||
SysControl.status = kSelfCheckEvent;
|
|
||||||
|
|
||||||
_Self_Check_Mode();
|
|
||||||
#if (IOT_MODULE_SWITCH == 1)
|
|
||||||
Ml307_Send_Event(kMl307SelfCheckEvent);
|
|
||||||
#endif
|
|
||||||
Send_Laser_Alarm_Event(kNormalDetectionEvents);
|
|
||||||
}
|
|
||||||
else if (received_event & Get_Sys_Event_Flag(kSensorFailureEvent)) // 失效
|
|
||||||
{
|
|
||||||
LOG_D("传感器失效模式");
|
|
||||||
|
|
||||||
SysControl.last_status = SysControl.status;
|
|
||||||
SysControl.status = kSensorFailureEvent;
|
|
||||||
|
|
||||||
if (Flash_GetNum_Records(kRecordSensoEndOfLife) == 0)
|
|
||||||
{
|
|
||||||
Flash_Write_Record(kRecordSensoEndOfLife);
|
|
||||||
}
|
|
||||||
LED_Y_END_OF_LIFE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
rt_thread_mdelay(10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -546,6 +597,7 @@ static void TEST_SYS_Calibartion(int argc, char **argv)
|
||||||
Flash_Sys_Cfg(kAlarmLValueId, calibration_buf, 2);
|
Flash_Sys_Cfg(kAlarmLValueId, calibration_buf, 2);
|
||||||
Flash_Set_Calibration_State(kSysGasCalibStatus);
|
Flash_Set_Calibration_State(kSysGasCalibStatus);
|
||||||
LOG_D("标定值修改为 = %d", Flash_Get_SysCfg(kAlarmLValueId));
|
LOG_D("标定值修改为 = %d", Flash_Get_SysCfg(kAlarmLValueId));
|
||||||
|
g_Calibration_status = kSysGasCalibStatus;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
* @Author: mbw
|
* @Author: mbw
|
||||||
* @Date: 2024-11-30 15:46:21
|
* @Date: 2024-11-30 15:46:21
|
||||||
* @LastEditors: mbw && 1600520629@qq.com
|
* @LastEditors: mbw && 1600520629@qq.com
|
||||||
* @LastEditTime: 2025-02-21 18:33:03
|
* @LastEditTime: 2025-02-25 10:48:30
|
||||||
* @FilePath: \ble_bjq_ch303rct6_ml307\bsp\src\at_device_ml307.c
|
* @FilePath: \ble_bjq_ch303rct6_ml307\bsp\src\at_device_ml307.c
|
||||||
* @Description:
|
* @Description:
|
||||||
*
|
*
|
||||||
* Copyright (c) 2025 by ${git_name_email}, All Rights Reserved.
|
* Copyright (c) 2025 by ${git_name_email}, All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2006-2023, RT-Thread Development Team
|
* Copyright (c) 2006-2023, RT-Thread Development Team
|
||||||
|
@ -48,8 +48,8 @@
|
||||||
|
|
||||||
ml307_sys_info ml307 = {0};
|
ml307_sys_info ml307 = {0};
|
||||||
struct rt_completion ml307_init_complate;
|
struct rt_completion ml307_init_complate;
|
||||||
volatile int socket_id = 0;
|
volatile int socket_id = 0;
|
||||||
volatile rt_uint8_t ntp_flag = 0;
|
volatile rt_uint8_t ntp_flag = 0;
|
||||||
rt_sem_t ml307_connect_flag_sem;
|
rt_sem_t ml307_connect_flag_sem;
|
||||||
|
|
||||||
// 将本地时间转换为对应时区时间
|
// 将本地时间转换为对应时区时间
|
||||||
|
@ -68,7 +68,7 @@ void Time_Zone_Conversion(TsRtcDateTime *timeInfo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static rt_bool_t ml307_get_power_state(struct at_device *device)
|
rt_bool_t ml307_get_power_state(struct at_device *device)
|
||||||
{
|
{
|
||||||
struct at_device_ml307 *ml307 = RT_NULL;
|
struct at_device_ml307 *ml307 = RT_NULL;
|
||||||
|
|
||||||
|
@ -84,15 +84,12 @@ static rt_err_t ml307_power_on(struct at_device *device)
|
||||||
ml307 = (struct at_device_ml307 *)device->user_data;
|
ml307 = (struct at_device_ml307 *)device->user_data;
|
||||||
|
|
||||||
/* not nead to set pin configuration for ml307 device power on */
|
/* not nead to set pin configuration for ml307 device power on */
|
||||||
if (ml307->power_pin == -1 || ml307->power_status_pin == -1)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if (ml307_get_power_state(device) == ML307_POWER_ON)
|
|
||||||
{
|
|
||||||
return RT_EOK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
rt_pin_write(ml307->pwr_en_pin, PIN_LOW);
|
||||||
|
|
||||||
|
rt_pin_write(ml307->pwr_en_pin, PIN_HIGH);
|
||||||
|
rt_thread_mdelay(RT_TICK_PER_SECOND);
|
||||||
|
|
||||||
rt_pin_write(ml307->power_pin, PIN_HIGH);
|
rt_pin_write(ml307->power_pin, PIN_HIGH);
|
||||||
rt_thread_mdelay(ML307_POWER_ON_TIME * RT_TICK_PER_SECOND);
|
rt_thread_mdelay(ML307_POWER_ON_TIME * RT_TICK_PER_SECOND);
|
||||||
rt_pin_write(ml307->power_pin, PIN_LOW);
|
rt_pin_write(ml307->power_pin, PIN_LOW);
|
||||||
|
@ -166,10 +163,10 @@ static void urc_tcp_recv(struct at_client *client, const char *data, rt_size_t s
|
||||||
{
|
{
|
||||||
rt_memset(ml307_ops.recv, 0, sizeof(struct Ml307RecvData)); // 清空结构体
|
rt_memset(ml307_ops.recv, 0, sizeof(struct Ml307RecvData)); // 清空结构体
|
||||||
rt_memcpy(ml307_ops.recv, recv_byte_buf, sizeof(struct Ml307RecvData));
|
rt_memcpy(ml307_ops.recv, recv_byte_buf, sizeof(struct Ml307RecvData));
|
||||||
ml307_connect_sever_flag = 1;
|
ml307_connect_sever_flag = 1;
|
||||||
if ((ml307_ops.recv->recv_data.event_type == INSTRUCTION_HEART_BEAT) ||
|
if ((ml307_ops.recv->recv_data.event_type == INSTRUCTION_HEART_BEAT) ||
|
||||||
(ml307_ops.recv->recv_data.event_type == EVENT_TYPE_POWER_ON)) // 加这个的原因就是如果有指令下发,会出现两个信号量,指令会执行两次,所以排除心跳包才释放信号量
|
(ml307_ops.recv->recv_data.event_type == EVENT_TYPE_POWER_ON)) // 加这个的原因就是如果有指令下发,会出现两个信号量,指令会执行两次,所以排除心跳包才释放信号量
|
||||||
|
|
||||||
{
|
{
|
||||||
rt_sem_release(ml307_recv_msg_sem); // 接收到的是心跳包
|
rt_sem_release(ml307_recv_msg_sem); // 接收到的是心跳包
|
||||||
}
|
}
|
||||||
|
@ -208,7 +205,7 @@ static void urc_tcp_connect_state(struct at_client *client, const char *data, rt
|
||||||
break;
|
break;
|
||||||
case 571:
|
case 571:
|
||||||
LOG_D("PDP激活失败");
|
LOG_D("PDP激活失败");
|
||||||
ml307_conncet_tcp_flag = 0;
|
ml307_conncet_tcp_flag = 0;
|
||||||
ml307_disconnect_pdp_flag = 1;
|
ml307_disconnect_pdp_flag = 1;
|
||||||
rt_sem_release(ml307_disconnect_sem);
|
rt_sem_release(ml307_disconnect_sem);
|
||||||
break;
|
break;
|
||||||
|
@ -308,7 +305,7 @@ int at_device_ml307_disconnect_tcp(struct at_device *device)
|
||||||
static int at_device_ml307_connect_tcp(struct at_device *device)
|
static int at_device_ml307_connect_tcp(struct at_device *device)
|
||||||
{
|
{
|
||||||
if (ml307_conncet_tcp_flag)
|
if (ml307_conncet_tcp_flag)
|
||||||
return RT_EOK;
|
return RT_EOK;
|
||||||
|
|
||||||
flash_sever_info sever_info = {0};
|
flash_sever_info sever_info = {0};
|
||||||
rt_err_t ret = RT_ERROR;
|
rt_err_t ret = RT_ERROR;
|
||||||
|
@ -386,8 +383,8 @@ int at_send_data(struct at_device *device, const char *data, rt_size_t send_len)
|
||||||
static int ml307_check_link_status(struct at_device *device)
|
static int ml307_check_link_status(struct at_device *device)
|
||||||
{
|
{
|
||||||
at_response_t resp = RT_NULL;
|
at_response_t resp = RT_NULL;
|
||||||
int result = -RT_ERROR;
|
int result = -RT_ERROR;
|
||||||
int link_stat = 0;
|
int link_stat = 0;
|
||||||
|
|
||||||
RT_ASSERT(device);
|
RT_ASSERT(device);
|
||||||
|
|
||||||
|
@ -830,7 +827,7 @@ int Time_Calibration(struct at_device *device)
|
||||||
/*+CCLK:24/11/12,06:08:19+32*/
|
/*+CCLK:24/11/12,06:08:19+32*/
|
||||||
if (at_resp_parse_line_args_by_kw(resp, "+CCLK:", "+CCLK: \"%d/%d/%d,%d:%d:%d+32\"", &year, &mounth, &days, &hous, &min, &sec) > 0)
|
if (at_resp_parse_line_args_by_kw(resp, "+CCLK:", "+CCLK: \"%d/%d/%d,%d:%d:%d+32\"", &year, &mounth, &days, &hous, &min, &sec) > 0)
|
||||||
{
|
{
|
||||||
if ((year != 0) && (year < 70))//如果获取失败,则不配置 例: +CCLK:00/01/01,00:00:12+08
|
if ((year != 0) && (year < 70)) // 如果获取失败,则不配置 例: +CCLK:00/01/01,00:00:12+08
|
||||||
{
|
{
|
||||||
rtc_dt.year = (2000 + year);
|
rtc_dt.year = (2000 + year);
|
||||||
rtc_dt.month = mounth;
|
rtc_dt.month = mounth;
|
||||||
|
@ -843,7 +840,7 @@ int Time_Calibration(struct at_device *device)
|
||||||
RTC_SetTime(rtc_dt.year, rtc_dt.month, rtc_dt.day,
|
RTC_SetTime(rtc_dt.year, rtc_dt.month, rtc_dt.day,
|
||||||
rtc_dt.hour, rtc_dt.minute, rtc_dt.second); // 设置时间
|
rtc_dt.hour, rtc_dt.minute, rtc_dt.second); // 设置时间
|
||||||
LOG_I("RTC时间: %04d-%02d-%02d %02d:%02d:%02d \n",
|
LOG_I("RTC时间: %04d-%02d-%02d %02d:%02d:%02d \n",
|
||||||
rtc_dt.year, rtc_dt.month, rtc_dt.day, rtc_dt.hour, rtc_dt.minute, rtc_dt.second);
|
rtc_dt.year, rtc_dt.month, rtc_dt.day, rtc_dt.hour, rtc_dt.minute, rtc_dt.second);
|
||||||
ntp_flag = 1;
|
ntp_flag = 1;
|
||||||
at_delete_resp(resp);
|
at_delete_resp(resp);
|
||||||
}
|
}
|
||||||
|
@ -904,15 +901,15 @@ static void ml307_init_thread_entry(void *parameter)
|
||||||
/* power on the ml307 device */
|
/* power on the ml307 device */
|
||||||
rt_thread_mdelay(1000);
|
rt_thread_mdelay(1000);
|
||||||
ml307_power_on(device);
|
ml307_power_on(device);
|
||||||
rt_thread_mdelay(2000);
|
|
||||||
LOG_D("power on %s device.", device->name);
|
LOG_D("power on %s device.", device->name);
|
||||||
|
rt_thread_mdelay(2000);
|
||||||
/* wait ml307 startup finish, send AT every 500ms, if receive OK, SYNC success*/
|
/* wait ml307 startup finish, send AT every 500ms, if receive OK, SYNC success*/
|
||||||
if (at_client_obj_wait_connect(client, ML307_WAIT_CONNECT_TIME))
|
if (at_client_obj_wait_connect(client, ML307_WAIT_CONNECT_TIME))
|
||||||
{
|
{
|
||||||
result = -RT_ETIMEOUT;
|
result = -RT_ETIMEOUT;
|
||||||
goto __exit;
|
goto __exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* disable echo */
|
/* disable echo */
|
||||||
AT_SEND_CMD(client, resp, 0, ML307_AT_DEFAULT_TIMEOUT, "ATE0");
|
AT_SEND_CMD(client, resp, 0, ML307_AT_DEFAULT_TIMEOUT, "ATE0");
|
||||||
/* get module version */
|
/* get module version */
|
||||||
|
@ -1142,7 +1139,7 @@ static void ml307_init_thread_entry(void *parameter)
|
||||||
goto __exit;
|
goto __exit;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
Time_Calibration(device);
|
Time_Calibration(device);
|
||||||
/* initialize successfully */
|
/* initialize successfully */
|
||||||
result = RT_EOK;
|
result = RT_EOK;
|
||||||
break;
|
break;
|
||||||
|
@ -1172,7 +1169,7 @@ static void ml307_init_thread_entry(void *parameter)
|
||||||
LOG_I("%s device network initialize success.", device->name);
|
LOG_I("%s device network initialize success.", device->name);
|
||||||
while (Flash_Get_Calibration_State() == kNotCalibrated)
|
while (Flash_Get_Calibration_State() == kNotCalibrated)
|
||||||
{
|
{
|
||||||
rt_thread_mdelay(1000);//we need wait for calibration finish
|
rt_thread_mdelay(1000); // we need wait for calibration finish
|
||||||
}
|
}
|
||||||
rt_completion_done(&ml307_init_complate); // 通知初始化完成
|
rt_completion_done(&ml307_init_complate); // 通知初始化完成
|
||||||
}
|
}
|
||||||
|
@ -1357,8 +1354,8 @@ static int ml307_init(struct at_device *device)
|
||||||
{
|
{
|
||||||
GPIO_InitTypeDef GPIO_InitStructure;
|
GPIO_InitTypeDef GPIO_InitStructure;
|
||||||
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
|
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
|
||||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;
|
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;
|
||||||
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
|
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
|
||||||
GPIO_Init(GPIOB, &GPIO_InitStructure);
|
GPIO_Init(GPIOB, &GPIO_InitStructure);
|
||||||
// rt_pin_mode(ml307->power_status_pin, PIN_MODE_INPUT);
|
// rt_pin_mode(ml307->power_status_pin, PIN_MODE_INPUT);
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,10 @@ static void _CommonBtnEvtCb(void *arg)
|
||||||
|
|
||||||
if (flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_DOUBLE_CLICK)
|
if (flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_DOUBLE_CLICK)
|
||||||
{
|
{
|
||||||
Send_Laser_Alarm_Event(kSelfCheckEvent);
|
if ( SysControl.status > kPreheatingEvent)
|
||||||
|
{
|
||||||
|
Send_Laser_Alarm_Event(kSelfCheckEvent);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_CLICK)
|
else if (flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_CLICK)
|
||||||
{
|
{
|
||||||
|
|
|
@ -895,7 +895,7 @@ int BSP_Flash_Init (void)
|
||||||
|
|
||||||
Flash_SetProductTimeLimit (2025, 2, 10, 13, 50, 20, kFactoryTimeId);
|
Flash_SetProductTimeLimit (2025, 2, 10, 13, 50, 20, kFactoryTimeId);
|
||||||
Set_ExpirationTime (MAX_EXPIRATION_DAYS);
|
Set_ExpirationTime (MAX_EXPIRATION_DAYS);
|
||||||
Flash_Set_Calibration_State(kSysGasCalibStatus); // 标定状态
|
Flash_Set_Calibration_State(kNotCalibrated); // 标定状态
|
||||||
Flash_Set_Valve_Num(0);
|
Flash_Set_Valve_Num(0);
|
||||||
sci.hw_ver = SYS_HW_VERSION;
|
sci.hw_ver = SYS_HW_VERSION;
|
||||||
sci.sw_ver = SYS_SW_VERSION;
|
sci.sw_ver = SYS_SW_VERSION;
|
||||||
|
|
|
@ -173,8 +173,17 @@ uint8_t IS_EndOfLife(void)
|
||||||
// MQ检测线程函数
|
// MQ检测线程函数
|
||||||
static void Sensor_detection_thread_entry(void *param)
|
static void Sensor_detection_thread_entry(void *param)
|
||||||
{
|
{
|
||||||
|
uint8_t calibration_flag = 0;
|
||||||
|
while (1)//等待标定
|
||||||
|
{
|
||||||
|
calibration_flag = Flash_Get_Calibration_State();
|
||||||
|
if(calibration_flag == 1)
|
||||||
|
break;
|
||||||
|
rt_thread_mdelay(1000);
|
||||||
|
}
|
||||||
|
|
||||||
rt_uint16_t alarm_value = Flash_Get_SysCfg(kAlarmLValueId); // 获取系统报警阈值;
|
rt_uint16_t alarm_value = Flash_Get_SysCfg(kAlarmLValueId); // 获取系统报警阈值;
|
||||||
if (alarm_value > 4095)
|
if ((alarm_value > 4095)||(alarm_value < 300))
|
||||||
{
|
{
|
||||||
alarm_value = 1600;
|
alarm_value = 1600;
|
||||||
}
|
}
|
||||||
|
@ -193,8 +202,6 @@ static void Sensor_detection_thread_entry(void *param)
|
||||||
|
|
||||||
int BSP_MQ_Init(void)
|
int BSP_MQ_Init(void)
|
||||||
{
|
{
|
||||||
Sensor_device.alarm_value = Flash_Get_SysCfg(kAlarmLValueId);
|
|
||||||
LOG_D("报警阈值为:%d", Sensor_device.alarm_value);
|
|
||||||
rt_thread_init(&Sensor_Thread, // 可以用定时器做,没必要线程
|
rt_thread_init(&Sensor_Thread, // 可以用定时器做,没必要线程
|
||||||
"sensor_thread",
|
"sensor_thread",
|
||||||
Sensor_detection_thread_entry,
|
Sensor_detection_thread_entry,
|
||||||
|
|
Loading…
Reference in New Issue