yf_zjb 4 лет назад
Родитель
Сommit
4d0387f7c8

+ 1 - 1
Application_BZY/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="924337005546778817" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="924606094239392605" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="879664238935825593" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="879933327628439381" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 76 - 11
Application_CBD/applications/control.c

@@ -34,6 +34,31 @@ Device_Status_typedef device_status;
 rt_thread_t tid_workloop = RT_NULL;
 rt_thread_t tid_wkstc = RT_NULL;
 rt_thread_t tid_ctr = RT_NULL;
+/**************************1.0定制2000W*************************************/
+uint8_t ctr_Fan_PUT(uint8_t status_ws)
+{
+    rt_pin_mode(FAN_P, PIN_MODE_OUTPUT);
+    if(status_ws==ON)
+    {
+        rt_pin_write(FAN_P,ON);
+    }
+    else {
+        rt_pin_write(FAN_P, OFF);
+    }
+    return 0;
+}
+uint8_t ctr_Fan_IN(uint8_t status_ws)
+{
+    rt_pin_mode(FAN_I, PIN_MODE_OUTPUT);
+    if(status_ws==ON)
+    {
+        rt_pin_write(FAN_I,ON);
+    }
+    else {
+        rt_pin_write(FAN_I, OFF);
+    }
+    return 0;
+}
 /*************************吸虫塔*********************************/
 //吸虫电机
 uint8_t ctr_Motor_xichong(uint8_t status_ws)
