yf_zjb пре 5 година
родитељ
комит
63ddaa0c26

+ 1 - 1
Application_BZY/readme.md

@@ -41,7 +41,7 @@ datt 	>dat_f
 v_bat 	>vbat
 work_sta 	>ws
 bat_sta		>batStatus
-on_off	ws
+on_off	ds
 drop_time	shake_sec
 turnon	>rcnt
 ## 2021-03-01

BIN
Application_CBD/Debug/packages/freemodbus-latest/samples/sample_mb_master.o


+ 4 - 3
Application_CBD/applications/control.h

@@ -13,10 +13,10 @@
 #include <board.h>
 
 #include <rtdevice.h>
-#define VERSION_HK "1.9.41(HK)"         //版本
-#define VERSION_ZP "1.9.1(ZP)"         //版本
+#define VERSION_HK "1.10.41(HK)"         //版本
+#define VERSION_ZP "1.10.1(ZP)"         //版本
 
-#define CompileTime "20210409"
+#define CompileTime "20210414"
 
 /*******************************测试任务****************************************/
 /*********************************************************************/
@@ -50,6 +50,7 @@ typedef struct{
     uint8_t vol;            //音量
     uint16_t thsp;          //息屏时间
     uint8_t refresh_num;    //DTU数据刷新时间
+    uint8_t refresh_timeout;//刷新超时时间
     uint8_t sunBar;         //光控定时时间
     uint8_t startBar;       //时控开始时间
     uint8_t stopBar;        //时控结束时间

+ 12 - 17
Application_CBD/applications/dtu_uart2.c

@@ -49,10 +49,10 @@ rt_thread_t dtu_send_data = RT_NULL;
 
 rt_device_t dtuserial;   /*串口设备句柄*/
 struct  serial_configure dtuconfig = RT_SERIAL_CONFIG_DEFAULT;  /*初始化配置参数*/
-static int num_updata = 0;
+static int num_updata = 60;
 
 
-int DTU_uart2_init(void)
+static int DTU_uart2_init(void)
 {
 
         dtuserial  = rt_device_find(DTU_UART_NAME);
@@ -66,7 +66,7 @@ int DTU_uart2_init(void)
         rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
         /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
         rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);
-        return 0;
+        return RT_EOK;
 }
 /*数据发送*/
 void DTU_Write(char *fmt, ...)
@@ -159,9 +159,11 @@ static void dtu_thread_entry_recv(void *parameter)
 /*入口函数-指令发送*/
 static void dtu_thread_entry_send(void *parameter)
 {
+
     static uint8_t dev_sta = 1;//开机置1
     static uint8_t power_sta = 1;//开机置1
     rt_thread_delay(10000);  //20S等待联网
+    if(atoi(device_status.net)==1) num_updata = 0;
     while(1)
     {
                 if(num_updata!=0)
@@ -249,7 +251,7 @@ int dtu_data_play(void)
     /* 如果获得线程控制块,启动这个线程 */
     if (dtu_recv_data != RT_NULL)
         rt_thread_startup(dtu_recv_data);
-    return 0;
+    return RT_EOK;
 }
 char * makeJson_ReadInfo()
 {
@@ -621,7 +623,7 @@ void parseDtu(char *json_string)
             }
               else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
               {
-
+                  device_status.refresh_timeout=0;
                   //driver_4g =  cJSON_GetObjectItem(item_ext,"version");
                   driver_4g = cJSON_GetObjectItem(item_ext,"dver");
                   //project = cJSON_GetObjectItem(item_ext,"project");
@@ -670,7 +672,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(net->valueint==0||atoi(net->valuestring)==0)
+                          if(atoi(net->valuestring)==0)
                           {
                               set_date(atoi(year_s),atoi(month_s),atoi(day_s));
                           }
@@ -682,7 +684,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(net->valueint==0||atoi(net->valuestring)==0)
+                          if(atoi(net->valuestring)==0)
                           {
                               set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
                           }
@@ -785,21 +787,13 @@ void parseDtu(char *json_string)
                               ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));   //开始时间
                               rt_kprintf("开始时间st:%d\n",atoi(st->valuestring));
                           }
-                          else if (atoi(st->valuestring)>=0&&atoi(st->valuestring)<=23&&st!=NULL) {
-                              device_status.startBar = atoi(st->valuestring);
-                              ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));   //开始时间
-                              rt_kprintf("开始时间st:%d\n",atoi(st->valuestring));
-                          }
+
                           if(atoi(et->valuestring)>=0&&atoi(et->valuestring)<=23&&et!=NULL){
                               device_status.stopBar = atoi(et->valuestring);
                               ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));      //结束时间
                               rt_kprintf("结束时间et:%d\n",atoi(et->valuestring));
                           }
-                          else if (atoi(et->valuestring)>=0&&atoi(et->valuestring)<=23&&et!=NULL) {
-                              device_status.stopBar = atoi(et->valuestring);
-                              ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));      //结束时间
-                              rt_kprintf("结束时间et:%d\n",atoi(et->valuestring));
-                          }
+
                           if(atoi(collt->valuestring)>=1&&atoi(collt->valuestring)<=60&&collt!=NULL){
                               device_status.clt_time = atoi(collt->valuestring);
                               ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));      //收集时间
