yf_zjb 5 anni fa
parent
commit
2f421a59f5

+ 7 - 7
Application_CBD/applications/control.h

@@ -14,13 +14,13 @@
 
 #include <rtdevice.h>
 
-#define VERSION_HK          "1.27.41(HK)"           //4.0海康
-#define VERSION_HK_2000W    "1.27.4(2000W)"         //4.0水稻
-#define VERSION_ZP          "1.27.1(ZP)"            //1.0转盘
-#define VERSION_GK          "1.27.1(GK)"            //1.0高空
-#define VERSION_XCT         "1.30.6(HK)"            //吸虫塔-海康
-#define VERSION_V5          "1.27.5(HK)"
-#define CompileTime         "20210930"              //编译时间,每次更新代码修改
+#define VERSION_HK          "1.28.41(HK)"           //4.0海康
+#define VERSION_HK_2000W    "1.28.4(2000W)"         //4.0水稻
+#define VERSION_ZP          "1.28.1(ZP)"            //1.0转盘
+#define VERSION_GK          "1.28.1(GK)"            //1.0高空
+#define VERSION_XCT         "1.31.6(HK)"            //吸虫塔-海康
+#define VERSION_V5          "1.28.5(HK)"
+#define CompileTime         "20211018"              //编译时间,每次更新代码修改
 /*********************************************************************/
 typedef struct{
     uint8_t iSave;          //存储标志位

+ 36 - 10
Application_CBD/applications/dtu_uart2.c

@@ -546,6 +546,7 @@ char * makeJson()
 //JSON数据解析
 void parseDtu(char *json_string)
 {
+    uint8_t gps_sta = 0;
     cJSON* item_cmd = NULL;    //嵌套ext
     cJSON* item_ext = NULL;    //嵌套ext
     cJSON* item_data = NULL;
@@ -700,9 +701,15 @@ void parseDtu(char *json_string)
                   //如果DTU的ICCID和FLash中的不一样,保存到FLASH
                   if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL)
                   {
-                      rt_kprintf("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
-                      rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
-                      ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid));  //Iccid
+                      if(sizeof(iccid->valuestring)==20)
+                      {
+                          rt_kprintf("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
+                          rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
+                          ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid));  //Iccid
+                      }
+                      else {
+                          rt_sprintf(device_status.iccid,"%s","10000000000000000000");
+                    }
                   }
                   else {
                       rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
@@ -783,24 +790,43 @@ void parseDtu(char *json_string)
                       {
                           if(atoi(lat->valuestring)==-1||atoi(lat->valuestring)==1)
                           {
-                              sprintf(device_status.lat,"%s","34.8088073");
-                              sprintf(device_status.lng,"%s","113.6624298");
+                               sprintf(device_status.lat,"%s","34.8088073");
+                               sprintf(device_status.lng,"%s","113.6624298");
+
                           }
                           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
+                              }
+                           }
 
                       }else if(atoi(gps->valuestring)==0)
                       {
-                          sprintf(device_status.lat,"%s","34.8088073");
-                          sprintf(device_status.lng,"%s","113.6624298");
+                          if(sizeof(device_status.lat)<3)
+                          {
+                              sprintf(device_status.lat,"%s","34.8088073");
+                              sprintf(device_status.lng,"%s","113.6624298");
+                          }
                       }
                   }
                   else {
                       rt_sprintf(device_status.gps,"0");
-                      sprintf(device_status.lat,"%s","34.8088073");
-                      sprintf(device_status.lng,"%s","113.6624298");
+                      if(sizeof(device_status.lat)<3)
+                      {
+                          sprintf(device_status.lat,"%s","34.8088073");
+                          sprintf(device_status.lng,"%s","113.6624298");
+                      }
                   }
                   sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
                   sprintf(device_status.project,"%s",project->valuestring);

+ 2 - 0
Application_CBD/applications/hmi.c