@@ -436,7 +461,7 @@ uint8_t ctr_clear(uint16_t status_clear)
         if(clear_num>=status_clear||atoi(device_status.power)>2000||(Read_Real_Voltage()/100)<12)
         {
             rt_kprintf("Clear Motor ERR:%d",atoi(device_status.power));
-            DTU_Write("%s",makeJson_Warn("Clear Motor ERR","device"));
+            //DTU_Write("%s",makeJson_Warn("Clear Motor ERR","device"));
             #if PWM_EN == 0
                 rt_pin_write(CLEAR_R,ON);
                 rt_pin_write(CLEAR_L,ON);
@@ -471,7 +496,7 @@ uint8_t ctr_clear(uint16_t status_clear)
         if(clear_num>=status_clear||atoi(device_status.power)>2000||(Read_Real_Voltage()/100)<12)
         {
             rt_kprintf("Clear Motor ERR:%d",atoi(device_status.power));
-            DTU_Write("%s",makeJson_Warn("Clear Motor ERR","device"));
+            //DTU_Write("%s",makeJson_Warn("Clear Motor ERR","device"));
             #if PWM_EN == 0
                 rt_pin_write(CLEAR_R,ON);
                 rt_pin_write(CLEAR_L,ON);
@@ -525,7 +550,7 @@ uint8_t ctr_clear(uint16_t status_clear)
         {
             rt_kprintf("Clear Motor ERR:%d",atoi(device_status.power));
             char * Clear_ERR = makeJson_Warn("Clear Motor ERR","device");
-            DTU_Write("%s",Clear_ERR);
+            //DTU_Write("%s",Clear_ERR);
             #if PWM_EN == 0
                 rt_pin_write(CLEAR_R,ON);
                 rt_pin_write(CLEAR_L,ON);
@@ -569,7 +594,7 @@ uint8_t ctr_clear(uint16_t status_clear)
         {
             rt_kprintf("Clear Motor Limit Not Access:%d",atoi(device_status.power));
             char * Clear_ERR = makeJson_Warn("Clear Motor Limit Not Access","device");
-            DTU_Write("%s",Clear_ERR);
+            //DTU_Write("%s",Clear_ERR);
             rt_free(Clear_ERR);
         }
         return 0;
@@ -594,23 +619,25 @@ uint8_t ctr_clear(uint16_t status_clear)
 void ctr_router(uint8_t status_router)
 {
     rt_pin_mode(ROUTER, PIN_MODE_OUTPUT);
+    if(device_status.version_type==6)
     rt_pin_mode(ROUTER_P,PIN_MODE_OUTPUT);
 
-
     //rt_pin_mode(POWER_CLEAR, PIN_MODE_OUTPUT);
     if(status_router==ON)
     {
         rt_pin_write(ROUTER,ON);
-        //if(device_status.version_type==6)
+        //
         #if LAMP_EN == 0
-        rt_pin_write(ROUTER_P,ON);
+        if(device_status.version_type==6)
+            rt_pin_write(ROUTER_P,ON);
         #endif
     }
     else {
         rt_pin_write(ROUTER,OFF);
-        //if(device_status.version_type==6)
+        //
         #if LAMP_EN == 0
-        rt_pin_write(ROUTER_P,OFF);
+        if(device_status.version_type==6)
+            rt_pin_write(ROUTER_P,OFF);
         #endif
     }
 }
@@ -698,10 +725,14 @@ void ctr_RTU_DTU(uint8_t status_rtu)
 void Hk_Take_io(void)
 {
     rt_pin_mode(HK_TAKE, PIN_MODE_OUTPUT);
+    rt_pin_mode(HK_IO, PIN_MODE_OUTPUT);
     rt_pin_write(HK_TAKE, 1);
+    rt_pin_write(HK_IO, 0);
     Beep_Tip(1000);
     rt_pin_write(HK_TAKE, 0);
+    rt_pin_write(HK_IO, 1);
 }
+
 void calorstat(uint16_t heat_time)
 {
     uint8_t heat_up_cnt = 0;
@@ -772,7 +803,7 @@ void calorstat(uint16_t heat_time)
         rt_kprintf("=======正在加热======:%d-%d\n",n,heat_time);
     }
     ctr_Heat(OFF);
-    UpLoad_Data();      //加热结束的数据
+    //UpLoad_Data();      //加热结束的数据
 }
 //初始化所有控制驱动,关闭
 void HardWare_Init(uint8_t boot)
@@ -933,6 +964,10 @@ void ResetInit(void)
                rt_kprintf("异常退出!!!\n");
                return;
            }
+            #if LAMP_EN == 0
+            ctr_Fan_PUT(OFF);
+            ctr_Fan_IN(OFF);
+            #endif
            if(device_status.version_type==4||device_status.version_type==41)
            {
 //               if(ctr_clear(650)==0)
@@ -1163,7 +1198,13 @@ void WorkTask(void)
     while(device_status.work_status==1&&device_status.temp_status==0&&device_status.bat_status==0&&device_status.rain_status==0&&device_status.ds==1)
     {
         device_status.work_done = 0;
-        if(clt_time==0)    DTU_Write("workstart.mp3");
+        if(clt_time==0)
+        {
+            #if LAMP_EN == 0
+            ctr_Fan_PUT(ON);
+            #endif
+            DTU_Write("workstart.mp3");
+        }
         //1.打开灯管
         #if LAMP_EN == 1
         if(device_status.lamp_status==1)
@@ -1194,10 +1235,18 @@ void WorkTask(void)
             device_status.ctr_up_motor = 1;
             //3.收集
             clt_time = device_status.clt_time * 60;
+
             while(clt_time!=1)
             {
+                #if LAMP_EN == 0
+                    ctr_Fan_IN(ON);
+                #endif
                 clt_time --;
                 rt_thread_delay(1000);
+                #if LAMP_EN == 0
+                    if(clt_time%30==0)
+                    ctr_Fan_PUT(OFF);
+                #endif
                 rt_kprintf("正在收集.....剩余时间:%d分-%d秒\n",device_status.clt_time,clt_time);
                 //如果触发异常
                 if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
@@ -1207,6 +1256,9 @@ void WorkTask(void)
                     ctr_lamp(OFF,2);
                     ctr_lamp(OFF,3);
                     #endif
+                    #if LAMP_EN == 0
+                    ctr_Fan_IN(OFF);
+                    #endif
                     rt_kprintf("异常退出!!!\n");
                     break;
                 }
@@ -1217,6 +1269,9 @@ void WorkTask(void)
                     ctr_lamp(OFF,2);
                     ctr_lamp(OFF,3);
                     #endif
+                    #if LAMP_EN == 0
+                    ctr_Fan_IN(OFF);
+                    #endif
                     rt_kprintf("异常退出!!!\n");
                     break;
                 }
@@ -1229,6 +1284,9 @@ void WorkTask(void)
                 ctr_lamp(OFF,2);
                 ctr_lamp(OFF,3);
                 #endif
+                #if LAMP_EN == 0
+                ctr_Fan_IN(OFF);
+                #endif
                 rt_kprintf("异常退出!!!\n");
                 break;
             }
@@ -1239,9 +1297,15 @@ void WorkTask(void)
                 ctr_lamp(OFF,2);
                 ctr_lamp(OFF,3);
                 #endif
+                #if LAMP_EN == 0
+                ctr_Fan_IN(OFF);
+                #endif
                 rt_kprintf("异常退出!!!\n");
                 break;
             }
