yf_zjb 4 years ago
parent
commit
f9cf98a4f0

+ 1 - 1
Application_CBD/applications/control.h

@@ -15,7 +15,7 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define LAMP_EN          0              //李新3灯管:0关闭,1打开
-#define SENSOR_EN        0              //温湿度:0关闭,1打开
+#define SENSOR_EN        1              //温湿度:0关闭,1打开
 #define ROBOT_EN         0              //机器人
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1

+ 14 - 2
Application_CBD/applications/dtu_uart2.c

@@ -56,7 +56,7 @@ static int DTU_uart2_init(void)
         dtuserial  = rt_device_find(DTU_UART_NAME);
         /*修改串口配置参数*/
         dtuconfig.baud_rate = BAUD_RATE_115200;  //修改波特率9600
-        dtuconfig.data_bits = DATA_BITS_8;     //数据位8
+        dtuconfig.data_bits = DATA_BITS_8;     //数据位8c
         dtuconfig.stop_bits = STOP_BITS_1;     //停止位1
         dtuconfig.bufsz = 512;                 //缓冲区1k
         dtuconfig.parity = PARITY_NONE;        //奇校验
@@ -636,6 +636,7 @@ void parseDtu(char *json_string)
     cJSON* hum = NULL;
     cJSON* tmp = NULL;
     cJSON* link_sta = NULL;
