|
@@ -36,10 +36,11 @@
|
|
|
|
|
|
|
|
/* JSON 通信超时看门狗:记录上次成功解析一帧 JSON 的 tick,
|
|
/* JSON 通信超时看门狗:记录上次成功解析一帧 JSON 的 tick,
|
|
|
* 若超过 DTU_JSON_TIMEOUT_TICKS (2h) 仍未收到,则执行 ctr_router(OFF) -> 10s -> ctr_router(ON) 的心跳 */
|
|
* 若超过 DTU_JSON_TIMEOUT_TICKS (2h) 仍未收到,则执行 ctr_router(OFF) -> 10s -> ctr_router(ON) 的心跳 */
|
|
|
|
|
+#define DTU_UPLOAD_TIMEOUT_MS (1 * 60 * 60 * 1000UL) /* 1 小时无数据主动上传 */
|
|
|
#define DTU_JSON_TIMEOUT_MS (2 * 60 * 60 * 1000UL) /* 2 小时 */
|
|
#define DTU_JSON_TIMEOUT_MS (2 * 60 * 60 * 1000UL) /* 2 小时 */
|
|
|
#define DTU_JSON_RESET_OFF_MS (10 * 1000UL) /* OFF 持续 10s */
|
|
#define DTU_JSON_RESET_OFF_MS (10 * 1000UL) /* OFF 持续 10s */
|
|
|
static volatile rt_tick_t g_dtu_json_last_tick = 0; /* 上次成功解析 JSON 的时间 */
|
|
static volatile rt_tick_t g_dtu_json_last_tick = 0; /* 上次成功解析 JSON 的时间 */
|
|
|
-
|
|
|
|
|
|
|
+static volatile rt_tick_t g_dtu_upload_last_tick = 0; /* 上次主动上传心跳的时间(防止通信未恢复时每秒重复发) */
|
|
|
|
|
|
|
|
Device_Status_typedef device_status;
|
|
Device_Status_typedef device_status;
|
|
|
Device_slide_typedef slide_para;
|
|
Device_slide_typedef slide_para;
|
|
@@ -136,19 +137,22 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-static dtu_thread_entry_send(void *parameter)
|
|
|
|
|
|
|
+static void 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 秒轮询一次,
|
|
/* 同时承担通信超时看门狗:每 1 秒轮询一次,
|
|
|
- * 若超过 DTU_JSON_TIMEOUT_MS 仍未收到任何 JSON,
|
|
|
|
|
- * 则执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) 的心跳 */
|
|
|
|
|
|
|
+ * 超过 DTU_UPLOAD_TIMEOUT_MS (1h) 未收到任何 JSON: 主动发送 UpLoad_Data 心跳探测对端;
|
|
|
|
|
+ * 超过 DTU_JSON_TIMEOUT_MS (2h) 仍未收到: 执行 ctr_Heat(OFF) -> 10s -> ctr_Heat(ON) */
|
|
|
g_dtu_json_last_tick = rt_tick_get(); /* 启动时记一次,避免开机立刻触发 */
|
|
g_dtu_json_last_tick = rt_tick_get(); /* 启动时记一次,避免开机立刻触发 */
|
|
|
- while(1){
|
|
|
|
|
|
|
+ g_dtu_upload_last_tick = g_dtu_json_last_tick;
|
|
|
|
|
+ while (1)
|
|
|
|
|
+ {
|
|
|
rt_thread_mdelay(1000);
|
|
rt_thread_mdelay(1000);
|
|
|
rt_tick_t now = rt_tick_get();
|
|
rt_tick_t now = rt_tick_get();
|
|
|
rt_tick_t diff;
|
|
rt_tick_t diff;
|
|
|
|
|
+ rt_tick_t upload_diff;
|
|
|
if (now >= g_dtu_json_last_tick)
|
|
if (now >= g_dtu_json_last_tick)
|
|
|
{
|
|
{
|
|
|
diff = now - g_dtu_json_last_tick;
|
|
diff = now - g_dtu_json_last_tick;
|
|
@@ -158,14 +162,33 @@ static dtu_thread_entry_send(void *parameter)
|
|
|
/* tick 计数回绕:把差值视为 0,避免误触发 */
|
|
/* tick 计数回绕:把差值视为 0,避免误触发 */
|
|
|
diff = 0;
|
|
diff = 0;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (now >= g_dtu_upload_last_tick)
|
|
|
|
|
+ {
|
|
|
|
|
+ upload_diff = now - g_dtu_upload_last_tick;
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ upload_diff = 0;
|
|
|
|
|
+ }
|
|
|
rt_ubase_t diff_ms = (rt_ubase_t)((diff * 1000UL) / RT_TICK_PER_SECOND);
|
|
rt_ubase_t diff_ms = (rt_ubase_t)((diff * 1000UL) / RT_TICK_PER_SECOND);
|
|
|
|
|
+ rt_ubase_t upload_diff_ms = (rt_ubase_t)((upload_diff * 1000UL) / RT_TICK_PER_SECOND);
|
|
|
|
|
+ /* 1h 未收到任何数据且距上次主动上传也已满 1h: 主动上传一次心跳,
|
|
|
|
|
+ * 探测对端是否在线; 对端若回复任意合法 JSON, g_dtu_json_last_tick 会被刷新 */
|
|
|
|
|
+ if (diff_ms >= DTU_UPLOAD_TIMEOUT_MS &&
|
|
|
|
|
+ upload_diff_ms >= DTU_UPLOAD_TIMEOUT_MS)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_W("DTU JSON timeout (>%lu ms), 主动发送 UpLoad_Data 心跳",
|
|
|
|
|
+ (unsigned long)DTU_UPLOAD_TIMEOUT_MS);
|
|
|
|
|
+ g_dtu_upload_last_tick = now;
|
|
|
|
|
+ UpLoad_Data();
|
|
|
|
|
+ }
|
|
|
if (diff_ms >= DTU_JSON_TIMEOUT_MS)
|
|
if (diff_ms >= DTU_JSON_TIMEOUT_MS)
|
|
|
{
|
|
{
|
|
|
LOG_W("DTU JSON timeout (>%lu ms), Heart OFF -> 10s -> ON",
|
|
LOG_W("DTU JSON timeout (>%lu ms), Heart OFF -> 10s -> ON",
|
|
|
(unsigned long)DTU_JSON_TIMEOUT_MS);
|
|
(unsigned long)DTU_JSON_TIMEOUT_MS);
|
|
|
- ctr_Heat(OFF);
|
|
|
|
|
|
|
+ ctr_router(OFF);
|
|
|
rt_thread_mdelay(DTU_JSON_RESET_OFF_MS);
|
|
rt_thread_mdelay(DTU_JSON_RESET_OFF_MS);
|
|
|
- ctr_Heat(ON);
|
|
|
|
|
|
|
+ ctr_router(ON);
|
|
|
/* 更新基准时间,等待下一个 2h 周期再判断;
|
|
/* 更新基准时间,等待下一个 2h 周期再判断;
|
|
|
* 此时若通信已恢复,g_dtu_json_last_tick 会被 lwjsonSTREAMDONE 主动刷新 */
|
|
* 此时若通信已恢复,g_dtu_json_last_tick 会被 lwjsonSTREAMDONE 主动刷新 */
|
|
|
g_dtu_json_last_tick = rt_tick_get();
|
|
g_dtu_json_last_tick = rt_tick_get();
|
|
@@ -173,7 +196,6 @@ static dtu_thread_entry_send(void *parameter)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
static void dtu_thread_entry_recv(void *parameter)
|
|
static void dtu_thread_entry_recv(void *parameter)
|
|
|
{
|
|
{
|
|
|
static char accum_buf[MAX_DTU_SIZE]; // 累积缓冲区(根据实际数据量调整)
|
|
static char accum_buf[MAX_DTU_SIZE]; // 累积缓冲区(根据实际数据量调整)
|
|
@@ -212,6 +234,8 @@ static void dtu_thread_entry_recv(void *parameter)
|
|
|
memset(accum_buf,0,sizeof(accum_buf));
|
|
memset(accum_buf,0,sizeof(accum_buf));
|
|
|
//rt_thread_kill(dtu_send_data, SIGUSR2);
|
|
//rt_thread_kill(dtu_send_data, SIGUSR2);
|
|
|
lwjson_stream_reset(&lwparser);
|
|
lwjson_stream_reset(&lwparser);
|
|
|
|
|
+ /* 成功解析一帧 JSON,更新"上次心跳"时间戳 */
|
|
|
|
|
+ g_dtu_json_last_tick = rt_tick_get();
|
|
|
break;
|
|
break;
|
|
|
case lwjsonERRMEM: // 5, 嵌套的太深("LWJSON_CFG_STREAM_STACK_SIZE")
|
|
case lwjsonERRMEM: // 5, 嵌套的太深("LWJSON_CFG_STREAM_STACK_SIZE")
|
|
|
LOG_E("parser stack overflow (ERRMEM), resetting parser!");
|
|
LOG_E("parser stack overflow (ERRMEM), resetting parser!");
|
|
@@ -1027,7 +1051,7 @@ int parseDtu(char *json_string)
|
|
|
}else{
|
|
}else{
|
|
|
send_signal(SIGUSR2);
|
|
send_signal(SIGUSR2);
|
|
|
}
|
|
}
|
|
|
- ctr_Heat(OFF);
|
|
|
|
|
|
|
+ ctr_Heat(OFF); //关闭风机
|
|
|
device_status.autotakepic = 2;
|
|
device_status.autotakepic = 2;
|
|
|
}
|
|
}
|
|
|
|
|
|