+            #if LAMP_EN == 0
+            ctr_Fan_IN(OFF);
+            #endif
             //4.关闭上仓门
             device_status.ctr_up_motor = 2;
             rt_kprintf("关闭上仓门!!!\n");
@@ -1323,6 +1387,7 @@ void WorkTask(void)
             DTU_Write("workdone");
             ResetInit();
         }
+
         rt_kprintf("***not work-device status:%d\n",device_status.ds);
 }
 /* 入口函数-工作状态检测 */

+ 15 - 6
Application_CBD/applications/control.h

@@ -15,15 +15,15 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define LAMP_EN          0              //李新3灯管:0关闭,1打开
-#define SENSOR_EN        1              //温湿度:0关闭,1打开
+#define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
-    #define VERSION_HK          "1.(3ledv3).41(HK)" //4.0海康-三色光源
+    #define VERSION_HK          "1.(3ledv4).41(HK)" //4.0海康-三色光源
 #else
-    #define VERSION_HK          "1.44.41(HK)"       //4.0海康
+    #define VERSION_HK          "1.45a.41(HK)"       //4.0海康
 #endif
-#define VERSION_HK_2000W    "1.41.4(2000W)"         //4.0水稻
-#define VERSION_ZP          "1.38.1(ZP)"            //1.0转盘
+#define VERSION_HK_2000W    "1.42.4(2000W)"         //4.0水稻
+#define VERSION_ZP          "1.39.1(ZP)"            //1.0转盘
 #define VERSION_GK          "1.38.1(GK)"            //1.0高空
 #define VERSION_XCT         "1.9.6(HK)"             //吸虫塔-海康
 #define VERSION_V5          "1.2.5(HK)"             //5.0
@@ -104,6 +104,9 @@ typedef struct{
     char fuse_voltage[32];     //保险丝电压
     char iccid[32];            //SIM卡ICCID
     char imei[32];             //IMEI,唯一ID
+    char json_w_clock[128];     //修改时间
+    char json_w_reset[128];     //
+    char json_w_platform[128];  //
     char *power;              //功率
     char *voltage;             //电池电压
 }Device_Status_typedef;
@@ -144,6 +147,7 @@ typedef struct{
 #define RTU_DTU GET_PIN(B,13)
 //海康相机拍照
 #define HK_TAKE GET_PIN(A,11)
+#define HK_IO GET_PIN(B,14)     //备用触发拍照
 //清扫限位
 #define CLEAR_R_LIMIT GET_PIN(C,13)
 #define CLEAR_L_LIMIT GET_PIN(B,9)
@@ -182,12 +186,17 @@ typedef struct{
 void ctr_JD_Clear(void);
 uint8_t ctr_Motor_xichong(uint8_t status_ws);
 uint8_t ctr_Motor_xifu(uint8_t status_ws);
+/*****************************定制4.0-2000W***************************************/
+#define FAN_P   GET_PIN(B,10)
+#define FAN_I   GET_PIN(B,11)
+uint8_t ctr_Fan_IN(uint8_t status_ws);
+uint8_t ctr_Fan_PUT(uint8_t status_ws);
 /***************************************************************/
 /***************************************************************/
 uint8_t ctr_Heat(uint8_t status_heat);          //加热
 uint8_t ctr_cangmen_up(uint8_t status_up);      //上仓门
 uint8_t ctr_cangmen_down(uint8_t status_down);  //下仓门
-uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num);          //镇流器
+uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num);            //镇流器
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec);        //震动
 uint8_t ctr_clear(uint16_t status_clear);       //清扫
 void ctr_TG_Clear(uint16_t clear_timeout);      //清扫2

+ 96 - 32
Application_CBD/applications/dtu_uart2.c

