|
|
@@ -62,33 +62,33 @@ extern eMBMasterReqErrCode _485_play(USHORT *Buffer,USHORT NREGS);
|
|
|
|
|
|
static int DTU_uart2_init(void)
|
|
|
{
|
|
|
- dtuserial = rt_device_find(DTU_UART_NAME);
|
|
|
- /*修改串口配置参数*/
|
|
|
- dtuconfig.baud_rate = BAUD_RATE_115200; //修改波特率9600
|
|
|
- dtuconfig.data_bits = DATA_BITS_8; //数据位8c
|
|
|
- dtuconfig.stop_bits = STOP_BITS_1; //停止位1
|
|
|
- #ifdef RT_USING_SERIAL_V2
|
|
|
- dtuconfig.rx_bufsz = 1024;
|
|
|
- dtuconfig.tx_bufsz = 1024;
|
|
|
- #else
|
|
|
- dtuconfig.bufsz = 1024; //缓冲区1k
|
|
|
- #endif
|
|
|
- dtuconfig.parity = PARITY_NONE; //奇校验
|
|
|
- /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
|
|
|
- rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
|
|
|
- /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
|
|
|
- #ifdef RT_USING_SERIAL_V2
|
|
|
- rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
|
|
|
- #else
|
|
|
- rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX); //RT_DEVICE_FLAG_DMA_RX
|
|
|
- #endif
|
|
|
- if(uart_res!=RT_EOK)
|
|
|
- {
|
|
|
- LOG_E("%s打开失败!",DTU_UART_NAME);
|
|
|
- }else{
|
|
|
- LOG_I("%s Open Success!",DTU_UART_NAME);
|
|
|
- }
|
|
|
- return RT_EOK;
|
|
|
+ dtuserial = rt_device_find(DTU_UART_NAME);
|
|
|
+ /*修改串口配置参数*/
|
|
|
+ dtuconfig.baud_rate = BAUD_RATE_115200; //修改波特率9600
|
|
|
+ dtuconfig.data_bits = DATA_BITS_8; //数据位8c
|
|
|
+ dtuconfig.stop_bits = STOP_BITS_1; //停止位1
|
|
|
+ #ifdef RT_USING_SERIAL_V2
|
|
|
+ dtuconfig.rx_bufsz = 1024;
|
|
|
+ dtuconfig.tx_bufsz = 1024;
|
|
|
+ #else
|
|
|
+ dtuconfig.bufsz = 1024; //缓冲区1k
|
|
|
+ #endif
|
|
|
+ dtuconfig.parity = PARITY_NONE; //奇校验
|
|
|
+ /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
|
|
|
+ rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
|
|
|
+ /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
|
|
|
+ #ifdef RT_USING_SERIAL_V2
|
|
|
+ rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_NON_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
|
|
|
+ #else
|
|
|
+ rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX); //RT_DEVICE_FLAG_DMA_RX
|
|
|
+ #endif
|
|
|
+ if(uart_res!=RT_EOK)
|
|
|
+ {
|
|
|
+ LOG_E("%s打开失败!",DTU_UART_NAME);
|
|
|
+ }else{
|
|
|
+ LOG_I("%s Open Success!",DTU_UART_NAME);
|
|
|
+ }
|
|
|
+ return RT_EOK;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -107,7 +107,7 @@ void DTU_Write(char *fmt, ...)
|
|
|
if (str_length > 1024 - 1)
|
|
|
str_length = 1024 - 1;
|
|
|
rt_device_write(dtuserial, 0, dtu_str, str_length);
|
|
|
- rt_thread_mdelay(20);
|
|
|
+ LOG_I("DTU_Write:%s",dtu_str);
|
|
|
// if(strstr(dtu_str,"volume")!=RT_NULL)
|
|
|
// {
|
|
|
// rt_device_write(dtuserial,0,dtu_conf,4);
|
|
|
@@ -120,149 +120,21 @@ void DTU_Write(char *fmt, ...)
|
|
|
/* 接收数据回调函数 */
|
|
|
static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
|
|
|
{
|
|
|
- struct rx_msg msg;
|
|
|
- rt_err_t result;
|
|
|
- msg.dev = dev;
|
|
|
- msg.size = size;
|
|
|
- result = rt_mq_send(&rx_mq_dtu,&msg, sizeof(struct rx_msg));
|
|
|
- if ( result == -RT_EFULL)
|
|
|
- {
|
|
|
- /* 消息队列满 */
|
|
|
- rt_kprintf("message queue full!\n");
|
|
|
- rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
|
|
|
- }
|
|
|
- return result;
|
|
|
-}
|
|
|
-
|
|
|
-// 最大JSON缓冲区长度(建议根据设备内存调整)
|
|
|
-#define MAX_JSON_BUFFER 1024
|
|
|
-// 最大超时时间(单位:RT_TICK_PER_SECOND)
|
|
|
-#define JSON_PARSE_TIMEOUT 2
|
|
|
-
|
|
|
-// 全局缓冲区结构体
|
|
|
-static struct {
|
|
|
- char buffer[MAX_JSON_BUFFER]; // 数据存储区
|
|
|
- int index; // 当前写入位置
|
|
|
- rt_tick_t last_received; // 最后接收时间戳
|
|
|
- int nested_level; // 当前嵌套层数
|
|
|
-} json_ctx = {.index = 0, .last_received = 0, .nested_level = 0};
|
|
|
-
|
|
|
-
|
|
|
-// 自定义异常类型
|
|
|
-typedef enum {
|
|
|
- JSON_OK,
|
|
|
- JSON_INCOMPLETE,
|
|
|
- JSON_INVALID_CHAR,
|
|
|
- JSON_TOO_DEEP,
|
|
|
- JSON_TOO_LONG
|
|
|
-} json_status_t;
|
|
|
-
|
|
|
-// 查找完整JSON边界(支持嵌套)
|
|
|
-static json_status_t find_json_boundary(int *start, int *end)
|
|
|
-{
|
|
|
- *start = -1;
|
|
|
- *end = -1;
|
|
|
- int level = 0;
|
|
|
-
|
|
|
- for (int i = 0; i < json_ctx.index; i++) {
|
|
|
- if (json_ctx.buffer[i] == '{') {
|
|
|
- if (level == 0) *start = i;
|
|
|
- level++;
|
|
|
- if (level > 32) return JSON_TOO_DEEP;
|
|
|
- } else if (json_ctx.buffer[i] == '}') {
|
|
|
- level--;
|
|
|
- if (level < 0) return JSON_INVALID_CHAR;
|
|
|
- if (level == 0 && *start != -1) {
|
|
|
- *end = i;
|
|
|
- return JSON_OK;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (*start != -1) return JSON_INCOMPLETE;
|
|
|
- return JSON_OK;
|
|
|
-}
|
|
|
-// 处理缓冲区超时
|
|
|
-static void check_timeout_reset(void)
|
|
|
-{
|
|
|
- if (rt_tick_get() - json_ctx.last_received > JSON_PARSE_TIMEOUT * RT_TICK_PER_SECOND) {
|
|
|
- rt_memset(json_ctx.buffer, 0, MAX_JSON_BUFFER);
|
|
|
- json_ctx.index = 0;
|
|
|
- json_ctx.nested_level = 0;
|
|
|
- rt_kprintf("[JSON] Timeout reset\n");
|
|
|
- }
|
|
|
-}
|
|
|
-#define RT_MIN(a, b) ((a) < (b) ? (a) : (b))
|
|
|
-// 核心处理函数
|
|
|
-void process_uart_data(const char *data, int length)
|
|
|
-{
|
|
|
- // 有效性检查
|
|
|
- if (data == NULL || length <= 0) return;
|
|
|
- json_ctx.last_received = rt_tick_get();
|
|
|
-
|
|
|
- // 缓冲区溢出保护
|
|
|
- int remain_space = MAX_JSON_BUFFER - json_ctx.index - 1;
|
|
|
- if (remain_space < length) {
|
|
|
- rt_kprintf("[JSON] Buffer overflow (%d/%d)\n",
|
|
|
- json_ctx.index + length, MAX_JSON_BUFFER);
|
|
|
- json_ctx.index = 0; // 清空缓冲区重新开始
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- // 追加新数据
|
|
|
- rt_memcpy(json_ctx.buffer + json_ctx.index, data, length);
|
|
|
- json_ctx.index += length;
|
|
|
- json_ctx.buffer[json_ctx.index] = '\0';
|
|
|
-
|
|
|
- // 循环处理所有完整报文
|
|
|
- while (1) {
|
|
|
- int start_pos, end_pos;
|
|
|
- json_status_t status = find_json_boundary(&start_pos, &end_pos);
|
|
|
-
|
|
|
- switch (status) {
|
|
|
- case JSON_OK:
|
|
|
- if (start_pos != -1 && end_pos != -1) {
|
|
|
- // 提取有效JSON内容
|
|
|
- char json_str[512] = {0};
|
|
|
- int json_len = end_pos - start_pos + 1;
|
|
|
- rt_strncpy(json_str, json_ctx.buffer + start_pos,
|
|
|
- RT_MIN(sizeof(json_str)-1, json_len));
|
|
|
-
|
|
|
- // 调用解析函数
|
|
|
- if (parseDtu(json_str) == RT_EOK) {
|
|
|
- rt_kprintf("[JSON] Parsed: %.*s\n", json_len, json_str);
|
|
|
- }
|
|
|
-
|
|
|
- // 移动缓冲区剩余内容
|
|
|
- int remain_data = json_ctx.index - (end_pos + 1);
|
|
|
- if (remain_data > 0) {
|
|
|
- rt_memmove(json_ctx.buffer,
|
|
|
- json_ctx.buffer + end_pos + 1,
|
|
|
- remain_data);
|
|
|
- }
|
|
|
- json_ctx.index = remain_data;
|
|
|
- json_ctx.buffer[json_ctx.index] = '\0';
|
|
|
- } else {
|
|
|
- return; // 无更多完整报文
|
|
|
- }
|
|
|
- break;
|
|
|
-
|
|
|
- case JSON_INCOMPLETE:
|
|
|
- return; // 等待更多数据
|
|
|
-
|
|
|
- default:
|
|
|
- LOG_E("[JSON] Error %d at pos %d", status, start_pos);
|
|
|
- // 错误恢复:跳过错误数据
|
|
|
- json_ctx.index = 0;
|
|
|
- rt_memset(json_ctx.buffer, 0, sizeof(json_ctx.buffer));
|
|
|
- return;
|
|
|
- }
|
|
|
+ struct rx_msg msg;
|
|
|
+ rt_err_t result;
|
|
|
+ msg.dev = dev;
|
|
|
+ msg.size = size;
|
|
|
+ result = rt_mq_send(&rx_mq_dtu,&msg, sizeof(struct rx_msg));
|
|
|
+ if ( result == -RT_EFULL)
|
|
|
+ {
|
|
|
+ /* 消息队列满 */
|
|
|
+ LOG_E("rx_mq_dtu message queue full!\n");
|
|
|
+ rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
|
|
|
}
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/* 入口函数-指令接收*/
|
|
|
static void dtu_thread_entry_recv(void *parameter)
|
|
|
{
|
|
|
@@ -436,7 +308,6 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
{
|
|
|
|
|
|
device_status.power_status = 1;
|
|
|
- device_status.num_updata = 200;
|
|
|
rt_thread_delay(10000);
|
|
|
static rt_uint16_t wait_i = 0;
|
|
|
static rt_uint8_t check_i = 0;
|
|
|
@@ -481,7 +352,6 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
}
|
|
|
else {
|
|
|
char *readinfo = makeJson_ReadInfo();
|
|
|
- rt_kprintf("upload data:%s\n",readinfo);
|
|
|
DTU_Write("%s",readinfo);
|
|
|
rt_free(readinfo);
|
|
|
rt_thread_delay(1000);
|
|
|
@@ -543,57 +413,15 @@ int dtu_data_play(void)
|
|
|
DTU_THREAD_PRIORITY,
|
|
|
DTU_THREAD_TIMESLICE);
|
|
|
/* 如果获得线程控制块,启动这个线程 */
|
|
|
- if(dtu_send_data!=RT_NULL)
|
|
|
- rt_thread_startup(dtu_send_data);
|
|
|
- /* 如果获得线程控制块,启动这个线程 */
|
|
|
if (dtu_recv_data != RT_NULL)
|
|
|
rt_thread_startup(dtu_recv_data);
|
|
|
return RT_EOK;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-void get_iso8601_utc_time(char *buffer, size_t buffer_size,uint8_t time_h) {
|
|
|
- time_t now_seconds;
|
|
|
- struct tm *timeinfo;
|
|
|
- // 获取当前时间(秒)
|
|
|
- time(&now_seconds);
|
|
|
- // 将 time_t 转换为 UTC 时间的 struct tm
|
|
|
- timeinfo = gmtime(&now_seconds);
|
|
|
- // 获取当前时间的毫秒部分
|
|
|
- long milliseconds = rt_tick_get() % RT_TICK_PER_SECOND * (1000 / RT_TICK_PER_SECOND);
|
|
|
- if(time_h<=23)
|
|
|
- {
|
|
|
- //工作结束在第二天
|
|
|
- if(device_status.startBar>time_h)
|
|
|
- {
|
|
|
- // 格式化时间为 ISO 8601 标准 (UTC),在第二天日期需要+1
|
|
|
- // 创建一个新的 tm 结构体并复制当前时间信息
|
|
|
- struct tm next_day = *timeinfo;
|
|
|
- // 增加一天
|
|
|
- next_day.tm_mday += 1;
|
|
|
- // 标准化时间结构体
|
|
|
- mktime(&next_day);
|
|
|
- // 使用标准化后的时间
|
|
|
- timeinfo = &next_day;
|
|
|
- }
|
|
|
- // 格式化时间为 ISO 8601 标准 (UTC),并添加毫秒部分
|
|
|
- snprintf(buffer, buffer_size, "%04d-%02d-%02dT%02d:00:00.000Z",
|
|
|
- timeinfo->tm_year + 1900,
|
|
|
- timeinfo->tm_mon + 1,
|
|
|
- timeinfo->tm_mday,
|
|
|
- time_h);
|
|
|
- }
|
|
|
- else {
|
|
|
- // 格式化时间为 ISO 8601 标准 (UTC),并添加毫秒部分
|
|
|
- snprintf(buffer, buffer_size, "%04d-%02d-%02dT%02d:%02d:%02d.%03ldZ",
|
|
|
- timeinfo->tm_year + 1900,
|
|
|
- timeinfo->tm_mon + 1,
|
|
|
- timeinfo->tm_mday,
|
|
|
- timeinfo->tm_hour,
|
|
|
- timeinfo->tm_min,
|
|
|
- timeinfo->tm_sec,milliseconds);
|
|
|
- }
|
|
|
-
|
|
|
+void dtu_send_data_start(void)
|
|
|
+{
|
|
|
+ if(dtu_send_data!=RT_NULL)
|
|
|
+ rt_thread_startup(dtu_send_data);
|
|
|
}
|
|
|
|
|
|
char * makeJson_ReadInfo()
|
|
|
@@ -838,7 +666,7 @@ char *makeJson_Warn(char * s,char *t)
|
|
|
pubstring = cJSON_CreateObject();
|
|
|
if(NULL==pubstring)
|
|
|
{
|
|
|
- rt_kprintf("cJSON pubstring NULL!!!\n");
|
|
|
+ LOG_E("cJSON pubstring NULL!!!");
|
|
|
return NULL;
|
|
|
}
|
|
|
cJSON_AddItemToObject(wJsonRoot, "ext", pubstring);
|
|
|
@@ -1021,8 +849,11 @@ char * makeJson()
|
|
|
cJSON_AddStringToObject(pSubJson,"wind_sped","0");
|
|
|
//cpu_temp
|
|
|
cJSON_AddStringToObject(pSubJson,"cpu_tmp",device_status.cpu_temp);
|
|
|
- //camera_sta
|
|
|
- cJSON_AddStringToObject(pSubJson,"cam_sta",device_status.camera_sta);
|
|
|
+ //温控
|
|
|
+ rt_sprintf(utos, "%d",device_status.tpl);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tpl",utos);
|
|
|
+ rt_sprintf(utos, "%d",device_status.tph);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tph",utos);
|
|
|
//InsectSpecies,昆虫种类
|
|
|
cJSON_AddNumberToObject(pSubJson,"InsectSpecies",device_status.InsectSpecies);
|
|
|
cJSON_AddNumberToObject(pSubJson,"Power_Type",device_status.Power_Type);
|
|
|
@@ -1117,7 +948,6 @@ int Parse_Cam_Param(cJSON *param_msg)
|
|
|
int parseDtu(char *json_string)
|
|
|
{
|
|
|
extern int rt_hw_rtc_init(void);
|
|
|
- char* json_s = NULL;
|
|
|
cJSON* item_cmd = NULL; //嵌套ext
|
|
|
cJSON* item_ext = NULL; //嵌套ext
|
|
|
cJSON* item_checkself = NULL;
|
|
|
@@ -1157,6 +987,7 @@ int parseDtu(char *json_string)
|
|
|
cJSON* link_sta = NULL;
|
|
|
cJSON* link_ip = NULL;
|
|
|
cJSON* value_commn= NULL;
|
|
|
+ static struct tm tm_now;
|
|
|
rt_kprintf("%s\n",json_string);
|
|
|
cJSON *root = cJSON_Parse(json_string);
|
|
|
if(!root)
|
|
|
@@ -1169,98 +1000,14 @@ int parseDtu(char *json_string)
|
|
|
{
|
|
|
|
|
|
item_cmd = cJSON_GetObjectItem(root,"cmd");
|
|
|
- cJSON* item_aplay = cJSON_GetObjectItem(root,"aplay");
|
|
|
item_checkself = cJSON_GetObjectItem(root,"selfcheck");
|
|
|
photolink = cJSON_GetObjectItem(root,"photolink");
|
|
|
cJSON* ledsta = cJSON_GetObjectItem(root,"ledsta");
|
|
|
cJSON* cam_cmd= cJSON_GetObjectItem(root,"cam_code");
|
|
|
- cJSON* yolo_start = cJSON_GetObjectItem(root,"yolo");
|
|
|
+
|
|
|
item_ext=cJSON_GetObjectItem(root,"ext");
|
|
|
- if(yolo_start!=NULL)
|
|
|
- {
|
|
|
- if(strcmp(yolo_start->valuestring,"start")==0) //”识别进程已启动“
|
|
|
- {
|
|
|
- //CAB6 B1F0 BDF8 B3CC D2D1 C6F4 B6AF
|
|
|
- static USHORT sound_7[] = {0xCAB6,0xB1F0,0xBDF8,0xB3CC,0xD2D1,0xC6F4,0xB6AF};
|
|
|
- _485_play(sound_7,7);
|
|
|
- }
|
|
|
- }
|
|
|
- if(item_aplay!=NULL)
|
|
|
- {
|
|
|
- if(strcmp(item_aplay->valuestring,"data_upload")==0) //数据上传中
|
|
|
- {
|
|
|
- //CAFD BEDD C9CF B4AB D6D0
|
|
|
- static USHORT sound_0[] = {0xcafd,0xbedd,0xc9cf,0xb4ab,0xd6d0};
|
|
|
- _485_play(sound_0,5);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"kuaimen")==0) //数据上传中
|
|
|
- {
|
|
|
- //736F 756E 6431 3031
|
|
|
- static USHORT sound_1[] = {0x736f,0x756e,0x6431,0x3031};
|
|
|
- _485_play(sound_1,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"photouploadsuccess")==0) //图片上传成功
|
|
|
- {
|
|
|
- //C9CF B4AB B3C9 B9A6
|
|
|
- static USHORT sound_2[] = {0xc9cf,0xb4ab,0xb3c9,0xb9a6};
|
|
|
- _485_play(sound_2,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"photouploadfailed")==0) //图片上传失败
|
|
|
- {
|
|
|
- //C9CF B4AB CAA7 B0DC
|
|
|
- static USHORT sound_3[] = {0xc9cf,0xb4ab,0xcaa7,0xb0dc};
|
|
|
- _485_play(sound_3,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"welcom")==0) //JETSON启动
|
|
|
- {
|
|
|
- //4A45 5453 4F4E C6F4 B6AF
|
|
|
- static USHORT sound_4[] = {0x4A45,0x5453,0x4F4E,0xC6F4,0xB6AF};
|
|
|
- _485_play(sound_4,5);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"fdsucess")==0) //升级文件下载成功
|
|
|
- {
|
|
|
- //C9FD BCB6 CEC4 BCFE CFC2 D4D8 B3C9 B9A6
|
|
|
- static USHORT sound_5[] = {0xC9FD,0xBCB6,0xCEC4,0xBCFE,0xCFC2,0xD4D8,0xB3C9,0xB9A6};
|
|
|
- _485_play(sound_5,8);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"fdfailed")==0) //”升级文件下载失败“
|
|
|
- {
|
|
|
- //C9FD BCB6 CEC4 BCFE CFC2 D4D8 CAA7 B0DC
|
|
|
- static USHORT sound_6[] = {0xC9FD,0xBCB6,0xCEC4,0xBCFE,0xCFC2,0xD4D8,0xCAA7,0xB0DC};
|
|
|
- _485_play(sound_6,8);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"yolodone")==0) //”识别进程已结束“
|
|
|
- {
|
|
|
- //CAB6 B1F0 BDF8 B3CC D2D1 BDE1 CAF8
|
|
|
- static USHORT sound_8[] = {0xCAB6,0xB1F0,0xBDF8,0xB3CC,0xD2D1,0xBDE1,0xCAF8};
|
|
|
- _485_play(sound_8,8);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"onmessage")==0) //”提示音“
|
|
|
- {
|
|
|
- //sound10?
|
|
|
- static USHORT sound_9[] = {0xCAB6,0xB1F0,0xBDF8,0xB3CC,0xD2D1,0xBDE1,0xCAF8};
|
|
|
- _485_play(sound_9,8);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"startupdate")==0) //”开始升级“
|
|
|
- {
|
|
|
- //BFAA CABC C9FD BCB6
|
|
|
- static USHORT sound_10[] = {0xBFAA,0xCABC,0xC9FD,0xBCB6};
|
|
|
- _485_play(sound_10,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"updatesuccess")==0) //”升级成功“
|
|
|
- {
|
|
|
- //C9FD BCB6 B3C9 B9A6
|
|
|
- static USHORT sound_11[] = {0xC9FD,0xBCB6,0xB3C9,0xB9A6};
|
|
|
- _485_play(sound_11,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"updatefailed")==0) //”升级失败“
|
|
|
- {
|
|
|
- //C9FD BCB6 CAA7 B0DC
|
|
|
- static USHORT sound_12[] = {0xC9FD,0xBCB6,0xCAA7,0xB0DC};
|
|
|
- _485_play(sound_12,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"sound113")==0) //”mqtt消息提示音“
|
|
|
- {
|
|
|
- //736F 756E 6431 3133
|
|
|
- static USHORT sound_13[] = {0x736F,0x756E,0x6431,0x3133};
|
|
|
- _485_play(sound_13,4);
|
|
|
- }else if(strcmp(item_aplay->valuestring,"net_connect")==0) //"网络连接成功“
|
|
|
- {
|
|
|
- //CDF8 C2E7 C1AC BDD3 B3C9 B9A6
|
|
|
- static USHORT sound_14[] = {0xCDF8,0xC2E7,0xC1AC,0xBDD3,0xB3C9,0xB9A6};
|
|
|
- _485_play(sound_14,6);
|
|
|
- }
|
|
|
|
|
|
|
|
|
- }
|
|
|
if(cam_cmd!=NULL){
|
|
|
//先检查定时器状态,否则会崩溃
|
|
|
rt_timer_stop(timer_uart2);
|
|
|
@@ -1292,7 +1039,8 @@ int parseDtu(char *json_string)
|
|
|
free(json_temp);
|
|
|
}
|
|
|
if(device_status.work_status==0) ctr_lamp(OFF, 1); //关闭高压
|
|
|
- device_status.sleep_mode = 10;
|
|
|
+ //收到拍照结果,
|
|
|
+
|
|
|
}
|
|
|
if(item_checkself!=NULL){//自检签名
|
|
|
memset(device_status.qianming,0,sizeof(device_status.qianming));
|
|
|
@@ -1327,40 +1075,15 @@ int parseDtu(char *json_string)
|
|
|
rt_thread_delay(2000);
|
|
|
#endif
|
|
|
}
|
|
|
- else if (strstr(item_cmd->valuestring,"json_w_clock")!=RT_NULL) {
|
|
|
- rt_kprintf("查询时间配置!\n");
|
|
|
- json_s = makeJson_Warn(device_status.json_w_clock, "主动查询");
|
|
|
- DTU_Write("%s",json_s);
|
|
|
- rt_free(json_s);
|
|
|
- rt_thread_delay(1000);
|
|
|
- }
|
|
|
- else if (strstr(item_cmd->valuestring,"json_w_reset")!=RT_NULL) {
|
|
|
- rt_kprintf("查询重置配置!\n");
|
|
|
- json_s = makeJson_Warn(device_status.json_w_reset, "主动查询");
|
|
|
- DTU_Write("%s",json_s);
|
|
|
- rt_free(json_s);
|
|
|
- rt_thread_delay(1000);
|
|
|
- }
|
|
|
- else if (strstr(item_cmd->valuestring,"json_w_platform")!=RT_NULL) {
|
|
|
- rt_kprintf("查询平台配置!\n");
|
|
|
- json_s = makeJson_Warn(device_status.json_w_platform, "主动查询");
|
|
|
- DTU_Write("%s",json_s);
|
|
|
- rt_free(json_s);
|
|
|
- rt_thread_delay(1000);
|
|
|
- }
|
|
|
- else if (strstr(item_cmd->valuestring,"shake")!=RT_NULL)
|
|
|
- {
|
|
|
- ctr_shake(ON, 30);
|
|
|
- char *shake = makeJson_Warn("shake","control");
|
|
|
- DTU_Write("%s",shake);
|
|
|
- rt_free(shake);
|
|
|
- rt_thread_delay(2000);
|
|
|
+ else if (strstr(item_cmd->valuestring,"takeDone")!=RT_NULL){
|
|
|
+ //device_status.clear_status=10;
|
|
|
+ LOG_I("拍照成功,执行清扫!");
|
|
|
}
|
|
|
//{"cmd":"photoinfo","ext":{"photo_ct":2}}
|
|
|
else if (strstr(item_cmd->valuestring,"photoinfo")!=RT_NULL)
|
|
|
{
|
|
|
- device_status.sleep_mode = 10;
|
|
|
- LOG_I("拍照成功,准备关闭联网模块电源!");
|
|
|
+ //device_status.sleep_mode = 10;
|
|
|
+ LOG_I("拍照成功,准备关闭联网模块电源?%d",device_status.sleep_mode);
|
|
|
}
|
|
|
//远程给rtu重新上电
|
|
|
else if (strstr(item_cmd->valuestring,"ctrl")!=RT_NULL)
|
|
|
@@ -1373,33 +1096,16 @@ int parseDtu(char *json_string)
|
|
|
rt_thread_delay(5000);
|
|
|
ctr_RTU_DTU(ON);
|
|
|
}
|
|
|
- //对焦拍照
|
|
|
- else if(strstr(type->valuestring,"auto_takephoto")!=RT_NULL)
|
|
|
- {
|
|
|
- device_status.autotakepic = 1;
|
|
|
- rt_thread_delay(2000);
|
|
|
- char *auto_takephoto = makeJson_Warn("send cmd success:auto_takephoto","control");
|
|
|
- DTU_Write("%s",auto_takephoto);
|
|
|
- rt_free(auto_takephoto);
|
|
|
- }
|
|
|
else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
|
|
|
{
|
|
|
//HK_TakePhoto();
|
|
|
- device_status.photo_ws = 1;
|
|
|
+ device_status.photo_ws = 2;
|
|
|
char *photo = makeJson_Warn("takephoto","control");
|
|
|
DTU_Write("%s",photo);
|
|
|
rt_free(photo);
|
|
|
rt_thread_delay(2000);
|
|
|
}
|
|
|
|
|
|
- //{"ext": {"type": "paichong"}, "cmd": "ctrl"} 排虫
|
|
|
- else if (strstr(type->valuestring,"paichong")!=RT_NULL) {
|
|
|
- char *turn_zp = makeJson_Warn("send cmd success:paichong","control");
|
|
|
- DTU_Write("%s",turn_zp);
|
|
|
- rt_free(turn_zp);
|
|
|
- if(device_status.vol==0)
|
|
|
- device_status.vol = 111;
|
|
|
- }
|
|
|
else if (strstr(type->valuestring,"led_on")!=RT_NULL)
|
|
|
{
|
|
|
ctr_led(ON);
|
|
|
@@ -1413,20 +1119,23 @@ int parseDtu(char *json_string)
|
|
|
else if(strstr(type->valuestring,"sleep_mode")!=RT_NULL)
|
|
|
{
|
|
|
device_status.sleep_mode = 1;
|
|
|
- ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode)); //设备编码
|
|
|
+ ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode)); //
|
|
|
LOG_I("收到设置休眠指令:%d",device_status.sleep_mode);
|
|
|
+ char *sleep = makeJson_Warn("set sleep mode enable","control");
|
|
|
+ DTU_Write("%s",sleep);
|
|
|
+ rt_free(sleep);
|
|
|
+ }
|
|
|
+ else if(strstr(type->valuestring,"sleep_off")!=RT_NULL)
|
|
|
+ {
|
|
|
+ device_status.sleep_mode = 0;
|
|
|
+ ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode)); //
|
|
|
+ LOG_I("收到设置休眠指令:%d",device_status.sleep_mode);
|
|
|
+ char *sleep = makeJson_Warn("set sleep mode disable","control");
|
|
|
+ DTU_Write("%s",sleep);
|
|
|
+ rt_free(sleep);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //水稻2000万像素的串口拍照指令
|
|
|
- else if (strstr(item_cmd->valuestring,"mvs_photo")!=RT_NULL)
|
|
|
- {
|
|
|
- HK_TakePhoto();
|
|
|
- char *photo = makeJson_Warn("mvs_takephoto","control");
|
|
|
- DTU_Write("%s",photo);
|
|
|
- rt_free(photo);
|
|
|
- rt_thread_delay(2000);
|
|
|
- }
|
|
|
else if (strstr(item_cmd->valuestring,"reboot")!=RT_NULL)
|
|
|
{
|
|
|
char *restart = makeJson_Warn("sysrem will restart","control");
|
|
|
@@ -1557,16 +1266,6 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
|
else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
|
|
|
{
|
|
|
-// #if Color_EN == 0
|
|
|
-// if(device_status.dtype==7)
|
|
|
-// {
|
|
|
-// DTU_Write("%s","SwversionV7");
|
|
|
-// }
|
|
|
-// else if (device_status.dtype==3)
|
|
|
-// {
|
|
|
-// DTU_Write("%s","SwversionV4");
|
|
|
-// }
|
|
|
-// #endif
|
|
|
device_status.refresh_timeout=0;
|
|
|
//driver_4g = cJSON_GetObjectItem(item_ext,"version");
|
|
|
driver_4g = cJSON_GetObjectItem(item_ext,"dver");
|
|
|
@@ -1632,42 +1331,43 @@ int parseDtu(char *json_string)
|
|
|
|
|
|
if(datetime!=RT_NULL){
|
|
|
LOG_I("DTU时间:%s",datetime->valuestring);
|
|
|
- int year, month, day, hour, minute, second;
|
|
|
- sscanf(datetime->valuestring, "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second);
|
|
|
- if(set_date(year,month,day)==RT_EOK)
|
|
|
- {
|
|
|
- LOG_I("设置日期:%d年%d月%d日",year,month,day);
|
|
|
- if(hour<24&&minute>=0&&minute<60&&second>=0&&second<60)
|
|
|
- {
|
|
|
- LOG_I("设置时间:%d时%d分%d秒",hour,minute,second);
|
|
|
- set_time(hour,minute,second);
|
|
|
- }else{
|
|
|
- LOG_E("set_date failed!");
|
|
|
- }
|
|
|
+ struct tm *tm_time = parseTimestamp(datetime->valuestring);
|
|
|
+ time_t timestamp;
|
|
|
+ if(tm_time!=NULL){
|
|
|
+
|
|
|
+ time_t now;
|
|
|
+ time(&now);
|
|
|
+ tm_now =*localtime(&now);
|
|
|
+
|
|
|
+ timestamp = mktime(tm_time);
|
|
|
+ LOG_I("RTU时间戳:%d",timestamp);
|
|
|
+ //获取当前系统时间戳
|
|
|
+ struct timeval tv;
|
|
|
+ gettimeofday(&tv,NULL);
|
|
|
+ LOG_I("系统当前时间戳:%d",tv.tv_sec);
|
|
|
+ time_t timestamp_diff;
|
|
|
+ if(timestamp>tv.tv_sec)
|
|
|
+ {
|
|
|
+ timestamp_diff = timestamp - tv.tv_sec;
|
|
|
+ }else
|
|
|
+ {
|
|
|
+ timestamp_diff = tv.tv_sec - timestamp;
|
|
|
+ if(timestamp_diff>1000) //
|
|
|
+ {
|
|
|
+ setSystemTime(tm_time);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (timestamp_diff<300&&tm_now.tm_year+1900>=2025) {
|
|
|
+ setSystemTime(tm_time);
|
|
|
+ }else {
|
|
|
+ if(tm_now.tm_year+1900<=2025)
|
|
|
+ {
|
|
|
+ setSystemTime(tm_time);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
-// static char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
|
|
|
-// strncpy(year_s, datetime->valuestring, 4);
|
|
|
-// strncpy(month_s,datetime->valuestring+4,2);
|
|
|
-// strncpy(day_s,datetime->valuestring+6,2);
|
|
|
-// strncpy(hour_s,datetime->valuestring+8,2);
|
|
|
-// strncpy(min_s,datetime->valuestring+10,2);
|
|
|
-// strncpy(sec_s,datetime->valuestring+12,2);
|
|
|
-// if(atoi(year_s)>=2024&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
|
|
|
-// {
|
|
|
-// if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
|
|
|
-// {
|
|
|
-// LOG_I("设置日期:%d年%d月%d日",atoi(year_s),atoi(month_s),atoi(day_s));
|
|
|
-// if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
|
|
|
-// {
|
|
|
-// LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
|
|
|
-// set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
|
|
|
-// }
|
|
|
-// }
|
|
|
-// else {
|
|
|
-// LOG_E("set_date failed!");
|
|
|
-// rt_hw_rtc_init();
|
|
|
-// }
|
|
|
-// }
|
|
|
+ free(tm_time); // Free the allocated memory
|
|
|
}
|
|
|
|
|
|
LOG_I("参数同步:lat:%s lng:%s",lat->valuestring,lng->valuestring);
|
|
|
@@ -1797,82 +1497,105 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
|
if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
|
|
|
{
|
|
|
- if(device_status.dtype==3)
|
|
|
- hst = cJSON_GetObjectItem(item_ext,"hst");
|
|
|
- if(device_status.dtype==7)
|
|
|
- hst = cJSON_GetObjectItem(item_ext,"set_temp");
|
|
|
-
|
|
|
- et = cJSON_GetObjectItem(item_ext,"et");
|
|
|
- datt = cJSON_GetObjectItem(item_ext,"datt");
|
|
|
-
|
|
|
- shake_sec = cJSON_GetObjectItem(item_ext,"shake_sec");
|
|
|
- tpl = cJSON_GetObjectItem(item_ext,"tpl");
|
|
|
- shake = cJSON_GetObjectItem(item_ext,"shake");
|
|
|
- tph = cJSON_GetObjectItem(item_ext,"tph");
|
|
|
- ts = cJSON_GetObjectItem(item_ext,"ts");
|
|
|
- st = cJSON_GetObjectItem(item_ext,"st");
|
|
|
- tt = cJSON_GetObjectItem(item_ext,"tt");
|
|
|
- htim = cJSON_GetObjectItem(item_ext,"htim");
|
|
|
- if(device_status.dtype==3)
|
|
|
- ds = cJSON_GetObjectItem(item_ext,"ds");
|
|
|
- vt = cJSON_GetObjectItem(item_ext,"vt");
|
|
|
-
|
|
|
- if(device_status.dtype==3)
|
|
|
- collt = cJSON_GetObjectItem(item_ext,"collt");
|
|
|
-
|
|
|
- if(device_status.dtype==7)
|
|
|
- ds = cJSON_GetObjectItem(item_ext,"on_off");
|
|
|
- if(device_status.dtype==7)
|
|
|
- collt = cJSON_GetObjectItem(item_ext,"coll_time"); //收集(数组格式)
|
|
|
-
|
|
|
- cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time"); //培养时间1~24
|
|
|
- cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
|
|
|
- if(drop_sec!=NULL)
|
|
|
+ cJSON *work_tim = cJSON_GetObjectItem(item_ext,"work_tim");
|
|
|
+ cJSON *data_tim = cJSON_GetObjectItem(item_ext,"data_tim");
|
|
|
+ cJSON *power = cJSON_GetObjectItem(item_ext,"power");
|
|
|
+ cJSON *clt_tim = cJSON_GetObjectItem(item_ext,"clt_tim");
|
|
|
+
|
|
|
+ if(device_status.dtype==3)
|
|
|
+ hst = cJSON_GetObjectItem(item_ext,"hst");
|
|
|
+ if(device_status.dtype==7)
|
|
|
+ hst = cJSON_GetObjectItem(item_ext,"set_temp");
|
|
|
+
|
|
|
+ et = cJSON_GetObjectItem(item_ext,"et");
|
|
|
+ datt = cJSON_GetObjectItem(item_ext,"datt");
|
|
|
+
|
|
|
+ shake_sec = cJSON_GetObjectItem(item_ext,"shake_sec");
|
|
|
+ tpl = cJSON_GetObjectItem(item_ext,"tpl");
|
|
|
+ shake = cJSON_GetObjectItem(item_ext,"shake");
|
|
|
+ tph = cJSON_GetObjectItem(item_ext,"tph");
|
|
|
+ ts = cJSON_GetObjectItem(item_ext,"ts");
|
|
|
+ st = cJSON_GetObjectItem(item_ext,"st");
|
|
|
+ tt = cJSON_GetObjectItem(item_ext,"tt");
|
|
|
+ htim = cJSON_GetObjectItem(item_ext,"htim");
|
|
|
+ if(device_status.dtype==3)
|
|
|
+ ds = cJSON_GetObjectItem(item_ext,"ds");
|
|
|
+ vt = cJSON_GetObjectItem(item_ext,"vt");
|
|
|
+
|
|
|
+ if(device_status.dtype==3)
|
|
|
+ collt = cJSON_GetObjectItem(item_ext,"collt");
|
|
|
+
|
|
|
+ if(device_status.dtype==7)
|
|
|
+ ds = cJSON_GetObjectItem(item_ext,"on_off");
|
|
|
+ if(device_status.dtype==7)
|
|
|
+ collt = cJSON_GetObjectItem(item_ext,"coll_time"); //收集(数组格式)
|
|
|
+
|
|
|
+ cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time"); //培养时间1~24
|
|
|
+ cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
|
|
|
+ if(work_tim!=RT_NULL){
|
|
|
+ device_status.timeSwitch = 1;
|
|
|
+ st = cJSON_GetObjectItem(work_tim,"st");
|
|
|
+ et = cJSON_GetObjectItem(work_tim,"et");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(data_tim!=RT_NULL){
|
|
|
+ datt = cJSON_GetObjectItem(data_tim,"dat_f");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(power!=RT_NULL){
|
|
|
+ ds = cJSON_GetObjectItem(power,"ds");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(clt_tim!=RT_NULL){
|
|
|
+ cul_time = cJSON_GetObjectItem(clt_tim,"clt_t");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(drop_sec!=NULL)
|
|
|
+ {
|
|
|
+ if(drop_sec->valueint>=1&&drop_sec->valueint<=300)
|
|
|
+ {
|
|
|
+ device_status.shake_sec = drop_sec->valueint;
|
|
|
+ ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
|
|
|
+ LOG_I("下发设置滴液时间:%d",drop_sec->valueint);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(cul_time!=NULL)
|
|
|
+ {
|
|
|
+ if(cul_time->valueint>=1&&cul_time->valueint<=240)
|
|
|
+ {
|
|
|
+ device_status.cul_time = cul_time->valueint;
|
|
|
+ ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
|
|
|
+ LOG_I("下发设置收集时间:%d",cul_time->valueint);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ /*加热温度*/
|
|
|
+ if(hst!=NULL)
|
|
|
+ {
|
|
|
+ if(hst->type==cJSON_Number)
|
|
|
+ {
|
|
|
+ if(hst->valueint>=10&&hst->valueint<=150)
|
|
|
{
|
|
|
- if(drop_sec->valueint>=1&&drop_sec->valueint<=300)
|
|
|
- {
|
|
|
- device_status.shake_sec = drop_sec->valueint;
|
|
|
- ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
|
|
|
- LOG_I("下发设置滴液时间:%d",drop_sec->valueint);
|
|
|
- }
|
|
|
+ device_status.heatvalue = hst->valueint;
|
|
|
+ ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue)); //开始时间
|
|
|
+ LOG_I("加热温度hst:%d",hst->valueint);
|
|
|
}
|
|
|
- if(cul_time!=NULL)
|
|
|
+ else {
|
|
|
+ LOG_E("加热温度hst设置失败参数错误!!!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ if(atoi(hst->valuestring)>10&&atoi(hst->valuestring)<150)
|
|
|
{
|
|
|
- if(cul_time->valueint>=1&&cul_time->valueint<=24)
|
|
|
- {
|
|
|
- device_status.cul_time = cul_time->valueint;
|
|
|
- ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
|
|
|
- LOG_I("下发设置培养时间:%d",cul_time->valueint);
|
|
|
- }
|
|
|
+ device_status.heatvalue=atoi(hst->valuestring);
|
|
|
+ ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue)); //加热温度
|
|
|
+ LOG_I("加热温度hst:%d",atoi(hst->valuestring));
|
|
|
}
|
|
|
- /*加热温度*/
|
|
|
- if(hst!=NULL)
|
|
|
- {
|
|
|
- if(hst->type==cJSON_Number)
|
|
|
- {
|
|
|
- if(hst->valueint>=10&&hst->valueint<=150)
|
|
|
- {
|
|
|
- device_status.heatvalue = hst->valueint;
|
|
|
- ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue)); //开始时间
|
|
|
- LOG_I("加热温度hst:%d",hst->valueint);
|
|
|
- }
|
|
|
- else {
|
|
|
- LOG_E("加热温度hst设置失败参数错误!!!");
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
- if(atoi(hst->valuestring)>10&&atoi(hst->valuestring)<150)
|
|
|
- {
|
|
|
- device_status.heatvalue=atoi(hst->valuestring);
|
|
|
- ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue)); //加热温度
|
|
|
- LOG_I("加热温度hst:%d",atoi(hst->valuestring));
|
|
|
- }
|
|
|
- else {
|
|
|
- LOG_E("加热温度hst设置失败参数错误!!!");
|
|
|
- }
|
|
|
- }
|
|
|
+ else {
|
|
|
+ LOG_E("加热温度hst设置失败参数错误!!!");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
#if 1 //三色光源无法修改开始和结束时间
|
|
|
if (st!=NULL)
|
|
|
{
|
|
|
@@ -2301,27 +2024,10 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- if(vt!=NULL)
|
|
|
- {
|
|
|
- if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=100)
|
|
|
- {
|
|
|
- device_status.version_type = atoi(vt->valuestring);
|
|
|
- ef_set_env_blob("version_type", &device_status.version_type, sizeof(device_status.version_type));
|
|
|
- if(device_status.version_type==7)
|
|
|
- {
|
|
|
- device_status.dtype = 7;
|
|
|
- ef_set_env_blob("dtype", &device_status.dtype, sizeof(device_status.dtype));
|
|
|
- }
|
|
|
- rt_kprintf("版本类型vt:%d\n",atoi(vt->valuestring));
|
|
|
- }
|
|
|
- else {
|
|
|
- rt_kprintf("版本类型设置失败参数错误!!!\n");
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
UpLoad_Data();
|
|
|
rt_thread_delay(2000);
|
|
|
//2022/06/23,add:
|
|
|
- rt_thread_delay(1000);
|
|
|
MA_save();
|
|
|
rt_thread_delay(1000);
|
|
|
}
|
|
|
@@ -2334,15 +2040,12 @@ int parseDtu(char *json_string)
|
|
|
void UpLoad_Data(void)
|
|
|
{
|
|
|
char *updata = makeJson();
|
|
|
- LOG_I("upload data:%d %s",rt_strlen(updata),updata);
|
|
|
- rt_free(updata);
|
|
|
- #if Color_EN ==0
|
|
|
DTU_Write("%s",updata);
|
|
|
- #endif
|
|
|
+ rt_free(updata);
|
|
|
if(device_status.sleep_mode == 1&&device_status.work_status==0&&atoi(device_status.net)==0) {
|
|
|
- rt_thread_delay(5000);
|
|
|
- ctr_router(OFF);
|
|
|
- ctr_RTU_DTU(OFF);
|
|
|
+ //60S后关闭RTU、路由器电源
|
|
|
+ device_status.C01 = 10;
|
|
|
+ LOG_W("60S后关闭RTU、路由器电源");
|
|
|
}
|
|
|
//list_mem();
|
|
|
//播放数据上传中语音
|