+    cJSON* value_commn= NULL;
     rt_kprintf("%s\n",json_string);
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
@@ -653,7 +654,8 @@ void parseDtu(char *json_string)
           {
               if(strstr(item_cmd->valuestring,"takephoto")!=RT_NULL)
               {
-                  HK_TakePhoto();
+                  //HK_TakePhoto();
+                  device_status.photo_ws=1;
                   char *photo = makeJson_Warn("takephoto","control");
                   DTU_Write("%s",photo);
                   rt_free(photo);
@@ -861,7 +863,17 @@ void parseDtu(char *json_string)
                   mqttcfg2 = cJSON_GetObjectItem(item_ext,"mqttcfg2");
                   link_sta = cJSON_GetObjectItem(item_ext,"link_sta");
                   //如果DTU的IMEI和FLash中的不一样,保存到FLASH
+                  value_commn = cJSON_GetObjectItem(item_ext,"photo_sta");
+                  if(value_commn!=RT_NULL)
+                  {
+                      HMI_WRITE("menu.eth1_sta.val=%d",atoi(value_commn->valuestring));
+                  }
+                  value_commn = cJSON_GetObjectItem(item_ext,"cpu_tmp");
+                  if(value_commn!=RT_NULL)
+                  {
+                      HMI_WRITE("menu.cpu_temp.txt=\"%d.%d℃\"",atoi(value_commn->valuestring)/1000,atoi(value_commn->valuestring)%1000);
 
+                  }
                   if(strstr(device_status.imei,imei->valuestring)==RT_NULL)
                   {
                        rt_kprintf("Change IMEI:new:%s-old:%s",imei->valuestring,device_status.imei);

+ 67 - 27
Application_CBD/applications/hmi.c

@@ -175,6 +175,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         rt_free(readinfo);
         device_status.refresh_num--;
         device_status.refresh_timeout++;
+        if(device_status.version_type!=6)
+        {
         HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
         if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
         {
@@ -240,8 +242,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
         //更新加热状态
         HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
-        //更新熄屏时间
-        HMI_WRITE("thsp=%d",device_status.thsp);
+
         //更新密码
         static char pwd_char[10];
         //整型转字符串
@@ -260,11 +261,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
         //ID
         HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
-        HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
+        //HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
         //数据上传间隔
         HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
         //语音音量
         HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
+        //更新熄屏时间
+        HMI_WRITE("thsp=%d",device_status.thsp);
+        }
         //更新联网状态
         if(atoi(device_status.net)==1)
         {
@@ -281,19 +285,42 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             HMI_WRITE("workSta.net.val=2");
         }
         /**********************************吸虫塔*********************************/
-        //更新电压
-        HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
-        //更新震动时间
-        HMI_WRITE("menu.shake_sec.val=%d",device_status.shake_sec);
-        //更新电流
-         HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
-        //更新温湿度数据
-        HMI_WRITE("menu.envHum.val=%d",atoi(device_status.humidity));
-        HMI_WRITE("menu.envTem.val=%d",atoi(device_status.tempture));
-        //SIM卡状态
-        HMI_WRITE("menu.bt0.val=%d",atoi(device_status.sim));
-        //数据上传间隔
-        HMI_WRITE("menu.datt.val=%d",device_status.dattim);
+        if(device_status.version_type==6)
+        {
+            HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
+            //更新电压
+            HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
+            //工作状态
+            HMI_WRITE("menu.worksta.val=%d",device_status.work_status);
+            //网卡0状态
+            HMI_WRITE("menu.eth0_sta.val=%d",device_status.link_sta);
+            //更新电流
+             HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
+            //更新温湿度数据
+            HMI_WRITE("menu.envHum.txt=\"%s%RH\"",device_status.humidity);
+            HMI_WRITE("menu.envTem.txt=\"%s℃\"",device_status.tempture);
+            HMI_WRITE("uploadSet.st.val=%d",device_status.startBar);
+            HMI_WRITE("uploadSet.et.val=%d",device_status.stopBar);
+            HMI_WRITE("menu.board_temp.txt=\"%d.%d℃\"",Get_Temprate()/100,Get_Temprate()%100);
+            //数据上传间隔
+            HMI_WRITE("menu.datt.val=%d",device_status.dattim);
+            //SIM卡状态
+            HMI_WRITE("menu.bt0.val=%d",atoi(device_status.sim));
+            //更新震动时间
+            HMI_WRITE("menu.shake_sec.val=%d",device_status.shake_sec);
+            //校准屏幕的RTC
+            HMI_WRITE("rtc0=%d",tm.tm_year+1900);
+            HMI_WRITE("rtc1=%d",tm.tm_mon+1);
+            HMI_WRITE("rtc2=%d",tm.tm_mday);
+            HMI_WRITE("rtc3=%d",tm.tm_hour+8);
+            HMI_WRITE("rtc4=%d",tm.tm_min);
+            HMI_WRITE("rtc5=%d",tm.tm_sec);
+
+            //更新熄屏时间
+            HMI_WRITE("thsp=%d",device_status.thsp);
+        }
+
+
         /**********************************************************************/
     }
     else if (strstr(rx_buffer,"getClockData")!=NULL) {
@@ -417,11 +444,18 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         var=strstr(rx_buffer,"=");
         var++;
         strncpy(value_str,var,2);
-        if(atoi(value_str) > 0 && atoi(value_str) <12)
+        if(atoi(value_str) > 0 && atoi(value_str) <60)
         {
             #if LAMP_EN == 0
+            if(device_status.version_type!=6)
+            {
             device_status.sunBar=atoi(value_str);
             ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
+            }
+            else {
+                device_status.shake_sec = atoi(value_str);
+                ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
+            }
             #else
             rt_kprintf("光控定时设置失败!!!,三光源模式!!\n");
             #endif
@@ -461,7 +495,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         }
         memset(value_str,0,sizeof(value_str));
         //
-        strncpy(value_str,var+7,2);
+        strncpy(value_str,var+6,2);
         if(atoi(value_str) >= 0 && atoi(value_str) <= 1)
         {
             #if LAMP_EN == 0
@@ -470,10 +504,19 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             #endif
         }
         else {
-            rt_kprintf("参数设置异常(模式):%d!!!",atoi(value_str));
+            if(device_status.version_type==6)
+            {
+                device_status.timeSwitch=1;
+                device_status.dattim=atoi(value_str);
+                ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
+                ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
+            }
+            else {
+                rt_kprintf("参数设置异常(模式):%d!!!",atoi(value_str));
+            }
         }
         //2022/06/23,add:
-        rt_sprintf(device_status.json_w_clock,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%04d-%02d-%02d %02d:%02d:%02d",device_status.startBar,device_status.stopBar,device_status.timeSwitch,tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
+        rt_sprintf(device_status.json_w_clock,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%s",device_status.startBar,device_status.stopBar,device_status.timeSwitch,device_status.stamp);
         json_temp = makeJson_Warn(device_status.json_w_clock, "修改工作时间");
         ef_set_env_blob("json_w_clock", &device_status.json_w_clock, sizeof(device_status.json_w_clock));   //将修改屏幕参数操作记录保存到Flash中
         if(atoi(device_status.net)==0)
@@ -615,7 +658,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             rt_thread_delay(1000);
         }
         //2022/06/23,add:
-        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:8.136.98.49,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
+        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:8.136.98.49,操作时间:%s",device_status.stamp);
         json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
         ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform));   //将修改屏幕参数操作记录保存到Flash中
         if(atoi(device_status.net)==0)
@@ -842,17 +885,12 @@ static void Ctr_Mortor_entry(void* parameter)
         time(&time_reset12V);
         static struct tm alarm_reset12V;
         alarm_reset12V =*localtime(&time_reset12V);
-        if((alarm_reset12V.tm_hour)==5&&(alarm_reset12V.tm_min==59)&&(alarm_reset12V.tm_sec==55))
+        if((alarm_reset12V.tm_hour)==7&&(alarm_reset12V.tm_min==19)&&(alarm_reset12V.tm_sec==50))
         {
             ctr_RTU_DTU(OFF);
             rt_thread_delay(1000*10);
             ctr_RTU_DTU(ON);
         }
-        else if ((alarm_reset12V.tm_hour)==6&&(alarm_reset12V.tm_min==01)&&(alarm_reset12V.tm_sec==30)) {
-            ctr_RTU_DTU(OFF);
-            rt_thread_delay(1000*10);
-            ctr_RTU_DTU(ON);
-        }
         else if((alarm_reset12V.tm_hour)==0&&(alarm_reset12V.tm_min==0)&&(alarm_reset12V.tm_sec==0))
         {
             rtc_err_cnt ++;
@@ -1256,6 +1294,7 @@ void Check_ParamConfig(void)
         }
         if(device_status.version_type==6) device_status.timeSwitch = 1;
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
+        rt_thread_delay(1000);
 #endif
     }
 }
@@ -1290,6 +1329,7 @@ void ResetParamDefault(void)
     ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));    //震动时间
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
     ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
