yf_zjb před 5 roky
rodič
revize
71ca6b4dcc

binární
Application_CBD/Debug/packages/freemodbus-latest/samples/sample_mb_master.o


+ 4 - 3
Application_CBD/applications/dtu_uart2.c

@@ -50,7 +50,7 @@ rt_thread_t dtu_send_data = RT_NULL;
 rt_device_t dtuserial;   /*串口设备句柄*/
 struct  serial_configure dtuconfig = RT_SERIAL_CONFIG_DEFAULT;  /*初始化配置参数*/
 static int num_updata = 60;
-
+static uint8_t makejson_sta = 0;
 
 static int DTU_uart2_init(void)
 {
@@ -354,8 +354,8 @@ char * makeJson()
     char utos[4];
     if(device_status.gps==NULL)
     rt_sprintf(device_status.gps, "0");
-    //如果设备工作并且电流小于500,灯管异常
-    if(atoi(device_status.power)<400&&device_status.work_status==1)
+    //如果设备工作并且电流小于500,并且不是上电启动灯管异常
+    if(atoi(device_status.power)<400&&device_status.work_status==1&&makejson_sta!=0)
     {
         rt_kprintf("power is:%d",atoi(device_status.power));
         device_status.lamp_status = 1;
@@ -363,6 +363,7 @@ char * makeJson()
     else {
         device_status.lamp_status = 0;
     }
+    makejson_sta = 1;
     time_t stamp=time(RT_NULL);
     static struct tm tm;
     gmtime_r(&stamp, &tm);

+ 2 - 0
Application_CBD/applications/hmi.c

@@ -815,6 +815,8 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.sim,"1");
         Hmi_Fresh();
         dtu_data_play();
+        sht30_collect();
+        mb_master_samlpe();
         uint16_t connect_num=0;
         //等待联网,
         while(atoi(device_status.net)==1)

+ 2 - 2
Application_CBD/applications/main.c

@@ -60,8 +60,8 @@ int main(void)
         //屏幕初始化
         //Hmi_Fresh();
         //传感器数据采集线程
-        sht30_collect();
-        mb_master_samlpe();
+        //sht30_collect();
+        //mb_master_samlpe();
         //开机自检
         HardWare_Check(0);
         //工作状态置位线程

+ 2 - 0
Application_CBD/applications/sht30_collect.c

@@ -113,6 +113,8 @@ static void sht30_collect_thread_entry(void *parameter)
         }
         else
         {
+            hum_value = 30;
+            tem_value = 25;
             rt_kprintf("read sht3x fail.\r\n");
             //重新初始化
             sht3x_deinit(sht3x_device);

+ 10 - 3
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -53,18 +53,25 @@ static void send_thread_entry(void *parameter)
 //                                                              RT_WAITING_FOREVER); /* timeout */
         error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,100);//读多个保持寄存器
         rt_kprintf("error_code: %d \n",error_code);//一直出错,我便把错误返回值打印出来
-        if(error_code==3)
+        if(error_code==0)
         {
+            error_count = 0;
             rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/10, (uint)usMRegHoldBuf[0][0] % 10);
             rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/10, (uint)usMRegHoldBuf[0][1] % 10);
         }
-        //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_thread_delay(5000);
         /* Record the number of errors */
-        if (error_code != MB_MRE_NO_ERR)
+        if (error_code != 0)
         {
             error_count++;
+            if(error_count == 60)
+            {
+                error_count = 0;
+                rt_sprintf(device_status.tempture,"25.0");
+                rt_sprintf(device_status.humidity,"30.0");
+            }
         }
     }
 }

+ 4 - 1
Application_CBD/readme.md

@@ -90,7 +90,10 @@ static int num_updata = 60;
 ## 2021-04-14-版本:1.10.41(HK)
 - 屏幕刷新联网状态和CSQ,SIM卡信息等增加超时,30s
 - 开机判断时间增加等待RTU联网成功,超时3分钟,超时切换光控
-
+## 2021-04-25-版本:1.11.41(HK)
+- 修复开机上电的第一条数据灯管状态为异常;
+	原因:已经进入工作状态但是灯管还未启动.
+- 修复485温湿度