|
@@ -49,6 +49,7 @@ struct rx_msg
|
|
|
};
|
|
};
|
|
|
/* 消息队列句柄 */
|
|
/* 消息队列句柄 */
|
|
|
static struct rt_semaphore rx_sem; /* 用于接收消息的信号量 */
|
|
static struct rt_semaphore rx_sem; /* 用于接收消息的信号量 */
|
|
|
|
|
+static struct rt_mutex dtu_write_mutex; /* DTU写互斥锁,防止多线程串口发送冲突 */
|
|
|
rt_thread_t dtu_recv_data = RT_NULL;
|
|
rt_thread_t dtu_recv_data = RT_NULL;
|
|
|
rt_thread_t dtu_send_data = RT_NULL;
|
|
rt_thread_t dtu_send_data = RT_NULL;
|
|
|
|
|
|
|
@@ -100,7 +101,9 @@ void DTU_Write(char *fmt, ...)
|
|
|
va_end(ap);
|
|
va_end(ap);
|
|
|
if (str_length > 2048 - 1)
|
|
if (str_length > 2048 - 1)
|
|
|
str_length = 2048 - 1;
|
|
str_length = 2048 - 1;
|
|
|
|
|
+ rt_mutex_take(&dtu_write_mutex, RT_WAITING_FOREVER);
|
|
|
rt_device_write(dtuserial, 0, dtu_str, str_length);
|
|
rt_device_write(dtuserial, 0, dtu_str, str_length);
|
|
|
|
|
+ rt_mutex_release(&dtu_write_mutex);
|
|
|
LOG_D("DTU_Write:%s",dtu_str);
|
|
LOG_D("DTU_Write:%s",dtu_str);
|
|
|
}
|
|
}
|
|
|
/* 接收数据回调函数 */
|
|
/* 接收数据回调函数 */
|
|
@@ -200,32 +203,15 @@ int dtu_data_play(void)
|
|
|
lwjson_stream_init(&lwparser, NULL);
|
|
lwjson_stream_init(&lwparser, NULL);
|
|
|
rt_err_t rm_dtu_result;
|
|
rt_err_t rm_dtu_result;
|
|
|
DTU_uart2_init();
|
|
DTU_uart2_init();
|
|
|
- //初始化消息队列
|
|
|
|
|
- //rm_dtu_result = rt_mq_init(&rx_mq_dtu, "dtu", &data_arry.msg_pool[0], 512 - sizeof(void*), sizeof(data_arry.msg_pool), RT_IPC_FLAG_FIFO);
|
|
|
|
|
-// if(rm_dtu_result==RT_EOK)
|
|
|
|
|
-// {
|
|
|
|
|
-// rt_kprintf("消息队列创建成功!!");
|
|
|
|
|
-// }
|
|
|
|
|
-// else {
|
|
|
|
|
-// rt_kprintf("消息队列创建失败!!");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ rm_dtu_result = rt_mutex_init(&dtu_write_mutex, "dtu_mtx", RT_IPC_FLAG_FIFO);
|
|
|
|
|
+ if (rm_dtu_result != RT_EOK)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_E("dtu_write_mutex init failed!");
|
|
|
|
|
+ }
|
|
|
/* 初始化信号量 */
|
|
/* 初始化信号量 */
|
|
|
rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
|
|
rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO);
|
|
|
-
|
|
|
|
|
/* 设置接收回调函数 */
|
|
/* 设置接收回调函数 */
|
|
|
rt_device_set_rx_indicate(dtuserial, dtu_input);
|
|
rt_device_set_rx_indicate(dtuserial, dtu_input);
|
|
|
- #if 0
|
|
|
|
|
- /*创建线程-指令发送*/
|
|
|
|
|
- dtu_send_data = rt_thread_create("DTU_thread",
|
|
|
|
|
- dtu_thread_entry_send,RT_NULL,
|
|
|
|
|
- DTU_THREAD_STACK_SIZE,
|
|
|
|
|
- 3, //优先级高是为了保证数据上传的频率的精确度
|
|
|
|
|
- 20 //时间片
|
|
|
|
|
- );
|
|
|
|
|
- /* 如果获得线程控制块,启动这个线程 */
|
|
|
|
|
- if(dtu_send_data!=RT_NULL)
|
|
|
|
|
- rt_thread_startup(dtu_send_data);
|
|
|
|
|
- #endif
|
|
|
|
|
/* 创建线程-指令接收解析*/
|
|
/* 创建线程-指令接收解析*/
|
|
|
dtu_recv_data = rt_thread_create("t_uart2",
|
|
dtu_recv_data = rt_thread_create("t_uart2",
|
|
|
dtu_thread_entry_recv, RT_NULL,
|
|
dtu_thread_entry_recv, RT_NULL,
|
|
@@ -465,6 +451,308 @@ char *makeJson_C01_Warn(uint16_t code,double process)
|
|
|
cJSON_Delete(pJsonRoot);
|
|
cJSON_Delete(pJsonRoot);
|
|
|
return w;
|
|
return w;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+/**
|
|
|
|
|
+ * @brief 创建JSON-RPC 2.0请求字符串
|
|
|
|
|
+ * @param method 方法名(必须)
|
|
|
|
|
+ * @param params 参数对象(可选)
|
|
|
|
|
+ * @param id 请求ID(可选,NULL表示通知)
|
|
|
|
|
+ * @return 返回JSON字符串,需要调用者释放,失败返回NULL
|
|
|
|
|
+ */
|
|
|
|
|
+char* makeJsonRpc2_0(const char* method, cJSON* params, int id)
|
|
|
|
|
+{
|
|
|
|
|
+ // 参数检查
|
|
|
|
|
+ if (method == NULL || method[0] == '\0') {
|
|
|
|
|
+ fprintf(stderr, "Error: method cannot be NULL or empty\n");
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ cJSON* root = cJSON_CreateObject();
|
|
|
|
|
+ if (root == NULL) {
|
|
|
|
|
+ fprintf(stderr, "Error: Failed to create JSON object\n");
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 添加 jsonrpc 版本
|
|
|
|
|
+ if (!cJSON_AddStringToObject(root, "jsonrpc", "2.0")) {
|
|
|
|
|
+ cJSON_Delete(root);
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 添加 method
|
|
|
|
|
+ if (!cJSON_AddStringToObject(root, "method", method)) {
|
|
|
|
|
+ cJSON_Delete(root);
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 添加 params(如果有)
|
|
|
|
|
+ if (params != NULL) {
|
|
|
|
|
+ // 注意:这里不复制params,调用者需要保证params在函数调用期间有效
|
|
|
|
|
+ cJSON_AddItemToObject(root, "params", params);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ cJSON_AddNumberToObject(root, "id", id);
|
|
|
|
|
+ // 生成JSON字符串
|
|
|
|
|
+ char* json_str = cJSON_PrintUnformatted(root);
|
|
|
|
|
+
|
|
|
|
|
+ // 清理
|
|
|
|
|
+ cJSON_Delete(root);
|
|
|
|
|
+
|
|
|
|
|
+ return json_str;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+void parse_param_to_mcu(cJSON* Params)
|
|
|
|
|
+{
|
|
|
|
|
+ if(Params!=NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ cJSON* value = NULL;
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"reboot_time");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.rebootcnt = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("reboot_time", &device_status.rebootcnt, sizeof(device_status.rebootcnt));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"ds");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.ds = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collecting_sh1");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collecting_sh1 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collt_min_sh1");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collt_min_sh1 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collt_min_sh1", &device_status.collt_min_sh1, sizeof(device_status.collt_min_sh1));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collecting_eh1");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collecting_eh1 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collt_min_eh1");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collt_min_eh1 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collt_min_eh1", &device_status.collt_min_eh1, sizeof(device_status.collt_min_eh1));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collecting_sh2");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collecting_sh2 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collt_min_sh2");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collt_min_sh2 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collt_min_sh2", &device_status.collt_min_sh2, sizeof(device_status.collt_min_sh2));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collecting_eh2");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collecting_eh2 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collt_min_eh2");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collt_min_eh2 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collt_min_eh2", &device_status.collt_min_eh2, sizeof(device_status.collt_min_eh2));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collecting_sh3");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collecting_sh3 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collt_min_sh3");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collt_min_sh3 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collt_min_sh3", &device_status.collt_min_sh3, sizeof(device_status.collt_min_sh3));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collecting_eh3");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.tph = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"collt_min_eh3");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.collt_min_eh3 = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("collt_min_eh3", &device_status.collt_min_eh3, sizeof(device_status.collt_min_eh3));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"tpl");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.tpl = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"tph");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.tph = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"x_init_dis");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.x_init_dis = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ value = cJSON_GetObjectItem(Params,"y_init_dis");
|
|
|
|
|
+ if(value!=NULL){
|
|
|
|
|
+ device_status.y_init_dis = value->valueint;
|
|
|
|
|
+ ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }else{
|
|
|
|
|
+ LOG_E("Params is NULL!");
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+//备份MCU参数到RTU
|
|
|
|
|
+void backup_param_to_rtu(void)
|
|
|
|
|
+{
|
|
|
|
|
+ cJSON* proot = cJSON_CreateObject();
|
|
|
|
|
+ if (proot == NULL) {
|
|
|
|
|
+ LOG_E("Error: Failed to create JSON object\n");
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // MCU重启次数
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "reboot_time", device_status.rebootcnt)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 开关机状态
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "ds", device_status.ds)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第一段开始时间-小时
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collecting_sh1", device_status.collecting_sh1)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第一段开始时间-分钟
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collt_min_sh1", device_status.collt_min_sh1)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第一段结束时间
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collecting_eh1", device_status.collecting_eh1)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第一段结束时间-分钟
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collt_min_eh1", device_status.collt_min_eh1)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第二段开始时间
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collecting_sh2", device_status.collecting_sh2)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第二段开始时间-分钟
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collt_min_sh2", device_status.collt_min_sh2)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第二段结束时间
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collecting_eh2", device_status.collecting_eh2)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ //第二段结束时间-分钟
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collt_min_eh2", device_status.collt_min_eh2)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第三段开始时间
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collecting_sh3", device_status.collecting_sh3)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ //第三段开始时间-分钟
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collt_min_sh3", device_status.collt_min_sh3)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //第三段结束时间
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collecting_eh3", device_status.collecting_eh3)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ //第三段结束时间-分钟
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "collt_min_eh3", device_status.collt_min_eh3)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //低温保护阈值
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "tpl", device_status.tpl)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //高温保护阈值
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "tph", device_status.tph)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //X轴校准坐标
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "x_init_dis", device_status.x_init_dis)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //Y轴校准坐标
|
|
|
|
|
+ if (!cJSON_AddNumberToObject(proot, "y_init_dis", device_status.y_init_dis)) {
|
|
|
|
|
+ cJSON_Delete(proot);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ char* temp = makeJsonRpc2_0("sync_param", proot, 1);
|
|
|
|
|
+ if(temp){
|
|
|
|
|
+ DTU_Write(temp);
|
|
|
|
|
+ free(temp);
|
|
|
|
|
+ }
|
|
|
|
|
+ //cJSON_Delete(proot);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+void recover_param_from_rtu(void)
|
|
|
|
|
+{
|
|
|
|
|
+ char* temp1 = makeJsonRpc2_0("recover_param", NULL, 1);
|
|
|
|
|
+ if(temp1){
|
|
|
|
|
+ DTU_Write(temp1);
|
|
|
|
|
+ rt_free(temp1);
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
/*生成JSON数据*/
|
|
/*生成JSON数据*/
|
|
|
char * makeJson()
|
|
char * makeJson()
|
|
|
{
|
|
{
|
|
@@ -668,8 +956,11 @@ int parseDtu(char *json_string)
|
|
|
cJSON* movz = NULL;
|
|
cJSON* movz = NULL;
|
|
|
cJSON* calibrate = NULL;
|
|
cJSON* calibrate = NULL;
|
|
|
cJSON* speed = NULL;
|
|
cJSON* speed = NULL;
|
|
|
- rt_kprintf("解析串口接受区数据:%s\n",json_string);
|
|
|
|
|
- //LOG_I("解析串口接受区数据:%s",json_string);
|
|
|
|
|
|
|
+ cJSON* JSONRPC = NULL;
|
|
|
|
|
+ cJSON* METHOD = NULL;
|
|
|
|
|
+ cJSON* PARAMS = NULL;
|
|
|
|
|
+ cJSON* RESULT = NULL;
|
|
|
|
|
+ LOG_I("解析串口缓冲区数据:%s",json_string);
|
|
|
cJSON *root = cJSON_Parse(json_string);
|
|
cJSON *root = cJSON_Parse(json_string);
|
|
|
if(!root)
|
|
if(!root)
|
|
|
{
|
|
{
|
|
@@ -679,6 +970,22 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
|
|
+ JSONRPC = cJSON_GetObjectItem(root,"jsonrpc");
|
|
|
|
|
+ METHOD = cJSON_GetObjectItem(root,"method");
|
|
|
|
|
+ PARAMS = cJSON_GetObjectItem(root,"params");
|
|
|
|
|
+ RESULT = cJSON_GetObjectItem(root,"result");
|
|
|
|
|
+ if (JSONRPC != NULL && METHOD != NULL && METHOD->type == cJSON_String) {
|
|
|
|
|
+ if(strcmp(METHOD->valuestring,"sync_param")==0) {
|
|
|
|
|
+ if(PARAMS!=NULL&&PARAMS->type==cJSON_Object){
|
|
|
|
|
+ parse_param_to_mcu(PARAMS);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ else{
|
|
|
|
|
+ LOG_W("未知的命令: %s", METHOD->valuestring);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
item_cmd = cJSON_GetObjectItem(root,"cmd");
|
|
item_cmd = cJSON_GetObjectItem(root,"cmd");
|
|
|
item_ext=cJSON_GetObjectItem(root,"ext");
|
|
item_ext=cJSON_GetObjectItem(root,"ext");
|
|
|
item_focus = cJSON_GetObjectItem(root,"focus");
|
|
item_focus = cJSON_GetObjectItem(root,"focus");
|
|
@@ -978,28 +1285,32 @@ int parseDtu(char *json_string)
|
|
|
LOG_I("相机状态:%d",device_status.camsta);
|
|
LOG_I("相机状态:%d",device_status.camsta);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(strstr(device_status.imei,imei->valuestring)==RT_NULL)
|
|
|
|
|
|
|
+ if(imei!=RT_NULL)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("Change IMEI:new:%s-old:%s",imei->valuestring,device_status.imei);
|
|
|
|
|
- rt_sprintf(device_status.imei, "%s",imei->valuestring);
|
|
|
|
|
- ef_set_env_blob("imei", &device_status.imei, sizeof(device_status.imei)); //IMEI
|
|
|
|
|
|
|
+ if(strstr(device_status.imei,imei->valuestring)==RT_NULL&&strcmp(imei->valuestring, "") != 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_I("Change IMEI:new:%s-old:%s",imei->valuestring,device_status.imei);
|
|
|
|
|
+ rt_sprintf(device_status.imei, "%s",imei->valuestring);
|
|
|
|
|
+ ef_set_env_blob("imei", &device_status.imei, sizeof(device_status.imei)); //IMEI
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ LOG_I("IMEI not change:%s-%s",imei->valuestring,device_status.imei);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
- rt_sprintf(device_status.imei,"%s",imei->valuestring);
|
|
|
|
|
- rt_kprintf("IMEI not change:%s-%s",imei->valuestring,device_status.imei);
|
|
|
|
|
- }
|
|
|
|
|
//如果DTU的ICCID和FLash中的不一样,保存到FLASH
|
|
//如果DTU的ICCID和FLash中的不一样,保存到FLASH
|
|
|
- if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL)
|
|
|
|
|
|
|
+ if(iccid!=RT_NULL)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
|
|
|
|
|
- rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
|
|
|
|
|
- ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid)); //Iccid
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
|
|
|
|
|
- rt_kprintf("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
|
|
|
|
|
|
|
+ //如果DTU的ICCID和FLash中的不一样,保存到FLASH
|
|
|
|
|
+ if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL&&strcmp(iccid->valuestring, "") != 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_I("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
|
|
|
|
|
+ rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
|
|
|
|
|
+ ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid)); //Iccid
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ LOG_I("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
if(datetime!=RT_NULL){
|
|
if(datetime!=RT_NULL){
|
|
|
LOG_I("DTU时间:%s",datetime->valuestring);
|
|
LOG_I("DTU时间:%s",datetime->valuestring);
|
|
|
int year, month, day, hour, minute, second;
|
|
int year, month, day, hour, minute, second;
|
|
@@ -1122,24 +1433,7 @@ int parseDtu(char *json_string)
|
|
|
sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
|
|
sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
|
|
|
LOG_I("当前平台2:%s",mqttcfg2->valuestring);
|
|
LOG_I("当前平台2:%s",mqttcfg2->valuestring);
|
|
|
}
|
|
}
|
|
|
- if( device_status.num_updata==0)
|
|
|
|
|
- {
|
|
|
|
|
- Beep_Tip(100);
|
|
|
|
|
- UpLoad_Data();
|
|
|
|
|
- }
|
|
|
|
|
- else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
|
|
|
|
|
- {
|
|
|
|
|
- if(strstr(device_status.project,"cgo")!=RT_NULL||strstr(device_status.project,"Android11")!=RT_NULL)
|
|
|
|
|
- {
|
|
|
|
|
- UpLoad_Data();
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- rt_thread_delay(2000);
|
|
|
|
|
- UpLoad_Data();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- device_status.hmi_fresh = 0;
|
|
|
|
|
|
|
+ UpLoad_Data();
|
|
|
}
|
|
}
|
|
|
if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
|
|
if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
|
|
|
{
|
|
{
|
|
@@ -1404,6 +1698,7 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ backup_param_to_rtu();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
cJSON_Delete(root);
|
|
cJSON_Delete(root);
|