|
|
@@ -28,8 +28,8 @@
|
|
|
#define MB_POLL_THREAD_PRIORITY 11
|
|
|
#define MB_SEND_THREAD_PRIORITY RT_THREAD_PRIORITY_MAX - 1
|
|
|
|
|
|
-#define MB_SEND_REG_START 0
|
|
|
-#define MB_SEND_REG_NUM 2
|
|
|
+#define MB_SEND_REG_START 1034
|
|
|
+#define MB_SEND_REG_NUM 10
|
|
|
|
|
|
#define MB_POLL_CYCLE_MS 500
|
|
|
extern Device_Status_typedef device_status;
|
|
|
@@ -51,13 +51,18 @@ static void send_thread_entry(void *parameter)
|
|
|
// MB_SEND_REG_NUM, /* register total number */
|
|
|
// data, /* data to be written */
|
|
|
// RT_WAITING_FOREVER); /* timeout */
|
|
|
- error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,100);//读多个保持寄存器
|
|
|
+ error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
|
|
|
rt_kprintf("error_code: %d \n",error_code);//一直出错,我便把错误返回值打印出来
|
|
|
if(error_code==0)
|
|
|
{
|
|
|
+ device_status.sensor_485_sta=1;
|
|
|
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);
|
|
|
+ //温度=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]/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:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
|
|
|
@@ -69,8 +74,9 @@ static void send_thread_entry(void *parameter)
|
|
|
if(error_count == 60)
|
|
|
{
|
|
|
error_count = 0;
|
|
|
- rt_sprintf(device_status.tempture,"25.0");
|
|
|
- rt_sprintf(device_status.humidity,"30.0");
|
|
|
+ device_status.sensor_485_sta = 0;
|
|
|
+// rt_sprintf(device_status.tempture,"25.0");
|
|
|
+// rt_sprintf(device_status.humidity,"30.0");
|
|
|
}
|
|
|
}
|
|
|
}
|