@@ -123,6 +123,7 @@ static void dtu_thread_entry_recv(void *parameter)
         result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 100);
         if(result == RT_EOK)
         {
+            rx_err = 0;
             rx_length =(sizeof(rx_buffer) - 1) > msg.size ?
                     msg.size : sizeof(rx_buffer) - 1;
             rx_length = rt_device_read(msg.dev, 0, &rx_buffer[0], rx_length);
@@ -167,10 +168,14 @@ static void dtu_thread_entry_recv(void *parameter)
                             rt_kprintf("RK3399 transter Error!\n");
                             ctr_photo(OFF);
                         }
+                        else {
+                            ctr_DTU_Power(OFF);
+                        }
                     }
                     else if (rx_err==54100) {
                         rx_err = 0;
                         ctr_photo(ON);
+                        ctr_DTU_Power(ON);
                     }
                }
             //rt_kprintf("%s\n",rx_json_buffer);
@@ -591,9 +596,8 @@ char * makeJson()
 //JSON数据解析
 void parseDtu(char *json_string)
 {
-
     extern int rt_hw_rtc_init(void);
-    uint8_t gps_sta = 0;
+    char* json_s = NULL;
     cJSON* item_cmd = NULL;    //嵌套ext
     cJSON* item_ext = NULL;    //嵌套ext
     cJSON* hst  = NULL; //加热温度
@@ -655,6 +659,27 @@ void parseDtu(char *json_string)
                   rt_free(photo);
                   rt_thread_delay(2000);
               }
+              else if (strstr(item_cmd->valuestring,"json_w_clock")!=RT_NULL) {
+                  rt_kprintf("查询时间配置!\n");
+                  json_s = makeJson_Warn(device_status.json_w_clock, "主动查询");
+                  DTU_Write("%s",json_s);
+                  rt_free(json_s);
+                  rt_thread_delay(1000);
+              }
+              else if (strstr(item_cmd->valuestring,"json_w_reset")!=RT_NULL) {
+                  rt_kprintf("查询重置配置!\n");
+                  json_s = makeJson_Warn(device_status.json_w_reset, "主动查询");
+                  DTU_Write("%s",json_s);
+                  rt_free(json_s);
+                  rt_thread_delay(1000);
+              }
+              else if (strstr(item_cmd->valuestring,"json_w_platform")!=RT_NULL) {
+                  rt_kprintf("查询平台配置!\n");
+                  json_s = makeJson_Warn(device_status.json_w_platform, "主动查询");
+                  DTU_Write("%s",json_s);
+                  rt_free(json_s);
+                  rt_thread_delay(1000);
+              }
               else if (strstr(item_cmd->valuestring,"shake")!=RT_NULL)
               {
                   ctr_shake(ON, 30);
@@ -674,6 +699,14 @@ void parseDtu(char *json_string)
                       rt_thread_delay(5000);
                       ctr_RTU_DTU(ON);
                   }
+                  if(strstr(type->valuestring,"takephoto")!=RT_NULL)
+                  {
+                      HK_TakePhoto();
+                      char *photo = makeJson_Warn("takephoto","control");
+                      DTU_Write("%s",photo);
+                      rt_free(photo);
+                      rt_thread_delay(2000);
+                  }
               }
               //切换平台
               else if (strstr(item_cmd->valuestring,"platform")!=RT_NULL)
@@ -686,7 +719,14 @@ void parseDtu(char *json_string)
                       //给RTU发送切换指令
                       DTU_Write("%s",makeJson_platform("8.136.98.49"));
                       rt_free(makeJson_platform("8.136.98.49"));
-                      rt_thread_delay(2000);
+                      rt_thread_delay(1000);
+                      rt_sprintf(device_status.json_w_platform,"平台操作:切换平台>大数据,操作时间:%s",device_status.stamp);
+                                            json_s = 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)
+                                                DTU_Write("%s",json_s);
+                                            rt_free(json_s);
+                                            rt_thread_delay(1000);
                       MA_save();
                   }
                   else if (strstr(type->valuestring,"120.27.222.26")!=RT_NULL)
@@ -696,7 +736,14 @@ void parseDtu(char *json_string)
                       //给RTU发送切换指令
                       DTU_Write("%s",makeJson_platform("120.27.222.26"));
                       rt_free(makeJson_platform("120.27.222.26"));