+    HMI_WRITE("play %d,%d,%d",1,5,0);
     DTU_Write("reset.mp3");
     rt_thread_delay(1000);
 }

+ 24 - 1
Application_CBD/applications/sht30_collect.c

@@ -31,6 +31,7 @@
 #define ADC_DEV_CHANNLE_3 11    /*光控*/
 #define ADC_DEV_CHANNLE_4 12    /*加热仓温度*/
 #define ADC_DEV_CHANNLE_5 13    /*保险丝之后的电压*/
+#define ADC_DEV_CHANNLE_6 16    /*内部温度传感器*/
 #define REFER_VOLTAGE       330         /* 参考电压 3.3V,数据精度乘以100保留2位小数*/
 #define CONVERT_BITS        (1<<12)     /* 转换位数为12位 */
 static char send_buf[64];
@@ -42,7 +43,7 @@ extern Device_Status_typedef device_status;
 rt_device_t serial_485;   /*串口设备句柄*/
 struct  serial_configure uart_config_485 = RT_SERIAL_CONFIG_DEFAULT;  /*初始化配置参数*/
 
-rt_uint32_t adc0_value,adc1_value,in_adc_17,adc13_value;
+rt_uint32_t adc0_value,adc1_value,in_adc_17,adc13_value,adc16_value;
 rt_uint32_t adc10_rain,adc11_light,adc12_ntc;
 int8_t hum_value,tem_value;
 
@@ -308,6 +309,28 @@ int Read_Light_Voltage(void)
        rt_kprintf("read light value:%d\n",adc10_rain);
        return adc10_rain;
 }
+//获取内部温度传感器值
+short Get_Temprate(void)
+{
+   short result;
+   double temperate;
+   rt_adc_device_t adc_dev;    /*ADC设备句柄*/
+   adc_dev = (rt_adc_device_t)rt_device_find(ADC_DEV_NAME);
+   if (adc_dev == RT_NULL)
+   {
+      rt_kprintf("adc sample run failed! can't find %s device!\n", ADC_DEV_NAME);
+      return RT_ERROR;// adc 采样值不可能为负值,返回负值表示出错
+   }
+   HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
+   rt_adc_enable(adc_dev, ADC_DEV_CHANNLE_6);
+   adc16_value = rt_adc_read(adc_dev, ADC_DEV_CHANNLE_6);
+   /* 关闭通道 */
+   rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_6);
+   temperate = (float)adc16_value*(3.3/4096);       //电压值
+   temperate = (1.43-temperate)/0.0043+25;   //转换为温度值
+   result = temperate*=100;                  //扩大100倍.
+   return  result;
+}
 /**
  * Rv:  热敏电阻当前阻值
  * B:   热敏电阻参数B值

+ 1 - 0
Application_CBD/applications/sht30_collect.h

@@ -25,6 +25,7 @@ int Read_Light_Voltage(void);
 int sht30_collect(void);
 int Read_Ntc_Voltage(void);
 int TempCalculate(float Rv,int B,int BasicRx);
+short Get_Temprate(void);
 unsigned int filter_Mid(int adc_return);
 unsigned int filter_voltage(void);
 #endif /* APPLICATIONS_INC_SHT30_COLLECT_H_ */

+ 1 - 1
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -74,7 +74,7 @@ static void send_thread_entry(void *parameter)
         if (error_code != 0)
         {
             error_count++;
-            if(error_count == 60)
+            if(error_count == 10)
             {
                 error_count = 0;
                 device_status.sensor_485_sta = 0;