|
@@ -57,6 +57,14 @@ struct rx_msg
|
|
|
static struct rt_semaphore rx_sem; /* 用于接收消息的信号量 */
|
|
static struct rt_semaphore rx_sem; /* 用于接收消息的信号量 */
|
|
|
static struct rt_mutex dtu_write_mutex; /* DTU写互斥锁,防止多线程串口*/
|
|
static struct rt_mutex dtu_write_mutex; /* DTU写互斥锁,防止多线程串口*/
|
|
|
|
|
|
|
|
|
|
+/* 发送线程的事件集与两个软定时器(周期上报 / 1s检查):
|
|
|
|
|
+ * 供 dtu_send_thread_delete_safe() 与 dtu_data_play() 引用,故声明在文件前部 */
|
|
|
|
|
+static struct rt_event s_dtu_send_evt; /* 发送线程事件集 */
|
|
|
|
|
+static struct rt_timer s_dtu_report_timer; /* 周期上报定时器(dattim 分钟) */
|
|
|
|
|
+static struct rt_timer s_dtu_check_timer; /* 1s 检查定时器:异常提前上报 + RTU 通信看门狗 */
|
|
|
|
|
+static uint8_t s_dtu_send_inited = 0; /* 事件集/定时器是否已初始化 */
|
|
|
|
|
+static volatile uint8_t s_reporting = 0; /* 1=正在执行一次上报(等效原 num_updata==0 窗口) */
|
|
|
|
|
+
|
|
|
rt_thread_t dtu_recv_data = RT_NULL;
|
|
rt_thread_t dtu_recv_data = RT_NULL;
|
|
|
rt_thread_t dtu_send_data = RT_NULL;
|
|
rt_thread_t dtu_send_data = RT_NULL;
|
|
|
|
|
|
|
@@ -87,6 +95,9 @@ void dtu_send_thread_delete_safe(void)
|
|
|
{
|
|
{
|
|
|
if (thread_delete_safe(&dtu_send_data) == 0)
|
|
if (thread_delete_safe(&dtu_send_data) == 0)
|
|
|
{
|
|
{
|
|
|
|
|
+ /* 线程已删除:停止上报/检查定时器,避免其继续向无人消费的事件集发事件 */
|
|
|
|
|
+ rt_timer_stop(&s_dtu_report_timer);
|
|
|
|
|
+ rt_timer_stop(&s_dtu_check_timer);
|
|
|
LOG_I("dtu send thread deleted safely");
|
|
LOG_I("dtu send thread deleted safely");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -332,144 +343,187 @@ static void dtu_thread_entry_recv(void *parameter)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+/* ==================== DTU 周期上报(定时器驱动,2026-10-08 重构) ====================
|
|
|
|
|
+ * 本次重构三点:
|
|
|
|
|
+ * 1) 不再区分联网状态:原实现按 net/gps/时间分"正常上报"与"等待联网"双分支,
|
|
|
|
|
+ * 现统一为一条流程——线程启动后即按周期上报,网侧状态不影响上报节拍;
|
|
|
|
|
+ * 2) 周期上报改由软件定时器驱动(周期= dattim 分钟):到点由定时器发事件,
|
|
|
|
|
+ * 发送线程收到后执行"readinfo → 1s → UpLoad_Data → 保险丝检测";
|
|
|
|
|
+ * 每次上报后按最新 dattim 重排定时器(等效原"上报后重置倒计时"语义);
|
|
|
|
|
+ * 3) 掉电检测与预警上报移入 ADC 模块(sht30_collect.c Power_ReadCheck,
|
|
|
|
|
+ * 那里本就以 100ms 周期采集电压/电流并做欠压判断)。
|
|
|
|
|
+ * 保留项:雨控/温控异常提前上报、RTU 通信看门狗(2小时无JSON断电重启)、
|
|
|
|
|
+ * 上报后10秒屏幕休眠、保险丝熔断预警。 */
|
|
|
|
|
+#define DTU_EVT_REPORT (1u << 0) /* 到点执行一次数据上报 */
|
|
|
|
|
+#define DTU_EVT_RTU_WDT (1u << 1) /* RTU 通信看门狗超时:断电重启 RTU */
|
|
|
|
|
+
|
|
|
|
|
+/* 事件集/定时器对象与 s_reporting 的声明在文件前部变量区(供 delete_safe 引用) */
|
|
|
|
|
+
|
|
|
|
|
+/* 周期上报定时器回调:只发事件,重活留给发送线程 */
|
|
|
|
|
+static void dtu_report_timer_cb(void *parameter)
|
|
|
|
|
+{
|
|
|
|
|
+ rt_event_send(&s_dtu_send_evt, DTU_EVT_REPORT);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/* 1 秒检查定时器回调(运行在软件定时器线程,保持轻量):
|
|
|
|
|
+ * ① 雨控/温控进入异常时提前触发一次上报(原每秒检查的 check_i 逻辑,
|
|
|
|
|
+ * 仅 0→1 变化时触发一次,恢复正常后重新武装);
|
|
|
|
|
+ * ② RTU 通信看门狗:连续 2 小时未收到 JSON 触发 RTU 断电重启(先重置计时
|
|
|
|
|
+ * 再发事件,避免每秒反复触发;实际断电/重启动作由发送线程执行)。 */
|
|
|
|
|
+static void dtu_check_timer_cb(void *parameter)
|
|
|
|
|
+{
|
|
|
|
|
+ static uint8_t check_i = 0;
|
|
|
|
|
+
|
|
|
|
|
+ if(device_status.rain_status==1||device_status.temp_status==1)
|
|
|
|
|
+ {
|
|
|
|
|
+ if(check_i==0)
|
|
|
|
|
+ {
|
|
|
|
|
+ check_i = 1;
|
|
|
|
|
+ rt_event_send(&s_dtu_send_evt, DTU_EVT_REPORT);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ check_i = 0;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if(s_last_json_rx_tick != 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_tick_t elapsed = rt_tick_get() - s_last_json_rx_tick;
|
|
|
|
|
+ if(elapsed >= JSON_RX_TIMEOUT_TICK)
|
|
|
|
|
+ {
|
|
|
|
|
+ s_last_json_rx_tick = rt_tick_get(); /* 先重置,防止反复触发 */
|
|
|
|
|
+ rt_event_send(&s_dtu_send_evt, DTU_EVT_RTU_WDT);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/* 一次完整上报(在发送线程上下文执行):
|
|
|
|
|
+ * 拉取 RTU 状态(readinfo) → 1s(等 RTU 回复刷新设备信息) → 上报数据 → 保险丝熔断检测 */
|
|
|
|
|
+static void dtu_periodic_report(void)
|
|
|
|
|
+{
|
|
|
|
|
+ char *readinfo;
|
|
|
|
|
+ char *res_fuse_warn;
|
|
|
|
|
+
|
|
|
|
|
+ s_reporting = 1; /* 标记上报窗口(parseDtu 收到同步数据时的提示音沿用此时机) */
|
|
|
|
|
+
|
|
|
|
|
+ readinfo = makeJson_ReadInfo();
|
|
|
|
|
+ DTU_Write("%s",readinfo);
|
|
|
|
|
+ rt_free(readinfo);
|
|
|
|
|
+ rt_thread_delay(1000);
|
|
|
|
|
+ UpLoad_Data();
|
|
|
|
|
+
|
|
|
|
|
+ if(atoi(device_status.fuse_voltage)<5)
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_thread_delay(500);
|
|
|
|
|
+ static char res[30];
|
|
|
|
|
+ sprintf(res, "Fuse is fusing:%s",device_status.fuse_voltage);
|
|
|
|
|
+ res_fuse_warn = makeJson_Warn(res,"device");
|
|
|
|
|
+ DTU_Write("%s",res_fuse_warn);
|
|
|
|
|
+ rt_free(res_fuse_warn);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ s_reporting = 0;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/* 按最新 dattim 重排周期上报定时器(单位分钟)。
|
|
|
|
|
+ * 每次上报后调用:从当前时刻重新计一个完整周期,
|
|
|
|
|
+ * 等价于原实现"上报完成后 num_updata = dattim*60"的语义。 */
|
|
|
|
|
+static void dtu_report_timer_reload(void)
|
|
|
|
|
+{
|
|
|
|
|
+ rt_tick_t period;
|
|
|
|
|
+
|
|
|
|
|
+ if(device_status.dattim==0) device_status.dattim=20; //数据上传时间间隔设置为0?
|
|
|
|
|
+ period = (rt_tick_t)device_status.dattim * 60UL * RT_TICK_PER_SECOND;
|
|
|
|
|
+
|
|
|
|
|
+ /* 数据上传倒计时初值:距下次周期上报剩余秒数(发送线程每秒递减、每10s打印) */
|
|
|
|
|
+ device_status.num_updata = device_status.dattim * 60;
|
|
|
|
|
+
|
|
|
|
|
+ rt_timer_stop(&s_dtu_report_timer);
|
|
|
|
|
+ rt_timer_control(&s_dtu_report_timer, RT_TIMER_CTRL_SET_TIME, &period);
|
|
|
|
|
+ rt_timer_start(&s_dtu_report_timer);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/* 外部接口:请求尽快执行一次数据上报(屏幕设置时间后更新 RTU 时间等场景),
|
|
|
|
|
+ * 不阻塞调用者;上报完成后定时器会按最新 dattim 自动重排(原实现为 num_updata=2)。 */
|
|
|
|
|
+void dtu_request_report(void)
|
|
|
|
|
+{
|
|
|
|
|
+ if(s_dtu_send_inited == 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ return; /* 发送线程尚未初始化(异常路径),忽略本次请求 */
|
|
|
|
|
+ }
|
|
|
|
|
+ rt_event_send(&s_dtu_send_evt, DTU_EVT_REPORT);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
/*入口函数-指令发送*/
|
|
/*入口函数-指令发送*/
|
|
|
static void dtu_thread_entry_send(void *parameter)
|
|
static void dtu_thread_entry_send(void *parameter)
|
|
|
{
|
|
{
|
|
|
|
|
+ rt_uint32_t recved;
|
|
|
|
|
+ rt_uint8_t print_cnt = 0; /* 倒计时打印节拍(每10s一行) */
|
|
|
|
|
+
|
|
|
if(device_status.iFlag==0){
|
|
if(device_status.iFlag==0){
|
|
|
backup_param_to_rtu();
|
|
backup_param_to_rtu();
|
|
|
}else{
|
|
}else{
|
|
|
recover_param_from_rtu();
|
|
recover_param_from_rtu();
|
|
|
}
|
|
}
|
|
|
- device_status.power_status = 1;
|
|
|
|
|
device_status.num_updata = 0;
|
|
device_status.num_updata = 0;
|
|
|
rt_thread_delay(10000);
|
|
rt_thread_delay(10000);
|
|
|
/* RTU 通信看门狗从线程启动时开始计时:
|
|
/* RTU 通信看门狗从线程启动时开始计时:
|
|
|
* 原实现只在“曾经收到过 JSON”后才计时,RTU 完全无输出(波特率错、模块故障)时保护失效 */
|
|
* 原实现只在“曾经收到过 JSON”后才计时,RTU 完全无输出(波特率错、模块故障)时保护失效 */
|
|
|
s_last_json_rx_tick = rt_tick_get();
|
|
s_last_json_rx_tick = rt_tick_get();
|
|
|
- static rt_uint16_t wait_i = 0;
|
|
|
|
|
- static rt_uint8_t check_i = 0;
|
|
|
|
|
- static rt_uint8_t power_i = 0;
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /* 开机首次上报(不等联网、不区分联网状态),随后启动周期定时器 */
|
|
|
|
|
+ dtu_periodic_report();
|
|
|
|
|
+ dtu_report_timer_reload();
|
|
|
|
|
+ rt_timer_start(&s_dtu_check_timer);
|
|
|
|
|
+
|
|
|
while(1)
|
|
while(1)
|
|
|
{
|
|
{
|
|
|
- if(device_status.update_flag==1) break;
|
|
|
|
|
- time_t now_t;
|
|
|
|
|
- time(&now_t);
|
|
|
|
|
- static struct tm now_tm; //现在
|
|
|
|
|
- //获取当前时间戳
|
|
|
|
|
- now_tm =*localtime(&now_t);
|
|
|
|
|
- if(atoi(device_status.net)==0||atoi(device_status.gps)==1||(now_tm.tm_year+1900 >=2024)) //当前时间大于2024
|
|
|
|
|
|
|
+ rt_err_t evt_ret;
|
|
|
|
|
+
|
|
|
|
|
+ /* 1 秒超时用于维护数据上传倒计时与周期打印;有事件时立即唤醒处理 */
|
|
|
|
|
+ evt_ret = rt_event_recv(&s_dtu_send_evt,
|
|
|
|
|
+ DTU_EVT_REPORT | DTU_EVT_RTU_WDT,
|
|
|
|
|
+ RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
|
|
|
|
|
+ rt_tick_from_millisecond(1000), &recved);
|
|
|
|
|
+ if (evt_ret == -RT_ETIMEOUT)
|
|
|
{
|
|
{
|
|
|
- if(device_status.rain_status==1||device_status.temp_status==1)
|
|
|
|
|
- {
|
|
|
|
|
- if(check_i==0)
|
|
|
|
|
- {
|
|
|
|
|
- check_i = 1;
|
|
|
|
|
- device_status.num_updata = 0;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- check_i = 0;
|
|
|
|
|
- }
|
|
|
|
|
- if(device_status.num_updata!=0)
|
|
|
|
|
- {
|
|
|
|
|
- device_status.num_updata--;
|
|
|
|
|
- //屏幕休眠
|
|
|
|
|
- if(device_status.num_updata==(device_status.dattim * 60-10))
|
|
|
|
|
- {
|
|
|
|
|
- HMI_WRITE("sleep=%d",1);
|
|
|
|
|
- }
|
|
|
|
|
- LOG_I("掉电检测:%d-%d",atoi(device_status.voltage),device_status.power_status);
|
|
|
|
|
- //检测到电源掉电
|
|
|
|
|
- if(atoi(device_status.voltage)<5&&device_status.power_status==1)
|
|
|
|
|
- {
|
|
|
|
|
- power_i++;
|
|
|
|
|
- //确定网络状态
|
|
|
|
|
- if(power_i==10)
|
|
|
|
|
- {
|
|
|
|
|
- device_status.bat_status = 1;
|
|
|
|
|
- rt_sprintf(device_status.net, "1");
|
|
|
|
|
- HMI_WRITE("sleep=%d",1); //屏幕休眠
|
|
|
|
|
- DTU_Write("%s",makeJson_Warn("power down","power"));
|
|
|
|
|
- device_status.power_status = 0;
|
|
|
|
|
- rt_thread_delay(1000);
|
|
|
|
|
- UpLoad_Data();
|
|
|
|
|
- rt_thread_delay(5000);
|
|
|
|
|
- ctr_router(OFF);
|
|
|
|
|
- RTU_Power_Off_Safe();
|
|
|
|
|
- power_i = 0;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- if(atoi(device_status.voltage)>=12&&device_status.power_status==0) //电压正常
|
|
|
|
|
- {
|
|
|
|
|
- device_status.power_status = 1;
|
|
|
|
|
- ctr_router(ON);
|
|
|
|
|
- RTU_Power_On_Restore();
|
|
|
|
|
- power_i = 0;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- char *readinfo = makeJson_ReadInfo();
|
|
|
|
|
- DTU_Write("%s",readinfo);
|
|
|
|
|
- rt_free(readinfo);
|
|
|
|
|
- rt_thread_delay(1000);
|
|
|
|
|
- UpLoad_Data();
|
|
|
|
|
- if(atoi(device_status.fuse_voltage)<1)
|
|
|
|
|
- {
|
|
|
|
|
- rt_thread_delay(500);
|
|
|
|
|
- static char res[30];
|
|
|
|
|
- sprintf(res, "Fuse is fusing:%s",device_status.fuse_voltage);
|
|
|
|
|
- char * res_fuse_warn = makeJson_Warn(res,"device");
|
|
|
|
|
- DTU_Write("%s",res_fuse_warn);
|
|
|
|
|
- rt_free(res_fuse_warn);
|
|
|
|
|
- }
|
|
|
|
|
- device_status.num_updata = device_status.dattim * 60;
|
|
|
|
|
- if(device_status.dattim==0) device_status.dattim=20; //数据上传时间间隔设置为0?
|
|
|
|
|
- if(device_status.bat_status==0) device_status.power_status = 1; //解除欠压,清除标志位
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- wait_i ++;
|
|
|
|
|
- LOG_I("wait connect internet......%d",wait_i);
|
|
|
|
|
- //检测到电源掉电
|
|
|
|
|
- if(atoi(device_status.voltage)<5&&device_status.power_status==1&&wait_i>200)
|
|
|
|
|
|
|
+ /* 数据上传倒计时:距下次周期上报的剩余秒数,每秒递减;
|
|
|
|
|
+ * 每 10 秒打印一次,便于真机观察上报节拍 */
|
|
|
|
|
+ if(device_status.num_updata > 0)
|
|
|
{
|
|
{
|
|
|
- check_i++;
|
|
|
|
|
- LOG_W("断网状态下检测到设备断电!%d",atoi(device_status.voltage));
|
|
|
|
|
- if(check_i==10)
|
|
|
|
|
- {
|
|
|
|
|
- device_status.bat_status = 1;
|
|
|
|
|
- device_status.power_status = 0;
|
|
|
|
|
- rt_thread_delay(5000);
|
|
|
|
|
- ctr_router(OFF);
|
|
|
|
|
- RTU_Power_Off_Safe();
|
|
|
|
|
- check_i = 0;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ device_status.num_updata--;
|
|
|
}
|
|
}
|
|
|
- if(Read_Real_Voltage()/100>=12&&device_status.power_status==0)
|
|
|
|
|
|
|
+ if(++print_cnt >= 10)
|
|
|
{
|
|
{
|
|
|
- check_i = 0;
|
|
|
|
|
- LOG_W("电源恢复正常,打开路由器和RTU供电!");
|
|
|
|
|
- device_status.power_status = 1;
|
|
|
|
|
- //打开路由器和RTU供电
|
|
|
|
|
- ctr_router(ON);
|
|
|
|
|
- RTU_Power_On_Restore();
|
|
|
|
|
|
|
+ print_cnt = 0;
|
|
|
|
|
+ LOG_I("数据上传周期:%d 分 倒计时:%d S",device_status.dattim,(int)device_status.num_updata);
|
|
|
}
|
|
}
|
|
|
|
|
+ continue;
|
|
|
}
|
|
}
|
|
|
- /* 看门狗:检测是否连续2小时未收到JSON数据 */
|
|
|
|
|
- if(s_last_json_rx_tick != 0) {
|
|
|
|
|
- rt_tick_t elapsed = rt_tick_get() - s_last_json_rx_tick;
|
|
|
|
|
- if(elapsed >= JSON_RX_TIMEOUT_TICK) {
|
|
|
|
|
- LOG_W("连续2小时未收到JSON数据,执行RTU断电重启...");
|
|
|
|
|
- RTU_Power_Off_Safe();
|
|
|
|
|
- LOG_I("RTU已断电,等待60秒后重新上电...");
|
|
|
|
|
- rt_thread_mdelay(60000); /* 保持断电60秒,确保电容放完 */
|
|
|
|
|
- LOG_I("60秒等待结束,重新恢复RTU供电...");
|
|
|
|
|
- RTU_Power_On_Restore();
|
|
|
|
|
- s_last_json_rx_tick = rt_tick_get(); /* 重置计时,防止反复触发 */
|
|
|
|
|
- LOG_I("RTU断电重启完成");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (evt_ret != RT_EOK)
|
|
|
|
|
+ {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /* RTU 通信看门狗超时:断电重启 RTU(动作与原实现一致) */
|
|
|
|
|
+ if(recved & DTU_EVT_RTU_WDT)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_W("连续2小时未收到JSON数据,执行RTU断电重启...");
|
|
|
|
|
+ RTU_Power_Off_Safe();
|
|
|
|
|
+ LOG_I("RTU已断电,等待60秒后重新上电...");
|
|
|
|
|
+ rt_thread_mdelay(60000); /* 保持断电60秒,确保电容放完 */
|
|
|
|
|
+ LOG_I("60秒等待结束,重新恢复RTU供电...");
|
|
|
|
|
+ RTU_Power_On_Restore();
|
|
|
|
|
+ s_last_json_rx_tick = rt_tick_get(); /* 重置计时,防止反复触发 */
|
|
|
|
|
+ LOG_I("RTU断电重启完成");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /* 数据上报(周期到点 或 异常/外部请求触发) */
|
|
|
|
|
+ if(recved & DTU_EVT_REPORT)
|
|
|
|
|
+ {
|
|
|
|
|
+ dtu_periodic_report();
|
|
|
|
|
+ dtu_report_timer_reload();
|
|
|
}
|
|
}
|
|
|
- rt_thread_mdelay(1000);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -521,6 +575,14 @@ int dtu_data_play(void)
|
|
|
* 会重置正在使用的互斥锁;懒初始化可保证只初始化一次。 */
|
|
* 会重置正在使用的互斥锁;懒初始化可保证只初始化一次。 */
|
|
|
/* 初始化信号量 */
|
|
/* 初始化信号量 */
|
|
|
rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
|
|
rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
|
|
|
|
|
+ /* 初始化发送线程的事件集与两个软定时器(周期上报 / 1s检查),
|
|
|
|
|
+ * 对象先于线程创建,保证 dtu_request_report() 等外部调用时序安全 */
|
|
|
|
|
+ rt_event_init(&s_dtu_send_evt, "dtu_send", RT_IPC_FLAG_FIFO);
|
|
|
|
|
+ rt_timer_init(&s_dtu_report_timer, "du_report", dtu_report_timer_cb, RT_NULL,
|
|
|
|
|
+ RT_TICK_PER_SECOND, RT_TIMER_FLAG_PERIODIC | RT_TIMER_FLAG_SOFT_TIMER);
|
|
|
|
|
+ rt_timer_init(&s_dtu_check_timer, "du_check", dtu_check_timer_cb, RT_NULL,
|
|
|
|
|
+ RT_TICK_PER_SECOND, RT_TIMER_FLAG_PERIODIC | RT_TIMER_FLAG_SOFT_TIMER);
|
|
|
|
|
+ s_dtu_send_inited = 1;
|
|
|
/* 设置接收回调函数 */
|
|
/* 设置接收回调函数 */
|
|
|
rt_device_set_rx_indicate(dtuserial, dtu_input);
|
|
rt_device_set_rx_indicate(dtuserial, dtu_input);
|
|
|
/*创建线程-指令发送*/
|
|
/*创建线程-指令发送*/
|
|
@@ -1283,7 +1345,12 @@ void recover_param_from_rtu(void)
|
|
|
void upload_sys_monitor_info(void)
|
|
void upload_sys_monitor_info(void)
|
|
|
{
|
|
{
|
|
|
char value_str[32];
|
|
char value_str[32];
|
|
|
- cJSON* proot = cJSON_CreateObject();
|
|
|
|
|
|
|
+ cJSON* proot;
|
|
|
|
|
+
|
|
|
|
|
+ /* 现场刷新 CPU温度/利用率/运行时长(原 sys_monitor 后台线程已取消,2026-10-08) */
|
|
|
|
|
+ sys_monitor_refresh();
|
|
|
|
|
+
|
|
|
|
|
+ proot = cJSON_CreateObject();
|
|
|
if (proot == NULL) {
|
|
if (proot == NULL) {
|
|
|
LOG_E("Error: Failed to create JSON object\n");
|
|
LOG_E("Error: Failed to create JSON object\n");
|
|
|
return;
|
|
return;
|
|
@@ -1418,10 +1485,6 @@ char * makeJson()
|
|
|
device_status._lamp = 0;
|
|
device_status._lamp = 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if(atoi(device_status.power)>5000)
|
|
if(atoi(device_status.power)>5000)
|
|
|
{
|
|
{
|
|
|
rt_sprintf(device_status.power,"0.01");
|
|
rt_sprintf(device_status.power,"0.01");
|
|
@@ -1489,6 +1552,18 @@ char * makeJson()
|
|
|
cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
|
|
cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
|
|
|
cJSON_AddStringToObject(pSubJson, "dver", device_status.driver); //版本号,字符型
|
|
cJSON_AddStringToObject(pSubJson, "dver", device_status.driver); //版本号,字符型
|
|
|
cJSON_AddStringToObject(pSubJson,"proj",device_status.project); //项目类型
|
|
cJSON_AddStringToObject(pSubJson,"proj",device_status.project); //项目类型
|
|
|
|
|
+ /* bootloader 版本与编译时间上报(blver / bltime):
|
|
|
|
|
+ * 由 bootloader 每次启动写入 EF(driver_bl / driver_compile),这里现读 EF。
|
|
|
|
|
+ * 注意:device_status.driver_compile 内存值已被 main.c 的 CompileTime 宏覆盖为
|
|
|
|
|
+ * app 编译时间(屏幕调试页显示用),不能直接使用,必须从 EF 读取 BL 的。 */
|
|
|
|
|
+ {
|
|
|
|
|
+ char bl_ver[64] = {0};
|
|
|
|
|
+ char bl_time[64] = {0};
|
|
|
|
|
+ ef_get_env_blob("driver_bl", bl_ver, sizeof(bl_ver) - 1, NULL);
|
|
|
|
|
+ ef_get_env_blob("driver_compile", bl_time, sizeof(bl_time) - 1, NULL);
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson, "blver", bl_ver); //bootloader版本
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson, "bltime", bl_time); //bootloader编译时间
|
|
|
|
|
+ }
|
|
|
//设备类型
|
|
//设备类型
|
|
|
rt_sprintf(utos, "%d",device_status.dtype);
|
|
rt_sprintf(utos, "%d",device_status.dtype);
|
|
|
cJSON_AddStringToObject(pSubJson,"dtype",utos);
|
|
cJSON_AddStringToObject(pSubJson,"dtype",utos);
|
|
@@ -1764,6 +1839,114 @@ int Parse_Cam_Param(cJSON *param_msg)
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+/* ==================== 运行时 OTA(Ymodem)升级支持 ====================
|
|
|
|
|
+ * 需求:收到 {"cmd":"update"} 后不重启,关闭无关线程后直接调用 ymodem_ota(1,0)。
|
|
|
|
|
+ * 关键约束:升级时 console/finsh 会被 ymodem_ota 切到 uart2(uart2 被设置成调试口),
|
|
|
|
|
+ * 而 uart2 同时是 Ymodem 固件数据通道,因此升级全程"不能打印日志",否则日志
|
|
|
|
|
+ * 字节会混入固件数据流导致升级失败。对应措施:
|
|
|
|
|
+ * 1) rt_console_mute(1):从进入升级流程起静默全部 rt_kprintf/LOG_x 输出
|
|
|
|
|
+ * (实现见 rt-thread/src/kservice.c);升级结束会复位重启,无需恢复;
|
|
|
|
|
+ * 2) 关闭所有会打印日志或写 uart2 的无关线程(工作流程/发送/采集/HMI 等);
|
|
|
|
|
+ * 3) 参考 RTU_Power_Off_Safe() 的做法把 uart2 停干净:先复位 USART2 外设停掉
|
|
|
|
|
+ * 仍挂着的接收 DMA(避免 close 释放接收缓冲后 DMA 继续写已释放内存),再
|
|
|
|
|
+ * close 并清 ACTIVATED,使 Ymodem 侧重新走完整 open/初始化。
|
|
|
|
|
+ * 注意不切断 RTU 供电——升级文件正是经 RTU 转发进入 uart2 的。 */
|
|
|
|
|
+extern void rt_console_mute(rt_uint8_t enable);
|
|
|
|
|
+extern int delete_mb_thread(void); /* 见 sample_mb_master.c */
|
|
|
|
|
+
|
|
|
|
|
+#define OTA_THREAD_STACK_SIZE 4096
|
|
|
|
|
+#define OTA_THREAD_PRIORITY 8
|
|
|
|
|
+#define OTA_QUIET_WAIT_MS 2000 /* 静默等待 RTU 最后一帧响应落地 */
|
|
|
|
|
+
|
|
|
|
|
+static rt_thread_t ota_upgrade_tid = RT_NULL;
|
|
|
|
|
+
|
|
|
|
|
+/* Ymodem 接收线程入口。
|
|
|
|
|
+ * 独立 4KB 栈:避免 ymodem+fal+sfud+SPI 的调用深度叠加在 DTU 接收线程(2560)栈上。 */
|
|
|
|
|
+static void ota_upgrade_thread_entry(void *parameter)
|
|
|
|
|
+{
|
|
|
|
|
+ (void)parameter;
|
|
|
|
|
+ rt_thread_mdelay(1000); /* 等接收线程挂起完成、系统彻底安静 */
|
|
|
|
|
+ /* 默认分区(fm_area),与开机升级路径一致;成功/失败内部都会复位重启 */
|
|
|
|
|
+ ymodem_ota(1, 0);
|
|
|
|
|
+ while (1) /* ymodem_ota 正常不返回;兜底挂住等待复位 */
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_thread_mdelay(1000);
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/* 把 uart2 恢复成"干净未初始化"状态,交给 Ymodem 重新初始化串口 */
|
|
|
|
|
+static void uart2_prepare_for_ota(void)
|
|
|
|
|
+{
|
|
|
|
|
+ if (dtuserial == RT_NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ /* 外设复位:停掉接收 DMA 请求,避免 close 释放接收缓冲后 DMA 继续写该内存 */
|
|
|
|
|
+ __HAL_RCC_USART2_FORCE_RESET();
|
|
|
|
|
+ rt_thread_mdelay(1);
|
|
|
|
|
+ __HAL_RCC_USART2_RELEASE_RESET();
|
|
|
|
|
+ /* 关闭串口设备(释放接收缓冲并关中断),清 ACTIVATED 让下次 open 重新 init */
|
|
|
|
|
+ rt_device_close(dtuserial);
|
|
|
|
|
+ dtuserial->flag &= ~RT_DEVICE_FLAG_ACTIVATED;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/* 收到运行时升级指令后的总入口(执行在 DTU 接收线程上下文) */
|
|
|
|
|
+static void ota_upgrade_enter(void)
|
|
|
|
|
+{
|
|
|
|
|
+ rt_device_t wdg;
|
|
|
|
|
+ rt_uint32_t wdt_timeout = 25;
|
|
|
|
|
+ rt_kprintf("Warning: Ymodem has started! This operator will not recovery.\n");
|
|
|
|
|
+ rt_kprintf("Please select the ota firmware file and use Ymodem to send.\n");
|
|
|
|
|
+ /* --- 1. 全局静默:从此刻起禁止一切控制台打印(升级期间 uart2 是数据通道)--- */
|
|
|
|
|
+ rt_console_mute(1);
|
|
|
|
|
+
|
|
|
|
|
+ /* --- 2. 置RAM标志让 DTU 发送线程下一轮循环自行退出。
|
|
|
|
|
+ * 只改 RAM 不写 Flash:防止升级后再次开机遇 update_flag=1 误入第二次升级 --- */
|
|
|
|
|
+ device_status.update_flag = 1;
|
|
|
|
|
+
|
|
|
|
|
+ /* --- 3. 关闭无关线程(内部均为"判定未挂 IPC 等待再删除+重试"的安全删除)--- */
|
|
|
|
|
+ dtu_send_thread_delete_safe(); /* DTU 发送线程:持续向 RTU 发查询并打印 */
|
|
|
|
|
+ thread_delete_workloop(); /* 工作流程/工作状态/清扫/加热 4 个线程 */
|
|
|
|
|
+ thread_delete_adc(); /* ADC采集/电源检测线程:持续打印采样值 */
|
|
|
|
|
+ delete_mb_thread(); /* Modbus 采集线程:打印非常频繁 */
|
|
|
|
|
+ delete_hmi_thread(); /* 屏幕收发/电机控制线程:逐帧打印屏幕数据 */
|
|
|
|
|
+
|
|
|
|
|
+ if (timer_takephoto != RT_NULL) /* 拍照超时定时器回调里有日志 */
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_timer_stop(timer_takephoto);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /* --- 4. 静默等待:确保 RTU 侧在途数据发完、无人再碰 uart2 --- */
|
|
|
|
|
+ rt_thread_mdelay(OTA_QUIET_WAIT_MS);
|
|
|
|
|
+
|
|
|
|
|
+ /* --- 5. 看门狗加长:NorFlash 整片擦除是纯轮询阻塞操作,期间空闲线程无法喂狗,
|
|
|
|
|
+ * 10s 超时可能在擦除阶段误复位;放大到 25s(IWDG 硬件上限约 26s)--- */
|
|
|
|
|
+ wdg = rt_device_find("wdt");
|
|
|
|
|
+ if (wdg != RT_NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_device_control(wdg, RT_DEVICE_CTRL_WDT_SET_TIMEOUT, &wdt_timeout);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /* --- 6. uart2 停干净,交给 Ymodem --- */
|
|
|
|
|
+ uart2_prepare_for_ota();
|
|
|
|
|
+
|
|
|
|
|
+ /* --- 7. 拉起 Ymodem 接收线程 --- */
|
|
|
|
|
+ ota_upgrade_tid = rt_thread_create("ota_upgrade",
|
|
|
|
|
+ ota_upgrade_thread_entry, RT_NULL,
|
|
|
|
|
+ OTA_THREAD_STACK_SIZE,
|
|
|
|
|
+ OTA_THREAD_PRIORITY,
|
|
|
|
|
+ 10);
|
|
|
|
|
+ if (ota_upgrade_tid != RT_NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_thread_startup(ota_upgrade_tid);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ /* 理论到不了这里;此时日志已静默,复位回来重新触发即可 */
|
|
|
|
|
+ rt_hw_cpu_reset();
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
//JSON数据解析
|
|
//JSON数据解析
|
|
|
int parseDtu(char *json_string)
|
|
int parseDtu(char *json_string)
|
|
|
{
|
|
{
|
|
@@ -1815,6 +1998,7 @@ int parseDtu(char *json_string)
|
|
|
cJSON* METHOD = NULL;
|
|
cJSON* METHOD = NULL;
|
|
|
cJSON* PARAMS = NULL;
|
|
cJSON* PARAMS = NULL;
|
|
|
cJSON* RESULT = NULL;
|
|
cJSON* RESULT = NULL;
|
|
|
|
|
+ cJSON* ID = NULL;
|
|
|
LOG_D("parse:%s\n",json_string);
|
|
LOG_D("parse:%s\n",json_string);
|
|
|
cJSON *root = cJSON_Parse(json_string);
|
|
cJSON *root = cJSON_Parse(json_string);
|
|
|
if(!root)
|
|
if(!root)
|
|
@@ -1829,6 +2013,7 @@ int parseDtu(char *json_string)
|
|
|
METHOD = cJSON_GetObjectItem(root,"method");
|
|
METHOD = cJSON_GetObjectItem(root,"method");
|
|
|
PARAMS = cJSON_GetObjectItem(root,"params");
|
|
PARAMS = cJSON_GetObjectItem(root,"params");
|
|
|
RESULT = cJSON_GetObjectItem(root,"result");
|
|
RESULT = cJSON_GetObjectItem(root,"result");
|
|
|
|
|
+ ID = cJSON_GetObjectItem(root,"id");
|
|
|
if (JSONRPC != NULL && METHOD != NULL && METHOD->type == cJSON_String) {
|
|
if (JSONRPC != NULL && METHOD != NULL && METHOD->type == cJSON_String) {
|
|
|
// 使用 strcmp 比较字符串
|
|
// 使用 strcmp 比较字符串
|
|
|
if (strcmp(METHOD->valuestring, "upgradehmi") == 0) {
|
|
if (strcmp(METHOD->valuestring, "upgradehmi") == 0) {
|
|
@@ -1862,6 +2047,27 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
}
|
|
|
}else if(strcmp(METHOD->valuestring,"systeminfo")==0) {
|
|
}else if(strcmp(METHOD->valuestring,"systeminfo")==0) {
|
|
|
upload_sys_monitor_info();
|
|
upload_sys_monitor_info();
|
|
|
|
|
+ }else if(strcmp(METHOD->valuestring,"update")==0) {
|
|
|
|
|
+ /* 先回复 JSONRPC 响应再重启(否则重启后无法应答):
|
|
|
|
|
+ * {"jsonrpc":"2.0","result":{"message":"success"},"id":请求id}
|
|
|
|
|
+ * 该结构与本工程解析 RTU 回复的方式一致(result.message)。 */
|
|
|
|
|
+ char *tmp = makeJson_Warn("system will update","control");
|
|
|
|
|
+ if(tmp!=RT_NULL){
|
|
|
|
|
+ DTU_Write("%s",tmp);
|
|
|
|
|
+ rt_free(tmp);
|
|
|
|
|
+ LOG_W("收到升级指令:已回复success,写BKP_DR2=0x5AA5,重启进入升级!");
|
|
|
|
|
+ /* 修改RTC备份寄存器(DR2=0x5AA5),然后重启MCU:
|
|
|
|
|
+ * bootloader 检测到该标志后进入升级流程。
|
|
|
|
|
+ * 位置与 main.c 中读取/清除的 boot_flag 为同一寄存器
|
|
|
|
|
+ * (BKP_BASE + 4*2 = RTC_BKP_DR2)。写 BKP 前需使能
|
|
|
|
|
+ * PWR/BKP 时钟与备份域写访问(DBP)。 */
|
|
|
|
|
+ __HAL_RCC_PWR_CLK_ENABLE();
|
|
|
|
|
+ __HAL_RCC_BKP_CLK_ENABLE();
|
|
|
|
|
+ HAL_PWR_EnableBkUpAccess();
|
|
|
|
|
+ *(__IO uint16_t *)(BKP_BASE + 4 * 2) = 0x5AA5;
|
|
|
|
|
+ rt_thread_delay(500); /* 等回复报文发出后再重启 */
|
|
|
|
|
+ rt_hw_cpu_reset();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else{
|
|
else{
|
|
|
LOG_W("未知的命令: %s", METHOD->valuestring);
|
|
LOG_W("未知的命令: %s", METHOD->valuestring);
|
|
@@ -2247,13 +2453,24 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
}
|
|
|
else if (strstr(item_cmd->valuestring,"update")!=RT_NULL)
|
|
else if (strstr(item_cmd->valuestring,"update")!=RT_NULL)
|
|
|
{
|
|
{
|
|
|
- LOG_W("启动升级!!!");
|
|
|
|
|
|
|
+ /* 运行时直接进入 Ymodem 升级(不再先重启):
|
|
|
|
|
+ * 1) 先通知 RTU/平台即将升级,并等其完成最后一次交互;
|
|
|
|
|
+ * 2) ota_upgrade_enter() 关闭无关线程、全局静默日志、把 uart2
|
|
|
|
|
+ * 停干净后拉起 Ymodem 接收线程;
|
|
|
|
|
+ * 3) 本接收线程随即挂起,uart2 完全交给 Ymodem。
|
|
|
|
|
+ * 注意:升级时 uart2 被设置成调试口(console+Ymodem 数据通道),
|
|
|
|
|
+ * 升级全程不能打印任何日志,否则会破坏固件数据流。 */
|
|
|
|
|
+ LOG_W("启动升级(运行时进入Ymodem,不重启)!!!");
|
|
|
DTU_Write("%s",makeJson_Warn("system will update","control"));
|
|
DTU_Write("%s",makeJson_Warn("system will update","control"));
|
|
|
rt_thread_delay(2000);
|
|
rt_thread_delay(2000);
|
|
|
- device_status.update_flag = 1;
|
|
|
|
|
- ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));;
|
|
|
|
|
- rt_thread_delay(1000);
|
|
|
|
|
- rt_hw_cpu_reset();
|
|
|
|
|
|
|
+ ota_upgrade_enter();
|
|
|
|
|
+ /* 挂起本接收线程:避免其继续 read uart2 抢占 Ymodem 数据 */
|
|
|
|
|
+ rt_thread_suspend(rt_thread_self());
|
|
|
|
|
+ while(1)
|
|
|
|
|
+ {
|
|
|
|
|
+ /* 兜底:若被意外唤醒则空转,等 ymodem 完成后复位 */
|
|
|
|
|
+ rt_thread_mdelay(1000);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else if (strstr(item_cmd->valuestring,"read")!=RT_NULL)
|
|
else if (strstr(item_cmd->valuestring,"read")!=RT_NULL)
|
|
|
{
|
|
{
|
|
@@ -2577,22 +2794,15 @@ int parseDtu(char *json_string)
|
|
|
safe_copy_str(device_status.mqttcfg2, sizeof(device_status.mqttcfg2), mqttcfg2->valuestring, "mqttcfg2");
|
|
safe_copy_str(device_status.mqttcfg2, sizeof(device_status.mqttcfg2), mqttcfg2->valuestring, "mqttcfg2");
|
|
|
LOG_I("当前平台2:%s",device_status.mqttcfg2);
|
|
LOG_I("当前平台2:%s",device_status.mqttcfg2);
|
|
|
}
|
|
}
|
|
|
- if( device_status.num_updata==0)
|
|
|
|
|
|
|
+ /* s_reporting=1 等效原 num_updata==0 的上报窗口:该窗口内的同步数据只提示,
|
|
|
|
|
+ * 窗口外若屏幕请求过数据刷新(hmi_fresh==2)则补发一次上报 */
|
|
|
|
|
+ if( s_reporting==1 )
|
|
|
{
|
|
{
|
|
|
Beep_Tip(100);
|
|
Beep_Tip(100);
|
|
|
}
|
|
}
|
|
|
- else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
|
|
|
|
|
|
|
+ else if(device_status.hmi_fresh==2)
|
|
|
{
|
|
{
|
|
|
UpLoad_Data();
|
|
UpLoad_Data();
|
|
|
-// if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
|
|
|
|
|
-// {
|
|
|
|
|
-//
|
|
|
|
|
-// }
|
|
|
|
|
-// else
|
|
|
|
|
-// {
|
|
|
|
|
-// rt_thread_delay(2000);
|
|
|
|
|
-// UpLoad_Data();
|
|
|
|
|
-// }
|
|
|
|
|
}
|
|
}
|
|
|
device_status.hmi_fresh = 0;
|
|
device_status.hmi_fresh = 0;
|
|
|
}
|
|
}
|