yf_zjb před 2 roky
rodič
revize
8362eb2ff8

binární
Application_CBD/Debug/Application_CBD.bin


binární
Application_CBD/Debug/Application_CBD.elf


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 857 - 857
Application_CBD/Debug/Application_CBD.map


binární
Application_CBD/Debug/applications/control.o


binární
Application_CBD/Debug/applications/main.o


+ 4 - 1
Application_CBD/Debug/applications/sample_mb_master.d

@@ -79,7 +79,8 @@ applications/sample_mb_master.o: ../applications/sample_mb_master.c \
  D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/pin.h \
  D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/pin.h \
  D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/hwtimer.h \
  D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/hwtimer.h \
  D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/adc.h \
  D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/adc.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/rt_drv_pwm.h
+ D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/rt_drv_pwm.h \
+ ../applications/hmi.h
 
 
 D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rtconfig_preinc.h:
 D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rtconfig_preinc.h:
 
 
@@ -242,3 +243,5 @@ D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\componen
 D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/adc.h:
 D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/adc.h:
 
 
 D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/rt_drv_pwm.h:
 D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\drivers\include/drivers/rt_drv_pwm.h:
+
+../applications/hmi.h:

binární
Application_CBD/Debug/applications/sample_mb_master.o


binární
Application_CBD/Debug/rtthread.rbl


+ 9 - 7
Application_CBD/applications/control.c

@@ -777,6 +777,10 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
     if(device_status.dtype==7&&shake_sec!=0)
     if(device_status.dtype==7&&shake_sec!=0)
         DTU_Write("drop");
         DTU_Write("drop");
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
+    #if 0
+    rt_pin_write(SHAKE_SW,ON);
+    return 0;
+    #endif
     if(status_shake==ON&&device_status.shake_ws==1)
     if(status_shake==ON&&device_status.shake_ws==1)
     {
     {
 
 
@@ -2286,13 +2290,10 @@ void WorkTask(void)
         #endif
         #endif
         if(device_status.version_type!=5)
         if(device_status.version_type!=5)
         {
         {
-            if(clt_time==0)
-            {
-                rt_thread_delay(5000);  //待灯管启动再往下执行,否则会触发电机过流
-                //2.打开上仓门
-                rt_kprintf("打开上仓门!!!\n");
-                device_status.ctr_up_motor = 1;
-            }
+            rt_thread_delay(1000);  //待灯管启动再往下执行,否则会触发电机过流
+            //2.打开上仓门
+            LOG_I("打开上仓门!!!");
+            device_status.ctr_up_motor = 1;
             //3.收集
             //3.收集
             clt_time = device_status.clt_time * 60;
             clt_time = device_status.clt_time * 60;
 
 
@@ -2468,6 +2469,7 @@ void WorkTask(void)
                 turnzp();  //2024-03-21 :开机不再转仓
                 turnzp();  //2024-03-21 :开机不再转仓
             }
             }
             ResetInit();
             ResetInit();
+            clt_time = 0;
         }
         }
         rt_kprintf("***not work-device status:%d\n",device_status.ds);
         rt_kprintf("***not work-device status:%d\n",device_status.ds);
 }
 }

+ 33 - 28
Application_CBD/applications/sample_mb_master.c

@@ -11,6 +11,7 @@
 #include <rtthread.h>
 #include <rtthread.h>
 #include <user_mb_app.h>
 #include <user_mb_app.h>
 #include "control.h"
 #include "control.h"
+#include "hmi.h"
 #ifdef PKG_MODBUS_MASTER_SAMPLE
 #ifdef PKG_MODBUS_MASTER_SAMPLE
 #define SLAVE_ADDR      MB_SAMPLE_TEST_SLAVE_ADDR
 #define SLAVE_ADDR      MB_SAMPLE_TEST_SLAVE_ADDR
 #define PORT_NUM        MB_MASTER_USING_PORT_NUM
 #define PORT_NUM        MB_MASTER_USING_PORT_NUM
@@ -55,42 +56,46 @@ 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 */
-        error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
-        rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
+
+        #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(error_code==0)
         {
         {
-            device_status.sensor_485_sta = 100;
+            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;
             error_count = 0;
-            //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
-//            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
-//            {
-                rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (uint)usMRegHoldBuf[0][0] % 100);
-                rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (uint)usMRegHoldBuf[0][1] % 100);
-//                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
-//                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
-//            }
+            for(int i=0;i<3;i++){
+                rt_kprintf("usMRegInBuf:%d-%u\n",i,usMRegInBuf[0][i]);
+            }
+            rt_sprintf(device_status.voltage_sun,"%d.%d",usMRegInBuf[0][0]/100,usMRegInBuf[0][0]%100/10);
+            //太阳能板电压
+            HMI_WRITE("menu.g0.txt=\"太阳能板电压:%sV\"",device_status.voltage_sun);
         }else{
         }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);//一直出错,把错误返回值打印出来
+            rt_sprintf(device_status.voltage_sun,"%s","0.0");
+        }
+        #endif
+        if(device_status.sensor_485_sta!=200){
+            error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
+            rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
             if(error_code==0)
             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;
+                device_status.sensor_485_sta = 100;
                 error_count = 0;
                 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");
+                //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
+    //            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
+    //            {
+                    rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (uint)usMRegHoldBuf[0][0] % 100);
+                    rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (uint)usMRegHoldBuf[0][1] % 100);
+    //                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
         }
         }
         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