yf_zjb пре 2 година
родитељ
комит
f1ba236a3c

BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


Разлика између датотеке није приказан због своје велике величине
+ 1556 - 1551
Application_CBD/Debug/Application_CBD.map


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/applications/sample_mb_master.o


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


BIN
Application_CBD/Debug/rtthread.rbl


+ 0 - 2
Application_CBD/Debug/uploadbin.bat

@@ -1,2 +0,0 @@
-echo "start upload!!!"
-C:\Windows\System32\curl.exe ftp://8.136.98.49/_UPDATE_FILE/A7/STM32/rtthread.rbl --ftp-create-dirs -u "cbd_user:YFkj@6O2O" -T "rtthread.rbl" -# -v

+ 4 - 4
Application_CBD/applications/control.c

@@ -813,7 +813,7 @@ uint8_t ctr_led(uint8_t status_led)
 {
     rt_pin_mode(LED_SW, PIN_MODE_OUTPUT);
     if(device_status.version_type==6)
-    rt_pin_mode(LED_P, PIN_MODE_OUTPUT);
+        rt_pin_mode(LED_P, PIN_MODE_OUTPUT);
     if(status_led==ON)
     {
         rt_pin_write(LED_SW,ON);
@@ -824,7 +824,7 @@ uint8_t ctr_led(uint8_t status_led)
     else if(status_led==OFF){
         rt_pin_write(LED_SW,OFF);
         if(device_status.version_type==6)
-        rt_pin_write(LED_P,OFF);
+            rt_pin_write(LED_P,OFF);
         HMI_WRITE("sysTest.switchPhoto.val=%d",OFF);
         HMI_WRITE("sysTest.switchFill.val=%d",OFF);
     }
@@ -1692,9 +1692,9 @@ void ResetInit(void)
            }
            //排虫
            if(device_status.handle_bugger==0){
-               device_status.run_sta = 111;
+               device_status.run_sta = 111;     //排虫
            }else{
-               device_status.run_sta = 112;
+               device_status.run_sta = 112;     //收虫
            }
 
     }

+ 4 - 0
Application_CBD/applications/dtu_uart2.c

@@ -774,6 +774,10 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"dat_f",utos);
     //信号强度
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
+    #if 1
+    //太阳能板电压
+    cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);
+    #endif
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {

+ 12 - 8
Application_CBD/applications/hmi.c

@@ -689,21 +689,21 @@ static void HMI_Decode(void)
         char value_str[20];
         memset(value_str,0,sizeof(value_str));
         LOG_I("设备编码 长度:%d",strlen(rx_buffer));
-        if(strlen(rx_buffer)!=27){
+        if(strlen(rx_buffer)!=19){
             LOG_E("编码长度错误!");
             return;
         }
         var = strstr(rx_buffer,"=");
         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();
             //发送json到RTU
             DTU_Write("%s",config_reset);
             rt_free(config_reset);
             //恢复RTU的默认配置参数
         }else{
-            rt_sprintf(device_status.deviceId,"%s",value_str);
+            rt_sprintf(device_status.deviceId,"10300101%s",value_str);   //设备大类编码103-虫情 设备小类编码 001 生产商代码01
             ef_set_env_blob("deviceId", &device_status.deviceId, sizeof(device_status.deviceId));
             LOG_I("解析到设备编码:%s",device_status.deviceId);
             char *device_id = makeJson_Config_BDH(device_status.deviceId);
@@ -1601,8 +1601,9 @@ static void Ctr_Mortor_entry(void* parameter)
             }
         }
 
-        if(device_status.run_sta==111){//收虫
+        if(device_status.run_sta==111){         //排虫-收缩
             ctr_Fan_IN(ON);   //推杆电机收缩(供电打开,复位)
+            ctr_Fan_PUT(OFF);
             num_tg_init--;
             if(num_tg_init%10==0)
                 HMI_WRITE("sysTest.result.txt=\"排虫复位中:%d\"",num_tg_init/10);
@@ -1610,15 +1611,18 @@ static void Ctr_Mortor_entry(void* parameter)
                 HMI_WRITE("sysTest.result.txt=\"排虫复位完成\"");
                 ctr_Fan_IN(OFF);
                 num_tg_init = 200;
+                device_status.run_sta=0;
             }
-        }else if(device_status.run_sta==112){
+        }else if(device_status.run_sta==112){   //收虫-推出
+            ctr_Fan_IN(ON);
             ctr_Fan_PUT(ON);
             num_tg_open--;
             if(num_tg_open%10==0)
-                            HMI_WRITE("sysTest.result.txt=\"开始执行排虫:%d\"",num_tg_open/10);
+                HMI_WRITE("sysTest.result.txt=\"开始执行收虫:%d\"",num_tg_open/10);
             if(num_tg_open==0){
-                HMI_WRITE("sysTest.result.txt=\"排虫中...\"");
+                HMI_WRITE("sysTest.result.txt=\"收虫中...\"");
                 ctr_Fan_PUT(OFF);
+                ctr_Fan_IN(OFF);
                 num_tg_open = 200;
                 device_status.run_sta=0;
             }

+ 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 */
 //                                                              data,                /* data to be written */
 //                                                              RT_WAITING_FOREVER); /* timeout */
-        #if 1
         error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
         rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
         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.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
 //            }
-        }
-        rt_thread_delay(1000);
-        #endif
-
-        #if 0
-        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
         }
-        #endif
         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_thread_delay(5000);
@@ -103,7 +103,6 @@ static void send_thread_entry(void *parameter)
             {
                 error_count = 0;
                 device_status.sensor_485_sta = 0;
-
             }
         }
     }