@@ -979,6 +979,8 @@ void Check_ParamConfig(void)
         ef_get_env_blob("passWord",&device_status.passWord,sizeof(device_status.passWord),NULL);                    //密码
         ef_get_env_blob("imei",&device_status.imei,sizeof(device_status.imei),NULL);                                 //IMEI
         ef_get_env_blob("iccid",&device_status.iccid,sizeof(device_status.iccid),NULL);                              //ICCID
+        ef_get_env_blob("lat",&device_status.lat,sizeof(device_status.lat),NULL);
+        ef_get_env_blob("lng",&device_status.lng,sizeof(device_status.lng),NULL);
         ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),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

+ 1 - 1
Application_CBD/applications/main.c

@@ -120,7 +120,7 @@ static void idle_hook(void)
     time(&now);
     static struct tm alarm_new;
     alarm_new =*localtime(&now);
-    if((alarm_new.tm_hour)==9&&(alarm_new.tm_min==0)&&(alarm_new.tm_sec==0))
+    if((alarm_new.tm_hour)==6&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==0))
     {
         rt_hw_cpu_reset();
     }

+ 7 - 5
Application_CBD/packages/EasyFlash-latest/src/ef_fal_port.c

@@ -45,11 +45,11 @@ static const ef_env default_env_set[] = {
         {"stop_in_bootloader", "0"},
         {"reboot_time","0"},
         {"iSave","0xAA"},
-        {"startBar","20"},  //
-        {"stopBar","0"},    //
-        {"timeSwitch","1"},//
-        {"sunBar","8"},    //
-        {"jtime","20"},  //加热时间
+        {"startBar","20"},      //
+        {"stopBar","0"},        //
+        {"timeSwitch","1"}, //
+        {"sunBar","8"},     //
+        {"jtime","20"},     //加热时间
         {"stime","20"},     //收集时间
         {"jheat","110"},    //加热温度
         {"thsp","300"},     //熄屏时间
@@ -62,6 +62,8 @@ static const ef_env default_env_set[] = {
         {"dattim","20"},    //数据上传间隔
         {"update_flag","0"}, //升级
         {"imei","0"},       //imei
+        {"lat","0"},
+        {"lng","0"},
         {"iccid","012345678910"},   //iccid
         {"ds","0"},         //
         {"version_type","0"}, //版本类型,1对应1.0,4对应HK

+ 21 - 1
Application_CBD/readme.md

@@ -1,3 +1,23 @@
+#define VERSION_HK          "1.28.41(HK)"           //4.0海康
+#define VERSION_HK_2000W    "1.28.4(2000W)"         //4.0水稻
+#define VERSION_ZP          "1.28.1(ZP)"            //1.0转盘
+#define VERSION_GK          "1.28.1(GK)"            //1.0高空
+#define VERSION_XCT         "1.31.6(HK)"            //吸虫塔-海康
+#define VERSION_V5          "1.28.5(HK)"
+#define CompileTime         "20211018"              //编译时间,每次更新代码修改
+## 更新说明
+- 修复经纬度为空的情况
+- 定时重启修改为6点20
+#define VERSION_HK          "1.28.41(HK)"           //4.0海康
+#define VERSION_HK_2000W    "1.28.4(2000W)"         //4.0水稻
+#define VERSION_ZP          "1.28.1(ZP)"            //1.0转盘
+#define VERSION_GK          "1.28.1(GK)"            //1.0高空
+#define VERSION_XCT         "1.31.6(HK)"            //吸虫塔-海康
+#define VERSION_V5          "1.28.5(HK)"
+#define CompileTime         "20211012"              //编译时间,每次更新代码修改
+## 更新说明
+- 联网成功的第一条经纬度和ICCID保存值Flash,如果联网模块重启获取经纬度失败,则从Flash种读取上传。
+
 #define VERSION_V5 "1.27.5(HK)"            //测报灯5.0-海康
 #define CompileTime "20210930"
 ## 更新说明
@@ -48,7 +68,7 @@
 #define CompileTime "20210924"
 - 修复版本号与版本类型匹配上传的问题
 - 远程修改版本类型
-{"cmd": "paramconf", "ext": {"vt": "4"}
+{"cmd": "paramconf", "ext": {"vt": "4"}}
 ---------------------------------------
 # 2021-09-23-版本:
 #define VERSION_HK  "1.27.41(HK)"           //4.0海康

+ 3 - 2
Application_GK_CBD/applications/control.c

@@ -211,8 +211,9 @@ void ctr_rain_Motor(uint8_t r_m_s)
         {
             check_rlt++;
             rt_thread_delay(20);
-            if(check_rlt==500)  //超时10s
+            if(check_rlt==1000)  //超时10s
             {
+
                 break;
             }
         }
@@ -231,7 +232,7 @@ void ctr_rain_Motor(uint8_t r_m_s)
         {
             check_rlt++;
             rt_thread_delay(20);
-            if(check_rlt==500)  //超时10s
+            if(check_rlt==1000)  //超时10s
             {
                 break;
             }

+ 1 - 1
Application_GK_CBD/applications/control.h

@@ -15,7 +15,7 @@
 #include <rtdevice.h>
 #define VERSION_HK "1.14.41(HK)"         //版本
 #define VERSION_ZP "1.14.1(ZP)"         //版本
-#define VERSION "1.1.3(GK)"
+#define VERSION "1.3.3(GK)"
 
 #define CompileTime "20210917"
 

+ 6 - 6
Application_GK_CBD/applications/hmi.c

@@ -572,8 +572,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 static void Ctr_Mortor_entry(void* parameter)
 {
    rt_uint32_t limit_current = 2000;     //推杆电机限制电流1A
-   static rt_uint16_t num_down_open = 500;  //
-   static rt_uint16_t num_down_close = 500;  //
+   static rt_uint16_t num_down_open = 1500;  //
+   static rt_uint16_t num_down_close = 1500;  //
    static rt_uint16_t photo_led_sec = 300;  //45S
    //上限位
    rt_pin_mode(CTR_UPO_LIMIT,PIN_MODE_INPUT);
@@ -630,13 +630,13 @@ static void Ctr_Mortor_entry(void* parameter)
             if(atoi(device_status.power)>limit_current)
             {
                 ctr_cangmen_down(OFF);
-                num_down_open = 500;
+                num_down_open = 1500;
                 rt_kprintf("*************************下仓门电机打开堵转!!!**********************%d\n",atoi(device_status.power));
             }
             if (num_down_open == 0)
             {
                 ctr_cangmen_down(OFF);
-                num_down_open = 500;
+                num_down_open = 1500;
             }
         }
         else if (device_status.ctr_down_motor == 2)
@@ -652,13 +652,13 @@ static void Ctr_Mortor_entry(void* parameter)
             if(atoi(device_status.power)>limit_current)
             {
                 ctr_cangmen_down(OFF);
-                num_down_close = 500;
+                num_down_close = 1500;
                 rt_kprintf("*************************下仓门电机关闭堵转!!!**********************%d\n",atoi(device_status.power));
             }
             if (num_down_close == 0)
             {
                ctr_cangmen_down(OFF);
-               num_down_close = 500;
+               num_down_close = 1500;
             }
         }
         if(device_status.sun_test==1)

+ 1 - 0
Application_GK_CBD/applications/sht30_collect.c

@@ -193,6 +193,7 @@ static void Power_ReadCheck(void *parameter)
             device_status.rain_status = 1;
             ctr_lamp(OFF);
             device_status.ctr_up_motor =1;    //打开上仓门
+            device_status.ctr_down_motor =1;    //打开下仓门
             rain_cnt = 0;
         }
         else {

+ 3 - 0
Application_GK_CBD/readme.md

@@ -1,3 +1,6 @@
+## 2021-10-15-版本:1.2.3(GK)
+###版本更新:
+- 雨控打开上下舱门
 ## 2021-09-17-版本:1.1.3(GK)
 ###版本更新:
 - 雨控关闭上仓门