This commit is contained in:
小马_666 2025-04-08 14:40:25 +08:00
parent 85ea0ad683
commit b8bdca571e
6 changed files with 427 additions and 364 deletions

View File

@ -70,6 +70,10 @@
"time.h": "c",
"ch32v30x.h": "c",
"lwutil.h": "c",
"netdev.h": "c"
"netdev.h": "c",
"drv_log.h": "c",
"drv_usart.h": "c",
"signal.h": "c",
"xtr1common": "c"
}
}

View File

@ -2,7 +2,7 @@
* @Author: mbw
* @Date: 2024-10-23 17:14:16
* @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
* @Descrt_thread_
*
@ -115,18 +115,15 @@ int _Self_Check_Mode(void)
LED_STOP(g);
LED_STOP(y);
rt_thread_mdelay(500);
LED_CTRL(g, "500,2500", 1);
LED_CTRL(g, "500,2500", -1);
LED_START(g);
rt_thread_mdelay(1000);
LED_CTRL(y, "500,2500", 1);
LED_CTRL(y, "500,2500", -1);
LED_START(y);
rt_thread_mdelay(1000);
LED_CTRL(r, "500,2500", 1);
LED_CTRL(r, "500,2500", -1);
LED_START(r);
rt_thread_mdelay(1000);
LED_STOP(r);
LED_STOP(g);
LED_STOP(y);
BEEP_SELF_CHECK;
return RT_EOK;
}
@ -153,25 +150,59 @@ void Preheat_Timer_Callback(void *parameter)
LOG_D("预热完成");
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)
rt_err_t result = RT_EINVAL;
rt_uint32_t received_event;
rt_thread_mdelay(100);
if (Get_VIN_VoltageInt1000x() > 10000)
{
SYS_EventInit();
BSP_SYS_Init();
work_duration = Flash_Get_WorkDuration();
LOG_D("工作时长:%d", work_duration);
// 读取历史记录总数
g_Calibration_status = Flash_Get_Calibration_State();
rt_thread_mdelay(10);
if (g_Calibration_status == kSysGasCalibStatus)
{
TuFlashProductTimeLimitFrame LimitTime;
if (Flash_GetProductTimeLimit(&LimitTime, kExpirationTimeId) == READY)
{
@ -206,56 +237,7 @@ int main(void)
Send_Laser_Alarm_Event(kPreheatingEvent); // 这一句的作用是设备不是掉电重启的情况,直接进入预热模式
}
RCC_ClearFlag();
}
}
else
{
LOG_D("欠压复位\r\n");
RCC_ClearFlag();
NVIC_SystemReset(); // 直接重启系统
}
BSP_VIN_Detection_Init();
while (1)
{
if (g_Calibration_status == kNotCalibrated) // 没标定
{
LED_STOP(r);
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();
LOG_D("ticks[%d] gas_calibration_voltage = %d", ticks++, gas_calibration_voltage);
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);
}
}
else
{
result = rt_event_recv(&alarm_event,
Get_Sys_Event_Flag(kPowerOnEvent) | // 上电
@ -312,29 +294,29 @@ int main(void)
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("电磁阀动作失败");
}
}
}
// 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)) // 浓度异常
{
@ -354,6 +336,12 @@ int main(void)
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())
{
@ -380,7 +368,6 @@ int main(void)
SysControl.last_status = SysControl.status;
SysControl.status = kAlarmRcyEvent;
Flash_Write_Record(kRecordAlarmRcy);
BEEP_STOP;
@ -464,7 +451,7 @@ int main(void)
}
}
rt_uint8_t cnt = 0;
while ((ml307_power_down_flag == 0) && (cnt < 20)) // 等待接收到物联网模组关机完成
while ((ml307_power_down_flag == 0) && (cnt < 30)) // 等待接收到物联网模组关机完成
{
rt_thread_mdelay(1000);
LOG_D("cnt = %d", cnt);
@ -482,9 +469,34 @@ int main(void)
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)) // 失效
@ -503,6 +515,45 @@ int main(void)
}
}
}
}
int main(void)
{
if (Get_VIN_VoltageInt1000x() > 10000)
{
SYS_EventInit();
BSP_SYS_Init();
work_duration = Flash_Get_WorkDuration();
LOG_D("工作时长:%d", work_duration);
// 读取历史记录总数
g_Calibration_status = Flash_Get_Calibration_State();
rt_thread_mdelay(10);
}
else
{
LOG_D("欠压复位\r\n");
RCC_ClearFlag();
NVIC_SystemReset(); // 直接重启系统
}
BSP_VIN_Detection_Init();
while (1)
{
switch (g_Calibration_status)
{
case kNotCalibrated: // 没标定
{
APP_Calibration_Handle();
break;
}
case kSysGasCalibStatus:
{
APP_Handle();
break;
}
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_Set_Calibration_State(kSysGasCalibStatus);
LOG_D("标定值修改为 = %d", Flash_Get_SysCfg(kAlarmLValueId));
g_Calibration_status = kSysGasCalibStatus;
}
else
{

View File

@ -2,7 +2,7 @@
* @Author: mbw
* @Date: 2024-11-30 15:46:21
* @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
* @Description:
*
@ -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;
@ -84,14 +84,11 @@ static rt_err_t ml307_power_on(struct at_device *device)
ml307 = (struct at_device_ml307 *)device->user_data;
/* 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_thread_mdelay(ML307_POWER_ON_TIME * RT_TICK_PER_SECOND);
@ -830,7 +827,7 @@ int Time_Calibration(struct at_device *device)
/*+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 ((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.month = mounth;
@ -904,15 +901,15 @@ static void ml307_init_thread_entry(void *parameter)
/* power on the ml307 device */
rt_thread_mdelay(1000);
ml307_power_on(device);
rt_thread_mdelay(2000);
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*/
if (at_client_obj_wait_connect(client, ML307_WAIT_CONNECT_TIME))
{
result = -RT_ETIMEOUT;
goto __exit;
}
/* disable echo */
AT_SEND_CMD(client, resp, 0, ML307_AT_DEFAULT_TIMEOUT, "ATE0");
/* get module version */
@ -1172,7 +1169,7 @@ static void ml307_init_thread_entry(void *parameter)
LOG_I("%s device network initialize success.", device->name);
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); // 通知初始化完成
}

View File

@ -54,9 +54,12 @@ static void _CommonBtnEvtCb(void *arg)
// static rt_uint8_t button_cnt = 0;
if (flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_DOUBLE_CLICK)
{
if ( SysControl.status > kPreheatingEvent)
{
Send_Laser_Alarm_Event(kSelfCheckEvent);
}
}
else if (flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_CLICK)
{
if (Sensor_device.detection_flag == kSensorAlarm)

View File

@ -895,7 +895,7 @@ int BSP_Flash_Init (void)
Flash_SetProductTimeLimit (2025, 2, 10, 13, 50, 20, kFactoryTimeId);
Set_ExpirationTime (MAX_EXPIRATION_DAYS);
Flash_Set_Calibration_State(kSysGasCalibStatus); // 标定状态
Flash_Set_Calibration_State(kNotCalibrated); // 标定状态
Flash_Set_Valve_Num(0);
sci.hw_ver = SYS_HW_VERSION;
sci.sw_ver = SYS_SW_VERSION;

View File

@ -173,8 +173,17 @@ uint8_t IS_EndOfLife(void)
// MQ检测线程函数
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); // 获取系统报警阈值;
if (alarm_value > 4095)
if ((alarm_value > 4095)||(alarm_value < 300))
{
alarm_value = 1600;
}
@ -193,8 +202,6 @@ static void Sensor_detection_thread_entry(void *param)
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, // 可以用定时器做,没必要线程
"sensor_thread",
Sensor_detection_thread_entry,