|
|
@@ -67,6 +67,19 @@ rt_device_t serial; /*串口设备句柄*/
|
|
|
|
|
|
rt_timer_t timer_uart2 = RT_NULL;
|
|
|
|
|
|
+
|
|
|
+static upgrade_state_t current_state = STATE_IDLE;
|
|
|
+uint32_t total_file_size = 0;
|
|
|
+static uint32_t bytes_received = 0;
|
|
|
+static uint32_t bytes_sent_to_hmi = 0;
|
|
|
+
|
|
|
+static uint8_t recv_buffer[RECV_BUFFER_SIZE];
|
|
|
+static uint32_t recv_write_pos = 0;
|
|
|
+static uint32_t recv_read_pos = 0;
|
|
|
+
|
|
|
+static uint8_t send_buffer[SEND_BUFFER_SIZE];
|
|
|
+static uint32_t send_filled = 0;
|
|
|
+
|
|
|
/* 消息队列控制块 */
|
|
|
static struct rt_messagequeue rx_mq;//接收数据消息队列
|
|
|
static void HMI_Decode(void);
|
|
|
@@ -89,22 +102,28 @@ static int HMI_uart4_init(void)
|
|
|
return RT_EOK;
|
|
|
}
|
|
|
/*串口屏写数据*/
|
|
|
+// 在你的代码基础上最小改动
|
|
|
void HMI_WRITE(char *fmt, ...)
|
|
|
{
|
|
|
+ if (serial == NULL || fmt == NULL) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
va_list ap;
|
|
|
- //末尾需要拼接的3个ff
|
|
|
- const char hmi_hex[3]={0xff,0xff,0xff};
|
|
|
- static char str[MAX_SIZE];
|
|
|
- memset(str,'\0',sizeof(str));
|
|
|
+ char str[256]; // 合理的大小
|
|
|
rt_size_t str_length;
|
|
|
- va_start(ap,fmt);
|
|
|
- str_length = rt_vsnprintf(str, sizeof(str) - 1, fmt, ap);
|
|
|
- if (str_length > MAX_SIZE - 1)
|
|
|
- str_length = MAX_SIZE - 1;
|
|
|
|
|
|
- rt_device_write(serial, 0, str, str_length);
|
|
|
+ va_start(ap, fmt);
|
|
|
+ str_length = rt_vsnprintf(str, sizeof(str), fmt, ap);
|
|
|
va_end(ap);
|
|
|
- rt_device_write(serial, 0,hmi_hex,3);
|
|
|
+
|
|
|
+ if (str_length > 0 && str_length < sizeof(str)) {
|
|
|
+ // 发送命令
|
|
|
+ rt_device_write(serial, 0, str, str_length);
|
|
|
+ // 发送结束符
|
|
|
+ static const char terminator[3] = {0xFF, 0xFF, 0xFF};
|
|
|
+ rt_device_write(serial, 0, terminator, 3);
|
|
|
+ }
|
|
|
}
|
|
|
/* 接收数据回调函数 */
|
|
|
static rt_err_t uart_input(rt_device_t dev, rt_size_t size)
|
|
|
@@ -124,6 +143,201 @@ static rt_err_t uart_input(rt_device_t dev, rt_size_t size)
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+// 预计算转换表
|
|
|
+static const int8_t hex_to_byte[256] = {
|
|
|
+ [0 ... 255] = -1,
|
|
|
+ ['0'] = 0, ['1'] = 1, ['2'] = 2, ['3'] = 3, ['4'] = 4,
|
|
|
+ ['5'] = 5, ['6'] = 6, ['7'] = 7, ['8'] = 8, ['9'] = 9,
|
|
|
+ ['A'] = 10, ['B'] = 11, ['C'] = 12, ['D'] = 13, ['E'] = 14, ['F'] = 15,
|
|
|
+ ['a'] = 10, ['b'] = 11, ['c'] = 12, ['d'] = 13, ['e'] = 14, ['f'] = 15
|
|
|
+};
|
|
|
+
|
|
|
+/**
|
|
|
+ * @brief 快速HEX字符串转二进制
|
|
|
+ * @param hex HEX字符串
|
|
|
+ * @param bin 输出缓冲区
|
|
|
+ * @param max_len 最大输出长度
|
|
|
+ * @return 转换的字节数,<0表示错误
|
|
|
+ */
|
|
|
+static inline int fast_hex_to_bin(const char* hex, uint8_t* bin, int max_len)
|
|
|
+{
|
|
|
+ if (!hex || !bin || max_len <= 0) {
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ int hex_len = strlen(hex);
|
|
|
+ if (hex_len % 2 != 0) {
|
|
|
+ return -1; // HEX长度必须是偶数
|
|
|
+ }
|
|
|
+
|
|
|
+ int bin_len = hex_len / 2;
|
|
|
+ if (bin_len > max_len) {
|
|
|
+ return -1; // 输出缓冲区太小
|
|
|
+ }
|
|
|
+
|
|
|
+ for (int i = 0; i < bin_len; i++) {
|
|
|
+ int high = hex_to_byte[(unsigned char)hex[i * 2]];
|
|
|
+ int low = hex_to_byte[(unsigned char)hex[i * 2 + 1]];
|
|
|
+
|
|
|
+ if (high < 0 || low < 0) {
|
|
|
+ return -1; // 无效HEX字符
|
|
|
+ }
|
|
|
+
|
|
|
+ bin[i] = (high << 4) | low;
|
|
|
+ }
|
|
|
+
|
|
|
+ return bin_len;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+// 发送原始数据到HMI
|
|
|
+static int send_raw_to_hmi(const uint8_t* data, uint32_t size)
|
|
|
+{
|
|
|
+ if (!serial || !data || size == 0) return -1;
|
|
|
+
|
|
|
+ rt_size_t sent = rt_device_write(serial, 0, data, size);
|
|
|
+ return (sent == size) ? 0 : -1;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+// 最简洁版本 - 每4096字节直接清空
|
|
|
+void process_hex_payload(const char* hex_str, int req_id) {
|
|
|
+ if (!hex_str) return;
|
|
|
+ current_state = STATE_RECEIVING;
|
|
|
+ // 转换HEX
|
|
|
+ uint8_t temp[JSON_CHUNK_SIZE];
|
|
|
+ int data_len = fast_hex_to_bin(hex_str, temp, JSON_CHUNK_SIZE);
|
|
|
+ if (data_len <= 0) return;
|
|
|
+
|
|
|
+ // 添加到缓冲区
|
|
|
+ if (recv_write_pos + data_len > sizeof(recv_buffer)) {
|
|
|
+ LOG_E("缓冲区溢出");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ memcpy(recv_buffer + recv_write_pos, temp, data_len);
|
|
|
+ recv_write_pos += data_len;
|
|
|
+ bytes_received += data_len;
|
|
|
+
|
|
|
+ LOG_I("收到 %d 字节,缓冲: %u/%u",
|
|
|
+ data_len, recv_write_pos, sizeof(recv_buffer));
|
|
|
+
|
|
|
+ // 每4096字节发送一次
|
|
|
+ if (recv_write_pos >= 4096) {
|
|
|
+ LOG_I("发送 4096 字节到HMI...");
|
|
|
+
|
|
|
+ if (send_raw_to_hmi(recv_buffer, 4096) == 0) {
|
|
|
+ LOG_I("发送成功");
|
|
|
+ // ✅ 直接清空缓冲区
|
|
|
+ recv_write_pos = 0;
|
|
|
+ } else {
|
|
|
+ LOG_E("发送失败");
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查完成
|
|
|
+ if (bytes_received >= total_file_size && total_file_size > 0) {
|
|
|
+ if (recv_write_pos > 0) {
|
|
|
+ LOG_I("发送最后 %u 字节", recv_write_pos);
|
|
|
+ send_raw_to_hmi(recv_buffer, recv_write_pos);
|
|
|
+ recv_write_pos = 0; // 清空
|
|
|
+ }
|
|
|
+ current_state = STATE_COMPLETED;
|
|
|
+ LOG_I("升级完成!");
|
|
|
+ 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\":%u,\"total\":%u,\"progress\":%d},\"id\":%d}",
|
|
|
+ bytes_received, total_file_size, progress, 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)
|
|
|
@@ -150,7 +364,18 @@ static void Hmi_thread_entry(void *parameter)
|
|
|
rx_buffer[rx_length] = '\0';
|
|
|
rt_kprintf("%s\n",rx_buffer);
|
|
|
//\r 对应的hex为0x0d,0x0a,占两个字节,屏幕发送的数据都以\r结尾
|
|
|
- HMI_Decode();
|
|
|
+ if(rx_length==1&&rx_buffer[rx_length-1]==0x05){
|
|
|
+ LOG_W("屏幕响应信号!");
|
|
|
+ if(current_state==STATE_COMPLETED) return;
|
|
|
+ //RTU可以发送升级文件了
|
|
|
+ char* upgrade_hmi = makeJsonRpc2_0("upgradehmi",NULL,1);
|
|
|
+ if(upgrade_hmi){
|
|
|
+ DTU_Write(upgrade_hmi);
|
|
|
+ free(upgrade_hmi);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ HMI_Decode();
|
|
|
+ }
|
|
|
}
|
|
|
/*********************************************************************************************************************/
|
|
|
//rt_kprintf("%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
@@ -185,7 +410,6 @@ static void HMI_Decode(void)
|
|
|
gmtime_r(&now, &tm);
|
|
|
char *json_temp;
|
|
|
char *var=NULL;
|
|
|
- rt_free(var);
|
|
|
if(device_status.refresh_num==0) device_status.refresh_num = 10;
|
|
|
if(strstr(rx_buffer,"getFullData") != NULL){
|
|
|
char *readinfo = makeJson_ReadInfo();
|
|
|
@@ -197,7 +421,7 @@ static void HMI_Decode(void)
|
|
|
device_status.hmi_fresh = 1;
|
|
|
rt_thread_delay(100);
|
|
|
}
|
|
|
- //在解析getinfo中清除超时
|
|
|
+ //在解析getinfo中清除超时0
|
|
|
if(device_status.refresh_timeout==30)
|
|
|
{
|
|
|
rt_sprintf(device_status.sim,"1");
|
|
|
@@ -1466,6 +1690,7 @@ static void HMI_Decode(void)
|
|
|
device_status.selfcheck_ws = 2;
|
|
|
LOG_W("开始自检:%d",device_status.selfcheck_ws);
|
|
|
}
|
|
|
+ memset(rx_buffer,0,sizeof(rx_buffer));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -2014,6 +2239,7 @@ void Check_ParamConfig(void)
|
|
|
{
|
|
|
device_status.dattim = 10;
|
|
|
}
|
|
|
+ if(device_status.sunBar==0) device_status.sunBar = 4;
|
|
|
/*设备类型,7孢子仪,3测报灯,默认设置测报灯*/
|
|
|
if(device_status.dtype!=7)
|
|
|
{
|
|
|
@@ -2098,11 +2324,25 @@ void Check_ParamConfig(void)
|
|
|
LOG_W("heat_sw加热开关:%d",device_status.heat_sw);
|
|
|
}
|
|
|
//RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
|
|
|
- if(device_status.update_flag==1)
|
|
|
+ if(device_status.update_flag==1||device_status.update_flag==2)
|
|
|
{
|
|
|
- device_status.update_flag = 0;
|
|
|
- ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
|
|
|
- ymodem_ota(1,0);
|
|
|
+ if(device_status.update_flag==1){
|
|
|
+ device_status.update_flag = 0;
|
|
|
+ ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
|
|
|
+ ymodem_ota(1,0);
|
|
|
+ }else{
|
|
|
+ device_status.update_flag = 0;
|
|
|
+ ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
|
|
|
+ // 准备参数
|
|
|
+ static char *args[] = {
|
|
|
+ "ymodem_ota",
|
|
|
+ "-p",
|
|
|
+ "hmi_area"
|
|
|
+ };
|
|
|
+ // 调用
|
|
|
+ ymodem_ota(3, args);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
else
|
|
|
{
|