|
@@ -36,11 +36,15 @@
|
|
|
#define DTU_THREAD_STACK_SIZE 2048 //线程栈空间大小
|
|
#define DTU_THREAD_STACK_SIZE 2048 //线程栈空间大小
|
|
|
#define DTU_THREAD_TIMESLICE 5 //时间片
|
|
#define DTU_THREAD_TIMESLICE 5 //时间片
|
|
|
|
|
|
|
|
|
|
+/* JSON 通信超时看门狗:记录上次成功解析一帧 JSON 的 tick,
|
|
|
|
|
+ * 若超过 DTU_JSON_TIMEOUT_TICKS (2h) 仍未收到,则执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) 的心跳 */
|
|
|
|
|
+#define DTU_JSON_TIMEOUT_MS (2 * 60 * 60 * 1000UL) /* 2 小时 */
|
|
|
|
|
+#define DTU_JSON_RESET_OFF_MS (10 * 1000UL) /* OFF 持续 10s */
|
|
|
|
|
+static volatile rt_tick_t g_dtu_json_last_tick = 0; /* 上次成功解析 JSON 的时间 */
|
|
|
|
|
|
|
|
Device_Status_typedef device_status;
|
|
Device_Status_typedef device_status;
|
|
|
Device_slide_typedef slide_para;
|
|
Device_slide_typedef slide_para;
|
|
|
Flashdb_typedef flashdb_value;
|
|
Flashdb_typedef flashdb_value;
|
|
|
-DataTemp data_arry;
|
|
|
|
|
|
|
|
|
|
void list_mem(void);
|
|
void list_mem(void);
|
|
|
/* 串口接收消息结构*/
|
|
/* 串口接收消息结构*/
|
|
@@ -70,7 +74,7 @@ static int DTU_uart2_init(void)
|
|
|
dtuconfig.data_bits = DATA_BITS_8; //数据位8c
|
|
dtuconfig.data_bits = DATA_BITS_8; //数据位8c
|
|
|
dtuconfig.stop_bits = STOP_BITS_1; //停止位1
|
|
dtuconfig.stop_bits = STOP_BITS_1; //停止位1
|
|
|
#ifdef RT_USING_SERIAL_V2
|
|
#ifdef RT_USING_SERIAL_V2
|
|
|
- dtuconfig.rx_bufsz = 1024;
|
|
|
|
|
|
|
+ dtuconfig.rx_bufsz = 2048;
|
|
|
dtuconfig.tx_bufsz = 2048;
|
|
dtuconfig.tx_bufsz = 2048;
|
|
|
#else
|
|
#else
|
|
|
dtuconfig.bufsz = 1024; //缓冲区1k
|
|
dtuconfig.bufsz = 1024; //缓冲区1k
|
|
@@ -135,8 +139,35 @@ static dtu_thread_entry_send(void *parameter)
|
|
|
/* 安装信号 */
|
|
/* 安装信号 */
|
|
|
rt_signal_install(SIGUSR2, parseDtu);
|
|
rt_signal_install(SIGUSR2, parseDtu);
|
|
|
rt_signal_unmask(SIGUSR2);
|
|
rt_signal_unmask(SIGUSR2);
|
|
|
|
|
+ /* 同时承担通信超时看门狗:每 1 秒轮询一次,
|
|
|
|
|
+ * 若超过 DTU_JSON_TIMEOUT_MS 仍未收到任何 JSON,
|
|
|
|
|
+ * 则执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) 的心跳 */
|
|
|
|
|
+ g_dtu_json_last_tick = rt_tick_get(); /* 启动时记一次,避免开机立刻触发 */
|
|
|
while(1){
|
|
while(1){
|
|
|
rt_thread_mdelay(1000);
|
|
rt_thread_mdelay(1000);
|
|
|
|
|
+ rt_tick_t now = rt_tick_get();
|
|
|
|
|
+ rt_tick_t diff;
|
|
|
|
|
+ if (now >= g_dtu_json_last_tick)
|
|
|
|
|
+ {
|
|
|
|
|
+ diff = now - g_dtu_json_last_tick;
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ /* tick 计数回绕:把差值视为 0,避免误触发 */
|
|
|
|
|
+ diff = 0;
|
|
|
|
|
+ }
|
|
|
|
|
+ rt_ubase_t diff_ms = (rt_ubase_t)((diff * 1000UL) / RT_TICK_PER_SECOND);
|
|
|
|
|
+ if (diff_ms >= DTU_JSON_TIMEOUT_MS)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_W("DTU JSON timeout (>%lu ms), Heart OFF -> 10s -> ON",
|
|
|
|
|
+ (unsigned long)DTU_JSON_TIMEOUT_MS);
|
|
|
|
|
+ ctr_Heat(OFF);
|
|
|
|
|
+ rt_thread_mdelay(DTU_JSON_RESET_OFF_MS);
|
|
|
|
|
+ ctr_Heat(ON);
|
|
|
|
|
+ /* 更新基准时间,等待下一个 2h 周期再判断;
|
|
|
|
|
+ * 此时若通信已恢复,g_dtu_json_last_tick 会被 lwjsonSTREAMDONE 主动刷新 */
|
|
|
|
|
+ g_dtu_json_last_tick = rt_tick_get();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -153,13 +184,23 @@ static void dtu_thread_entry_recv(void *parameter)
|
|
|
/* 阻塞等待接收信号量,等到信号量后再次读取数据 */
|
|
/* 阻塞等待接收信号量,等到信号量后再次读取数据 */
|
|
|
rt_sem_take(&rx_sem, RT_WAITING_FOREVER);
|
|
rt_sem_take(&rx_sem, RT_WAITING_FOREVER);
|
|
|
}
|
|
}
|
|
|
- accum_buf[accum_len++]=ch;
|
|
|
|
|
- if (accum_len >= sizeof(accum_buf)) {
|
|
|
|
|
- // 防止超范围
|
|
|
|
|
- accum_len = 0;
|
|
|
|
|
- lwjson_stream_reset(&lwparser);
|
|
|
|
|
- continue;
|
|
|
|
|
|
|
+ /* 累积存储,留 1 字节放 '\0',避免 parseDtu 越界访问 */
|
|
|
|
|
+ if (accum_len >= sizeof(accum_buf) - 1) {
|
|
|
|
|
+ LOG_W("dtu accum buffer overflow(%d), drop & reset parser!", (int)accum_len);
|
|
|
|
|
+ accum_len = 0;
|
|
|
|
|
+ memset(accum_buf, 0, sizeof(accum_buf));
|
|
|
|
|
+ lwjson_stream_reset(&lwparser);
|
|
|
|
|
+ /* 把串口硬件 RX 队列里残留的字节也丢掉,避免下一帧再次错乱 */
|
|
|
|
|
+ {
|
|
|
|
|
+ char drain_buf[64];
|
|
|
|
|
+ while (rt_device_read(dtuserial, -1, drain_buf, sizeof(drain_buf)) > 0) {
|
|
|
|
|
+ /* drain */
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ continue;
|
|
|
}
|
|
}
|
|
|
|
|
+ accum_buf[accum_len++] = ch;
|
|
|
|
|
+ accum_buf[accum_len] = '\0';
|
|
|
lwjsonr_t ret;
|
|
lwjsonr_t ret;
|
|
|
ret = lwjson_stream_parse(&lwparser, ch); // 把串口数据逐字节的喂给解析器去解析
|
|
ret = lwjson_stream_parse(&lwparser, ch); // 把串口数据逐字节的喂给解析器去解析
|
|
|
switch(ret)
|
|
switch(ret)
|