-                      rt_thread_delay(2000);
+                      rt_thread_delay(1000);
+                      rt_sprintf(device_status.json_w_platform,"平台操作:切换平台>四情,操作时间:%s",device_status.stamp);
+                      json_s = 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)
+                          DTU_Write("%s",json_s);
+                      rt_free(json_s);
+                      rt_thread_delay(1000);
                       MA_save();
                   }
               }
@@ -847,7 +894,7 @@ void parseDtu(char *json_string)
                       if(atoi(year_s)>2020&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
                       {
                           rt_kprintf("设置时间:%d年%d月%d日\n",atoi(year_s),atoi(month_s),atoi(day_s));
-                          if(atoi(net->valuestring)==0)
+                          if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
                           {
                               if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
                               {
@@ -865,7 +912,7 @@ void parseDtu(char *json_string)
                       if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
                       {
                           rt_kprintf("设置时间:%d时%d分%d秒\n",atoi(hour_s),atoi(min_s),atoi(sec_s));
-                          if(atoi(net->valuestring)==0)
+                          if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
                           {
                               set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
                           }
@@ -921,34 +968,21 @@ void parseDtu(char *json_string)
                       rt_sprintf(device_status.gps,"%s",gps->valuestring);
                       if(atoi(gps->valuestring)!=0)
                       {
-                          if(atoi(lat->valuestring)==-1||atoi(lat->valuestring)==1)
+                          if(strstr(device_status.lat,lat->valuestring)==NULL)
                           {
-                               sprintf(device_status.lat,"%s","34.8088073");
-                               sprintf(device_status.lng,"%s","113.6624298");
-
+                              rt_sprintf(device_status.lat,"%s",lat->valuestring);
+                              rt_sprintf(device_status.lng,"%s",lng->valuestring);
+                              ef_set_env_blob("lat", &device_status.lat, sizeof(device_status.lat));  //Iccid
+                              ef_set_env_blob("lng", &device_status.lng, sizeof(device_status.lng));  //Iccid
                           }
                           else {
-                              if(lat->valuestring!=NULL||lng->valuestring!=NULL){
-                              sprintf(device_status.lat,"%s",lat->valuestring);
-                              sprintf(device_status.lng,"%s",lng->valuestring);
-                              }
-                              else {
-                                  sprintf(device_status.lat,"%s","34.8088073");
-                                  sprintf(device_status.lng,"%s","113.6624298");
-                              }
-                              if(gps_sta==0)
-                              {
-                                  gps_sta = 1;
-                                  ef_set_env_blob("lat", &device_status.lat, sizeof(device_status.lat));  //Iccid
-                                  ef_set_env_blob("lng", &device_status.lng, sizeof(device_status.lng));  //Iccid
-                              }
-                           }
+                              rt_kprintf("经纬度信息同步:lat-%s,lng-%s\n",lat->valuestring,lng->valuestring);
+                        }
 
                       }else if(atoi(gps->valuestring)==0)
                       {
-                              sprintf(device_status.lat,"%s",lat->valuestring);
-                              sprintf(device_status.lng,"%s",lng->valuestring);
-
+                           sprintf(device_status.lat,"%s",lat->valuestring);
+                           sprintf(device_status.lng,"%s",lng->valuestring);
                       }
                   }
                   else {
@@ -958,11 +992,32 @@ void parseDtu(char *json_string)
                           sprintf(device_status.lat,"%s","34.8088073");
                           sprintf(device_status.lng,"%s","113.6624298");
                       }
+                      else {
+                          sprintf(device_status.lat,"%s",lat->valuestring);
+                          sprintf(device_status.lng,"%s",lng->valuestring);
+                    }
                   }
                   sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
                   sprintf(device_status.project,"%s",project->valuestring);
-//                  sprintf(device_status.mqttcfg1,"%s",mqttcfg1->valuestring);
-//                  sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
+                  if(mqttcfg1!=NULL)
+                  {
+                      if(strstr("8.136.98.49",mqttcfg1->valuestring)!=RT_NULL)
+                      {
+                        rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
+                      }
+                      else if (strstr("120.27.222.26",mqttcfg1->valuestring)!=RT_NULL) {
+                        rt_sprintf(device_status.mqttcfg1, "120.27.222.26");
+                      }
+                      else {
+                        rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
+                      }
+                      rt_kprintf("当前平台1:%s\n",mqttcfg1->valuestring);
+                  }
+                  if(mqttcfg2!=NULL)
+                  {
+                      sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
+                      rt_kprintf("当前平台2:%s\n",mqttcfg2->valuestring);
+                  }
                   if( device_status.num_updata==0)
                   {
                       Beep_Tip(100);
@@ -1392,9 +1447,18 @@ void parseDtu(char *json_string)
                                   rt_kprintf("版本类型设置失败参数错误!!!\n");
                             }
                           }
-                          MA_save();
-                          rt_thread_delay(2000);
                           UpLoad_Data();
+                          rt_thread_delay(2000);
+                          //2022/06/23,add:
+                          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_s = 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)
+                              DTU_Write("%s",json_s);
+                          rt_free(json_s);
+                          rt_thread_delay(1000);
+                          MA_save();
+                          rt_thread_delay(1000);
                }
           }
         cJSON_Delete(root);

