|
|
@@ -45,6 +45,8 @@ static char msg_pool[512];
|
|
|
|
|
|
static char rx_buffer[HMI_UART_RXBUFFER_SIZE + 1];
|
|
|
|
|
|
+static rt_bool_t uart2_timeout_flag = RT_FALSE;
|
|
|
+
|
|
|
void list_mem(void);
|
|
|
int mb_master_samlpe();
|
|
|
/**/
|
|
|
@@ -260,84 +262,7 @@ void process_hex_payload(const char* hex_str, int req_id) {
|
|
|
|
|
|
DTU_Write(progress_json);
|
|
|
}
|
|
|
-#if 0
|
|
|
-// 处理HEX数据包
|
|
|
-void process_hex_payload(const char* hex_str, int req_id)
|
|
|
-{
|
|
|
- if (!hex_str) return;
|
|
|
- uint8_t binary_data[JSON_CHUNK_SIZE];
|
|
|
- int data_len = fast_hex_to_bin(hex_str, binary_data, JSON_CHUNK_SIZE);
|
|
|
-
|
|
|
- if (data_len <= 0) {
|
|
|
- LOG_E("HEX转换失败\n");
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- // 检查缓冲区是否足够
|
|
|
- if (recv_write_pos + data_len > RECV_BUFFER_SIZE) {
|
|
|
- LOG_E("接收缓冲区已满\n");
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- // 复制到接收缓冲区
|
|
|
- memcpy(recv_buffer + recv_write_pos, binary_data, data_len);
|
|
|
- recv_write_pos += data_len;
|
|
|
- bytes_received += data_len;
|
|
|
-
|
|
|
- rt_kprintf("收到数据: %d字节, 累计: %d/%d\n",
|
|
|
- data_len, bytes_received, total_file_size);
|
|
|
-
|
|
|
- uint32_t available = recv_write_pos - recv_read_pos;
|
|
|
- while (available >= 4096) {
|
|
|
- // 发送4096字节到HMI
|
|
|
- if (send_raw_to_hmi(recv_buffer + recv_read_pos, 4096) != 0) {
|
|
|
- LOG_E("发送到HMI失败");
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- // 更新读取位置
|
|
|
- recv_read_pos += 4096;
|
|
|
- available -= 4096;
|
|
|
-
|
|
|
- LOG_I("已发送 4096 字节,缓冲剩余: %d 字节", available);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- // 3. 如果缓冲区有剩余数据,且所有数据已接收完成
|
|
|
- if (bytes_received >= total_file_size && total_file_size > 0 && available > 0) {
|
|
|
- // 发送剩余数据
|
|
|
- if (send_raw_to_hmi(recv_buffer + recv_read_pos, available) != 0) {
|
|
|
- LOG_E("发送最后一包失败");
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- LOG_I("发送最后一包: %d 字节,升级完成!", available);
|
|
|
-
|
|
|
- // 重置缓冲区
|
|
|
- recv_read_pos = 0;
|
|
|
- recv_write_pos = 0;
|
|
|
|
|
|
- // 发送完成通知
|
|
|
- char complete_json[256];
|
|
|
- rt_snprintf(complete_json, sizeof(complete_json),
|
|
|
- "{\"jsonrpc\":\"2.0\",\"method\":\"upgrade_complete\","
|
|
|
- "\"params\":{\"total\":%d},\"id\":%d}",
|
|
|
- total_file_size, req_id);
|
|
|
-
|
|
|
- DTU_Write(complete_json);
|
|
|
- return;
|
|
|
- }
|
|
|
- // 发送进度响应
|
|
|
- int progress = total_file_size > 0 ? (bytes_received * 100 / total_file_size) : 0;
|
|
|
- char progress_json[256];
|
|
|
- rt_snprintf(progress_json, sizeof(progress_json),
|
|
|
- "{\"jsonrpc\":\"2.0\",\"method\":\"upgradehmi\","
|
|
|
- "\"params\":{\"received\":%d,\"total\":%d,\"progress\":%d},\"id\":%d}",
|
|
|
- bytes_received, total_file_size, progress, req_id);
|
|
|
-
|
|
|
- DTU_Write(progress_json);
|
|
|
-}
|
|
|
-#endif
|
|
|
|
|
|
/*入口函数*/
|
|
|
static void Hmi_thread_entry(void *parameter)
|
|
|
@@ -387,6 +312,7 @@ static void t_uart2_callback(void *parameter)
|
|
|
{
|
|
|
HMI_WRITE("sysSet.va0.txt=\"指令超时,请重试...\"");
|
|
|
LOG_I("t_uart2_callback");
|
|
|
+ uart2_timeout_flag = RT_TRUE;
|
|
|
}
|
|
|
|
|
|
void Start_timer_Uart2(void)
|
|
|
@@ -402,6 +328,19 @@ void Start_timer_Uart2(void)
|
|
|
|
|
|
}
|
|
|
|
|
|
+void Stop_timer_Uart2(void)
|
|
|
+{
|
|
|
+
|
|
|
+ if(timer_uart2!=RT_NULL){
|
|
|
+ rt_timer_stop(timer_uart2);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LOG_E("timer_uart2 stop Failed!");
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
/***************************** 解析从屏幕收到的数据 begin **********************************/
|
|
|
static void HMI_Decode(void)
|
|
|
{
|
|
|
@@ -1714,10 +1653,23 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
time(&time_reset12V);
|
|
|
static struct tm alarm_reset12V;
|
|
|
alarm_reset12V =*localtime(&time_reset12V);
|
|
|
- if((alarm_reset12V.tm_hour)==8&&(alarm_reset12V.tm_min==19)&&(alarm_reset12V.tm_sec==50))
|
|
|
+ if((alarm_reset12V.tm_hour)==8&&(alarm_reset12V.tm_min==18)&&(alarm_reset12V.tm_sec==00))
|
|
|
+ {
|
|
|
+ char *rep = makeJsonRpc2_0("reboot",NULL, 1);
|
|
|
+ if(rep){
|
|
|
+ device_status.C01 = 100;
|
|
|
+ DTU_Write(rep);
|
|
|
+ //启动超时定时器
|
|
|
+ Start_timer_Uart2();
|
|
|
+ free(rep);
|
|
|
+ }
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ }
|
|
|
+ if(uart2_timeout_flag==RT_TRUE)
|
|
|
{
|
|
|
+ uart2_timeout_flag = RT_FALSE;
|
|
|
ctr_RTU_DTU(OFF);
|
|
|
- rt_thread_delay(1000*10);
|
|
|
+ rt_thread_delay(1000*30);
|
|
|
ctr_RTU_DTU(ON);
|
|
|
}
|
|
|
#endif
|
|
|
@@ -1946,7 +1898,6 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
device_status.run_sta=0;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
//一键测试
|
|
|
if(device_status.auto_test_sw==1)
|
|
|
{
|