yf_zjb 2 سال پیش
والد
کامیت
6da1ec7aae

BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1534 - 1530
Application_CBD/Debug/Application_CBD.map


BIN
Application_CBD/Debug/applications/control.o


BIN
Application_CBD/Debug/applications/dtu_uart2.o


BIN
Application_CBD/Debug/applications/hmi.o


BIN
Application_CBD/Debug/applications/main.o


BIN
Application_CBD/Debug/rt-thread/src/kservice.o


+ 1 - 1
Application_CBD/applications/control.c

@@ -2542,7 +2542,7 @@ static void Control_Clear_thread_entry(void *parameter)
         }
         }
         if(device_status.clear_status==10){
         if(device_status.clear_status==10){
             //ctr_turn(90,0);
             //ctr_turn(90,0);
-            Motor_shake(1,400);
+            Motor_shake(1,800);
             device_status.clear_status = 0;
             device_status.clear_status = 0;
         }
         }
         #if 0
         #if 0

+ 1 - 1
Application_CBD/applications/control.h

@@ -36,7 +36,7 @@
 
 
 #define VERSION_BZY         "2.60"                   //孢子仪
 #define VERSION_BZY         "2.60"                   //孢子仪
 
 
-#define VERSION_XY3          "1.3.3"                 //拍照性诱-dtype=8
+#define VERSION_XY3          "1.4.3"                 //拍照性诱-dtype=8
 
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
 /*********************************************************************/

+ 4 - 4
Application_CBD/applications/hmi.c

@@ -668,21 +668,21 @@ static void HMI_Decode(void)
         char value_str[20];
         char value_str[20];
         memset(value_str,0,sizeof(value_str));
         memset(value_str,0,sizeof(value_str));
         LOG_I("设备编码 长度:%d",strlen(rx_buffer));
         LOG_I("设备编码 长度:%d",strlen(rx_buffer));
-        if(strlen(rx_buffer)!=27){
+        if(strlen(rx_buffer)!=19){
             LOG_E("编码长度错误!");
             LOG_E("编码长度错误!");
             return;
             return;
         }
         }
         var = strstr(rx_buffer,"=");
         var = strstr(rx_buffer,"=");
         var ++;
         var ++;
-        strncpy(value_str,var,16);  //设备编码为16位
-        if(strstr(value_str,"0000000000000000")!=RT_NULL){
+        strncpy(value_str,var,8);  //设备编码为16位
+        if(strstr(value_str,"00000000")!=RT_NULL){
             char *config_reset = makeJson_Config_Reset();
             char *config_reset = makeJson_Config_Reset();
             //发送json到RTU
             //发送json到RTU
             DTU_Write("%s",config_reset);
             DTU_Write("%s",config_reset);
             rt_free(config_reset);
             rt_free(config_reset);
             //恢复RTU的默认配置参数
             //恢复RTU的默认配置参数
         }else{
         }else{
-            rt_sprintf(device_status.deviceId,"%s",value_str);
+            rt_sprintf(device_status.deviceId,"10300501%s",value_str);
             ef_set_env_blob("deviceId", &device_status.deviceId, sizeof(device_status.deviceId));
             ef_set_env_blob("deviceId", &device_status.deviceId, sizeof(device_status.deviceId));
             LOG_I("解析到设备编码:%s",device_status.deviceId);
             LOG_I("解析到设备编码:%s",device_status.deviceId);
             char *device_id = makeJson_Config_BDH(device_status.deviceId);
             char *device_id = makeJson_Config_BDH(device_status.deviceId);

+ 21 - 22
Application_CBD/applications/sample_mb_master.c

@@ -55,7 +55,6 @@ static void send_thread_entry(void *parameter)
 //                                                              MB_SEND_REG_NUM,     /* register total number */
 //                                                              MB_SEND_REG_NUM,     /* register total number */
 //                                                              data,                /* data to be written */
 //                                                              data,                /* data to be written */
 //                                                              RT_WAITING_FOREVER); /* timeout */
 //                                                              RT_WAITING_FOREVER); /* timeout */
-        #if 0
         error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
         error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
         rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
         rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
         if(error_code==0)
         if(error_code==0)
@@ -70,28 +69,29 @@ static void send_thread_entry(void *parameter)
 //                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
 //                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
 //                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
 //                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
 //            }
 //            }
-        }
-        rt_thread_delay(1000);
-        #endif
-
-
-        error_code = eMBMasterReqReadInputRegister(SLAVE_ADDR, MB_SEND_REG_START,3,1000);
-        rt_kprintf("eMBMasterReqReadInputRegister: %d \n",error_code);//一直出错,把错误返回值打印出来
-        if(error_code==0)
-        {
-            if(IN_3A==0){
-                error_code = eMBMasterReqWriteHoldingRegister(0,0x3A,1,1000);
-                IN_3A = 1;
-                rt_kprintf("数据解析方式设置:%d\n",error_code);
-            }
-            device_status.sensor_485_sta = 200;
-            error_count = 0;
-            for(int i=0;i<3;i++){
-                rt_kprintf("usMRegInBuf:%d-%u\n",i,usMRegInBuf[0][i]);
+        }else{
+            rt_thread_delay(1000);
+            #if 1
+            error_code = eMBMasterReqReadInputRegister(SLAVE_ADDR, MB_SEND_REG_START,3,1000);
+            rt_kprintf("eMBMasterReqReadInputRegister: %d \n",error_code);//一直出错,把错误返回值打印出来
+            if(error_code==0)
+            {
+                if(IN_3A==0){
+                    error_code = eMBMasterReqWriteHoldingRegister(0,0x3A,1,1000);
+                    IN_3A = 1;
+                    rt_kprintf("数据解析方式设置:%d\n",error_code);
+                }
+                device_status.sensor_485_sta = 200;
+                error_count = 0;
+                for(int i=0;i<3;i++){
+                    rt_kprintf("usMRegInBuf:%d-%u\n",i,usMRegInBuf[0][i]);
+                }
+                rt_sprintf(device_status.voltage_sun,"%d.%1d",usMRegInBuf[0][0]/100,usMRegInBuf[0][0]%100);
+            }else{
+                rt_sprintf(device_status.voltage_sun,"%s","0.0");
             }
             }
-            rt_sprintf(device_status.voltage_sun,"%d.%1d",usMRegInBuf[0][0]/100,usMRegInBuf[0][0]%100);
+            #endif
         }
         }
-
         rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
         rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
         rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
         rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
         rt_thread_delay(5000);
         rt_thread_delay(5000);
@@ -103,7 +103,6 @@ static void send_thread_entry(void *parameter)
             {
             {
                 error_count = 0;
                 error_count = 0;
                 device_status.sensor_485_sta = 0;
                 device_status.sensor_485_sta = 0;
-
             }
             }
         }
         }
     }
     }