+ 82 - 16
Application_CBD/applications/hmi.c

@@ -146,15 +146,15 @@ static void Hmi_thread_entry(void *parameter)
 /***************************** 解析从屏幕收到的数据 begin **********************************/
 static void HMI_Decode(char *cmd,uint8_t cmd_len)
 {
-    char  *var=NULL;
+    time_t now = time(RT_NULL);
+    static struct tm tm;
+    gmtime_r(&now, &tm);
+    char *json_temp;
+    char *var=NULL;
     rt_free(var);
     if(device_status.refresh_num==0)  device_status.refresh_num = 10;
     if(strstr(rx_buffer,"getFullData") != NULL){
-        time_t now = time(RT_NULL);
-        static struct tm tm;
-        gmtime_r(&now, &tm);
         char *readinfo =  makeJson_ReadInfo();
-
         if(device_status.refresh_num==5)
         {
             device_status.refresh_num = 15;
@@ -176,7 +176,6 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         device_status.refresh_num--;
         device_status.refresh_timeout++;
         HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
-        rt_kprintf("上传平台为:%s\n",device_status.mqttcfg1);
         if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
         {
             HMI_WRITE("uploadSet.plt.val=%d",RESET);
@@ -469,6 +468,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         else {
             rt_kprintf("参数设置异常(模式):%d!!!",atoi(timeswitch_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);
+        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)
+            DTU_Write("%s",json_temp);
+        rt_free(json_temp);
+        rt_thread_delay(2000);
         MA_save();
         rt_free(var);
         rt_kprintf("工作时间参数已保存:模式-%d,光控时间-%d,时控开始时间-%d,时控结束时间-%d\n",device_status.timeSwitch,device_status.sunBar,device_status.startBar,device_status.stopBar);
@@ -596,9 +603,20 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
         ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
         //给RTU发送切换指令
-        DTU_Write("%s",makeJson_platform("8.136.98.49"));
-        rt_free(makeJson_platform("8.136.98.49"));
-        rt_thread_delay(2000);
+        if(strstr(device_status.project,"DTU_CBD")!=NULL)
+        {
+            DTU_Write("%s",makeJson_platform("8.136.98.49"));
+            rt_free(makeJson_platform("8.136.98.49"));
+            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);
+        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)
+            DTU_Write("%s",json_temp);
+        rt_free(json_temp);
+        rt_thread_delay(1000);
         MA_save();
     }
     else if (strstr(rx_buffer,"120.27.222.26")!=NULL)
@@ -606,22 +624,49 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         rt_sprintf(device_status.mqttcfg1, "120.27.222.26");
         ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
         //给RTU发送切换指令
-        DTU_Write("%s",makeJson_platform("120.27.222.26"));
-        rt_free(makeJson_platform("120.27.222.26"));
-        rt_thread_delay(2000);
+        if(strstr(device_status.project,"DTU_CBD")!=NULL)
+        {
+            DTU_Write("%s",makeJson_platform("120.27.222.26"));
+            rt_free(makeJson_platform("120.27.222.26"));
+            rt_thread_delay(1000);
+        }
+        //2022/06/23,add:
+        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:120.27.222.26,操作时间:%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);
+        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)
+            DTU_Write("%s",json_temp);
+        rt_free(json_temp);
+        rt_thread_delay(1000);
         MA_save();
     }
     //恢复出厂设置电池
     else if (strstr(rx_buffer,"resetdcDefault")!=NULL)
     {
         ResetParamDefault_DC();
-        MA_save();
+        rt_thread_delay(1000);
+        //2022/06/23,add:
+        rt_sprintf(device_status.json_w_reset,"屏幕操作:系统重置:电池供电,操作时间:%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);
+        json_temp = makeJson_Warn(device_status.json_w_reset, "系统重置");
+        ef_set_env_blob("json_w_reset", &device_status.json_w_reset, sizeof(device_status.json_w_reset));   //将修改屏幕参数操作记录保存到Flash中
+        if(atoi(device_status.net)==0)
+            DTU_Write("%s",json_temp);
+        rt_free(json_temp);
+
     }
     //恢复出厂设置-交流
     else if (strstr(rx_buffer,"resetDefault")!=NULL)
     {
         ResetParamDefault();
-        MA_save();
+        rt_thread_delay(1000);
+        //2022/06/23,add:
+        rt_sprintf(device_status.json_w_reset,"屏幕操作:系统重置:交流供电,操作时间:%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);
+        json_temp = makeJson_Warn(device_status.json_w_reset, "系统重置");
+        ef_set_env_blob("json_w_reset", &device_status.json_w_reset, sizeof(device_status.json_w_reset));   //将修改屏幕参数操作记录保存到Flash中
+        if(atoi(device_status.net)==0)
+            DTU_Write("%s",json_temp);
+        rt_free(json_temp);
+
     }
     //获取SIM卡信息
     else if(strstr(rx_buffer,"getSim")!=NULL)
@@ -712,6 +757,18 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 
         }
     }