@@ -919,3 +913,4 @@ void UpLoad_Data(void)
     list_mem();
     //播放数据上传中语音
 }
+

+ 0 - 1
Application_CBD/applications/dtu_uart2.h

@@ -23,7 +23,6 @@ typedef struct{
 //{"cmd":"paramconf","ext":{"hst":110,"collt":10,"et":6,"datt":2,"shake_sec":1,"tpl":5,"shake":1,"tph":70,"ts":1,"st":20,"imgres":2,"htim":20,"tt":8}}
 
 //{"cmd":"synchronization","ext":{"year":1,"month":1,"day":0,"hour":25,"min":0,"sec":0,"lat":"113.2056","lng":"21.0596","csq",31,"net",0,"iccid","123135453","imei":"895864646464464"}}
-int DTU_uart2_init(void);
 void DTU_Write(char *fmt, ...);
 int dtu_data_play(void);
 void parseDtu(char *json_string);

+ 45 - 13
Application_CBD/applications/hmi.c

@@ -154,19 +154,26 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         static struct tm tm;
         gmtime_r(&now, &tm);
         char *readinfo =  makeJson_ReadInfo();
+
         if(device_status.refresh_num==5)
         {
-            rt_sprintf(device_status.sim,"1");
-            rt_sprintf(device_status.net,"1");
-            rt_sprintf(device_status.csq,"0");
             device_status.refresh_num = 15;
             DTU_Write("%s",readinfo);
             list_mem();
             device_status.hmi_fresh = 1;
             rt_thread_delay(100);
         }
+        //在解析getinfo中清除超时
+        if(device_status.refresh_timeout==30)
+        {
+              rt_sprintf(device_status.sim,"1");
+              rt_sprintf(device_status.net,"1");
+              rt_sprintf(device_status.csq,"0");
+              device_status.refresh_timeout=0;
+        }
         rt_free(readinfo);
         device_status.refresh_num--;
+        device_status.refresh_timeout++;
         HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
         //HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
         HMI_WRITE("uploadSet.t0.txt=\"%s\"",device_status.mqttcfg2);
@@ -509,7 +516,6 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         {
             rt_kprintf("时间未设置:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
             HMI_WRITE("hardcheck.tip_rtc.txt=%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);
-            HMI_WRITE("hardcheck.p0.pic=%d",71);
         }
     }
     //进入bootloader模式
@@ -794,21 +800,47 @@ void Check_ParamConfig(void)
     }
     rt_kprintf("当前时间:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
     //RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
-    if(tm.tm_year+1900<2021)
-    {
-        device_status.timeSwitch = 0;
-        //保存光控变量
-        ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
-        LOG_E("Time not set:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
-        set_date(2020, 1, 1);
-        set_time(0, 0, 0);
-    }
+
     if(device_status.update_flag==1)
     {
         device_status.update_flag = 0;
         ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
         ymodem_ota(1,0);
     }
+    else {
+
+        //初始化联网状态
+        rt_sprintf(device_status.net,"1");
+        rt_sprintf(device_status.csq,"0");
+        rt_sprintf(device_status.sim,"1");
+        Hmi_Fresh();
+        dtu_data_play();
+        uint16_t connect_num=0;
+        //等待联网,
+        while(atoi(device_status.net)==1)
+        {
+            char *readinfo =  makeJson_ReadInfo();
+            DTU_Write("%s",readinfo);
+            rt_free(readinfo);
+            rt_thread_delay(1000);
+            connect_num++;
+            rt_kprintf("联网中......%d\n",connect_num);
+            //超时时间为3分钟
+            if(connect_num==180)
+            {
+                device_status.timeSwitch = 0;
+                //保存光控变量
+                ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
+                LOG_E("Time not set:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
+                set_date(2020, 1, 1);
+                set_time(0, 0, 0);
+                break;
+            }
+            if(tm.tm_year>=2021)
+            break;
+        }
+
+    }
 }
 void ResetParamDefault(void)
 {

+ 2 - 2
Application_CBD/applications/main.c

@@ -58,7 +58,7 @@ int main(void)
     if(device_status.update_flag==0)
     {
         //屏幕初始化
-        Hmi_Fresh();
+        //Hmi_Fresh();
         //传感器数据采集线程
         sht30_collect();
         mb_master_samlpe();
@@ -71,7 +71,7 @@ int main(void)
         Work_Loop_Task();
         /*******************/
         //数据透传
-        dtu_data_play();
+        //dtu_data_play();
     }
     //看门狗初始化
      wdt_init();

+ 7 - 4
Application_CBD/readme.md

@@ -83,10 +83,13 @@ void ymodem_ota(uint8_t argc, char **argv)
 	sim
 ## 2021-04-09-版本:1.9.41(HK)
 - 数据上传下发字段改为字符串
-
-
-
-
+## 2021-04-12-版本:1.9.41(HK)
+- 开机上传数据时间改为60s
+static int num_updata = 0;
+static int num_updata = 60;
+## 2021-04-14-版本:1.10.41(HK)
+- 屏幕刷新联网状态和CSQ,SIM卡信息等增加超时,30s
+- 开机判断时间增加等待RTU联网成功,超时3分钟,超时切换光控