+    else if (strstr(rx_buffer,"putTest.switchFAN_PU=1")!=NULL) {
+        ctr_Fan_PUT(ON);
+    }
+    else if (strstr(rx_buffer,"putTest.switchFAN_PU=0")!=NULL) {
+        ctr_Fan_PUT(OFF);
+    }
+    else if (strstr(rx_buffer,"putTest.switchFAN_IN=1")!=NULL) {
+        ctr_Fan_IN(ON);
+    }
+    else if (strstr(rx_buffer,"putTest.switchFAN_IN=0")!=NULL) {
+        ctr_Fan_IN(OFF);
+    }
     else if(strstr(rx_buffer,"DisplayPower")!=RT_NULL)
     {
         HMI_WRITE("sysTest.sysTest_power.txt=\"%s\"",device_status.power);
@@ -780,6 +837,11 @@ static void Ctr_Mortor_entry(void* parameter)
             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 ++;
@@ -1057,9 +1119,12 @@ void Check_ParamConfig(void)
         ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),NULL);                                      //开关机状态
         ef_get_env_blob("env_t",&device_status.tempture,sizeof(device_status.tempture),NULL);                       //环境温度
         ef_get_env_blob("env_h",&device_status.humidity,sizeof(device_status.humidity),NULL);                       //环境湿度
+        ef_get_env_blob("json_w_clock",&device_status.json_w_clock,sizeof(device_status.json_w_clock),NULL);        //时间
+        ef_get_env_blob("json_w_reset",&device_status.json_w_reset,sizeof(device_status.json_w_reset),NULL);        //重置
+        ef_get_env_blob("json_w_platform",&device_status.json_w_platform,sizeof(device_status.json_w_platform),NULL);//平台
         ef_get_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type),NULL);        //版本类型
         ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL);                 //BL版本号 进BL的时候存储到FLASH
-        ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL);                 //BL版本号 进BL的时候存储到FLASH
+        ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL);                    //BL版本号 进BL的时候存储到FLASH
         device_status.light_over_tim = device_status.sunBar * 3600;                                                 //光控计数
         device_status.work_done = 0;
         //工作完成标志位
@@ -1143,7 +1208,6 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.sim,"1");
         ctr_router(ON);
         Hmi_Fresh();
-
         Control_clear();
         dtu_data_play();
         sht30_collect();
@@ -1208,6 +1272,7 @@ void ResetParamDefault(void)
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
     ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
     DTU_Write("reset.mp3");
+    rt_thread_delay(1000);
 }
 void ResetParamDefault_DC(void)
 {
@@ -1242,6 +1307,7 @@ void ResetParamDefault_DC(void)
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
     ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
     DTU_Write("reset.mp3");
+    rt_thread_delay(1000);
 }
 //固件备份
 void app_partion_backup(void)

+ 0 - 2
Application_CBD/applications/main.c

@@ -66,9 +66,7 @@ int main(void)
         //开机自检
         HardWare_Check(0);
         //工作状态置位线程
-
         Workstatus_check();
-
         /***************/
         //工作流程
         Work_Loop_Task();

+ 17 - 17
Application_CBD/applications/sht30_collect.c

@@ -196,7 +196,7 @@ static void Power_ReadCheck(void *parameter)
                 device_status.heattem = 25;
             }
         }
-        if(Read_Rain_Voltage()==1)
+        if(Read_Rain_Voltage()>100)
         {
             device_status.rain_status = 1;
             ctr_lamp(OFF,1);
@@ -208,7 +208,7 @@ static void Power_ReadCheck(void *parameter)
             rain_cnt++;
             //雨控消抖,1分钟
             rt_kprintf("rain_cnt:%d-%d\n",rain_cnt,Read_Rain_Voltage());
-            if(rain_cnt==60&&Read_Rain_Voltage()==0)
+            if(rain_cnt==60&&Read_Rain_Voltage()<100)
             {
                 rain_cnt = 0;
                 device_status.rain_status = 0;
@@ -275,21 +275,21 @@ int Read_Fuse_Voltage(void)
 /*读取雨控*/
 int Read_Rain_Voltage(void)
 {
-//    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 采样值不可能为负值,返回负值表示出错
-//    }
-//    rt_adc_enable(adc_dev, ADC_DEV_CHANNLE_3);
-//    adc11_light = rt_adc_read(adc_dev,ADC_DEV_CHANNLE_3);
-//    rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_3);
-//    HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
-//    rt_kprintf("read rain value:%d\n",adc11_light);
-//    return adc11_light;
-    rt_pin_mode(RAIN_PIN,PIN_MODE_INPUT);
-    return rt_pin_read(RAIN_PIN);
+    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 采样值不可能为负值,返回负值表示出错
+    }
+    rt_adc_enable(adc_dev, ADC_DEV_CHANNLE_3);
+    adc11_light = rt_adc_read(adc_dev,ADC_DEV_CHANNLE_3);
+    rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_3);
+    HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
+    //rt_kprintf("read rain value:%d\n",adc11_light);
+    return adc11_light;
+//    rt_pin_mode(RAIN_PIN,PIN_MODE_INPUT);
+//    return rt_pin_read(RAIN_PIN);
 }
 /*读取光控*/
 int Read_Light_Voltage(void)

+ 3 - 0
Application_CBD/packages/EasyFlash-latest/src/ef_fal_port.c

@@ -72,6 +72,9 @@ static const ef_env default_env_set[] = {
         {"driver_bl","0"},//BL版本
         {"platform","8.136.98.49"},//平台
         {"driver_compile","0"},//BL编译时间
+        {"json_w_clock","0"},
+        {"json_w_reset","0"},
+        {"json_w_platform","0"},
 };
 static char log_buf[RT_CONSOLEBUF_SIZE];
 static struct rt_semaphore env_cache_lock;

+ 8 - 0
Application_CBD/readme.md

@@ -1,3 +1,11 @@
+## 2022-07-15更新说明:
+- 1.调整雨控检测方式由脉冲改为ADC
+## 2022-06-24更细说明:
+# #define VERSION_HK          "1.45.41(HK)"       //4.0海康- 
+# define VERSION_HK_2000W    "1.42.4(2000W)"      //4.0水稻
+#define VERSION_ZP          "1.39.1(ZP)"            //1.0转盘
+- 1.增加预警保存与查询功能;
+
 # 2022-05-06更新说明:
 # #define VERSION_HK          "1.44.41(HK)"       //4.0海康- 
 # define VERSION_HK_2000W    "1.41.4(2000W)"         //4.0水稻

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="883483086716157878" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="883752175408771666" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>