yf_zjb před 5 roky
rodič
revize
ce57835510
29 změnil soubory, kde provedl 737 přidání a 455 odebrání
  1. binární
      Application_CBD/.settings/.rtmenus
  2. binární
      Application_CBD/Debug/packages/freemodbus-latest/samples/sample_mb_master.o
  3. 4 3
      Application_CBD/applications/control.c
  4. 13 10
      Application_CBD/applications/control.h
  5. 151 104
      Application_CBD/applications/dtu_uart2.c
  6. 1 1
      Application_CBD/applications/dtu_uart2.h
  7. 81 57
      Application_CBD/applications/hmi.c
  8. 9 2
      Application_CBD/applications/sht30_collect.c
  9. 8 1
      Application_CBD/drivers/board.c
  10. 4 2
      Application_CBD/drivers/drv_flash_f1.c
  11. 29 9
      Application_CBD/readme.md
  12. 80 8
      CBD_FOTA_BootLoader/.config
  13. 82 10
      CBD_FOTA_BootLoader/.config.old
  14. 239 239
      CBD_FOTA_BootLoader/.cproject
  15. binární
      CBD_FOTA_BootLoader/.settings/.rtmenus
  16. 2 2
      CBD_FOTA_BootLoader/applications/main.c
  17. 2 1
      CBD_FOTA_BootLoader/drivers/board.c
  18. 4 2
      CBD_FOTA_BootLoader/drivers/drv_flash_f1.c
  19. 2 1
      CBD_FOTA_BootLoader/libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
  20. 1 1
      CBD_FOTA_BootLoader/packages/fal-v0.5.0/samples/porting/fal_flash_sfud_port.c
  21. 1 1
      CBD_FOTA_BootLoader/packages/fal-v0.5.0/src/fal_flash_stm32f1_port.c
  22. 12 1
      CBD_FOTA_BootLoader/readme.md
  23. binární
      CBD_FOTA_BootLoader/rt-thread/tools/building.pyc
  24. binární
      CBD_FOTA_BootLoader/rt-thread/tools/eclipse.pyc
  25. binární
      CBD_FOTA_BootLoader/rt-thread/tools/menuconfig.pyc
  26. binární
      CBD_FOTA_BootLoader/rt-thread/tools/mkdist.pyc
  27. binární
      CBD_FOTA_BootLoader/rt-thread/tools/utils.pyc
  28. 12 0
      CBD_FOTA_BootLoader/rtconfig.h
  29. binární
      CBD_FOTA_BootLoader/rtconfig.pyc

binární
Application_CBD/.settings/.rtmenus


binární
Application_CBD/Debug/packages/freemodbus-latest/samples/sample_mb_master.o


+ 4 - 3
Application_CBD/applications/control.c

@@ -422,7 +422,7 @@ void calorstat(uint16_t heat_time)
     //恒温模式
     for(n=0;n < heat_time;n++)
     {
-        if(device_status.heattem>device_status.heatvale&&heat_flg==RESET)
+        if(device_status.heattem>device_status.heatvalue&&heat_flg==RESET)
         {
             heat_flg = SET;
             ctr_Heat(OFF);
@@ -436,11 +436,11 @@ void calorstat(uint16_t heat_time)
             //跳出FOR循环
             n = n + 60;
         }
-        if(device_status.heattem < (device_status.heatvale - 5)&&heat_flg == SET)
+        if(device_status.heattem < (device_status.heatvalue - 5)&&heat_flg == SET)
         {
             ctr_Heat(ON);
         }
-        else if (device_status.heattem>device_status.heatvale&&heat_flg==SET)
+        else if (device_status.heattem>device_status.heatvalue&&heat_flg==SET)
         {
             ctr_Heat(OFF);
         }
@@ -529,6 +529,7 @@ void HK_TakePhoto(void)
 {
     //打开补光灯
     ctr_led(ON);
+    DTU_Write("takephoto.mp3");
     //延时
     rt_thread_delay(1000*10);
     rt_kprintf("\n测试拍照!\n");

+ 13 - 10
Application_CBD/applications/control.h

@@ -13,10 +13,10 @@
 #include <board.h>
 
 #include <rtdevice.h>
-#define VERSION_HK "1.5.41(HK)"         //版本
-#define VERSION_ZP "1.5.1(ZP)"         //版本
+#define VERSION_HK "1.8.41(HK)"         //版本
+#define VERSION_ZP "1.8.1(ZP)"         //版本
 
-#define CompileTime "20210324"
+#define CompileTime "20210408"
 
 /*******************************测试任务****************************************/
 /*********************************************************************/
@@ -24,13 +24,18 @@
 typedef struct{
     uint8_t iSave;          //存储标志位
     uint8_t dtype;          //设备类型
+
     uint8_t heat_status;    //加热状态   0-关   1-开
+
     uint8_t lamp_status;    //灯管状态   0-关   1-开
-    uint8_t cold_status;    //灯管状态   0-关   1-开
+
     uint8_t up_status;      //上仓门状态 0-停止 1-打开 2-关闭
+
     uint8_t down_status;    //下仓门状态 0-停止 1-打开 2-关闭
+
     uint8_t clear_status;   //清扫状态   0-停止 1-开始
     uint8_t shake_ws;       //震动       0-关   1-开
+    uint8_t heatvalue;
     uint8_t ctr_up_motor;   //上仓门,    1打开,0关闭
     uint8_t ctr_down_motor; //下仓门,    1打开,0关闭
     uint8_t rain_status;    //雨控              0-正常 1-欠压
@@ -40,12 +45,7 @@ typedef struct{
     uint8_t work_status;    //工作状态   0-待机 1-工作
     uint8_t work_done;      //工作结束   1-正常 0-工作已结束
     uint8_t bat_status;     //电压状态   1-正常 0-欠压
-    uint8_t csq;            //信号强度
-    uint8_t net;            //网络
-    uint8_t sim;            //SIM卡
-    uint8_t sound;          //语音模块
     uint8_t heattime;       //加热时间
-    uint8_t heatvale;       //加热温度
     uint8_t clt_time;       //收集时间
     uint8_t vol;            //音量
     uint16_t thsp;          //息屏时间
@@ -61,7 +61,6 @@ typedef struct{
     uint8_t heattem;        //加热仓温度(实时)
     uint8_t hmi_fresh;      //是否启动屏幕
     uint8_t update_flag;    //是否启动升级
-    uint8_t gps;            //定位类型
     uint8_t photo_type;     //相机类型,0-USB,1-海康,2-大华
     uint8_t version_type;   //版本类型,1-转盘,4-海康
     uint8_t stop_in_bootloader;     //进入bootloader模式 1
@@ -71,6 +70,10 @@ typedef struct{
     rt_uint32_t data_plan;          //流量套餐
     rt_uint32_t expiry_date;        //到期时间
     int passWord;           //初始密码
+    char csq[3];            //信号强度
+    char net[3];            //网络
+    char sim[3];            //SIM卡
+    char gps[3];            //定位类型
     char tempture[12];      //温度
     char humidity[12];      //湿度
     char driver[32];           //版本

+ 151 - 104
Application_CBD/applications/dtu_uart2.c

@@ -47,11 +47,11 @@ rt_thread_t dtu_recv_data = RT_NULL;
 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;
 
+
 int DTU_uart2_init(void)
 {
 
@@ -167,7 +167,7 @@ static void dtu_thread_entry_send(void *parameter)
                 if(num_updata!=0)
                 {
                     num_updata --;
-//                    //屏幕休眠
+//                  //屏幕休眠
                     if(num_updata==(device_status.dattim * 60-10))
                     {
                         HMI_WRITE("sleep=%d",1);
@@ -190,7 +190,7 @@ static void dtu_thread_entry_send(void *parameter)
                     LOG_I("upload data:%s\n",readinfo);
                     if(dev_sta==1)
                     {
-                        DTU_Write("%s",makeJson_Warn("turnon", "dev_sta"));
+                        DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
                         dev_sta = 0;
                         rt_thread_delay(500);
                     }
@@ -207,8 +207,8 @@ static void dtu_thread_entry_send(void *parameter)
                         DTU_Write("%s",res_fuse_warn);
                         rt_free(res_fuse_warn);
                     }
-
                     num_updata = device_status.dattim * 60;
+                    if(device_status.dattim==0) device_status.dattim=20;   //数据上传时间间隔设置为0?
                 }
                 rt_thread_mdelay(1000);
     }
@@ -259,7 +259,7 @@ char * makeJson_ReadInfo()
     {
         return NULL;
     }
-    cJSON_AddStringToObject(rJsonRoot, "cmd", "GetInfo");
+    cJSON_AddStringToObject(rJsonRoot, "uart", "getinfo");
     char * r = cJSON_PrintUnformatted(rJsonRoot);
     if(NULL == r)
     {
@@ -348,6 +348,10 @@ char *makeJson_Warn(char * s,char *t)
 /*生成JSON数据*/
 char * makeJson()
 {
+
+    char utos[4];
+    if(device_status.gps==NULL)
+    rt_sprintf(device_status.gps, "0");
     //如果设备工作并且电流小于500,灯管异常
     if(atoi(device_status.power)<400&&device_status.work_status==1)
     {
@@ -357,7 +361,6 @@ char * makeJson()
     else {
         device_status.lamp_status = 0;
     }
-    device_status.dtype = 3;
     time_t stamp=time(RT_NULL);
     static struct tm tm;
     gmtime_r(&stamp, &tm);
@@ -395,18 +398,31 @@ char * makeJson()
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型
-    cJSON_AddNumberToObject(pSubJson,"dtype",device_status.dtype);          //设备类型
-    cJSON_AddNumberToObject(pSubJson,"tt",device_status.sunBar);            //光控定时
-    cJSON_AddNumberToObject(pSubJson,"shake",device_status.shake_ws);       //震动开关
-    cJSON_AddNumberToObject(pSubJson,"shake_sec",device_status.shake_sec);  //震动时间
-    cJSON_AddNumberToObject(pSubJson,"gps",device_status.gps);              //定位状态
+    //设备类型
+    device_status.dtype=3;
+    rt_sprintf(utos, "%d",device_status.dtype);
+    cJSON_AddStringToObject(pSubJson,"dtype",utos);
+    //光控定时
+    rt_sprintf(utos, "%d",device_status.sunBar);
+    cJSON_AddStringToObject(pSubJson,"tt",utos);
+    //震动开关
+    rt_sprintf(utos, "%d",device_status.shake_ws);
+    cJSON_AddStringToObject(pSubJson,"shake",utos);
+    //震动时间
+    rt_sprintf(utos, "%d",device_status.shake_sec);
+    cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
+    cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
     cJSON_AddNumberToObject(pSubJson,"ws",device_status.work_status);       //工作状态
     cJSON_AddNumberToObject(pSubJson,"ds",device_status.ds);                //工作状态
     cJSON_AddNumberToObject(pSubJson,"ts",device_status.timeSwitch);        //定时模式
-    cJSON_AddNumberToObject(pSubJson,"st",device_status.startBar);          //开始时间
-    cJSON_AddNumberToObject(pSubJson,"et",device_status.stopBar);           //结束时间
-    cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);          //湿度
-    cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);          //温度
+    //开始时间
+    cJSON_AddNumberToObject(pSubJson,"st",device_status.startBar);
+    //结束时间
+    cJSON_AddNumberToObject(pSubJson,"et",device_status.stopBar);
+    //湿度
+    cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
+    //温度
+    cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
     cJSON_AddNumberToObject(pSubJson,"tps",device_status.temp_status);      //温控
     cJSON_AddNumberToObject(pSubJson,"lps",device_status.sun_status);       //光控状态
     cJSON_AddNumberToObject(pSubJson,"rps",device_status.rain_status);      //雨控状态
@@ -415,8 +431,11 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp);          //时间
     cJSON_AddStringToObject(pSubJson,"imei",device_status.imei);            //IMEI
     cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid);          //ICCID
-    cJSON_AddNumberToObject(pSubJson,"upds",device_status.up_status);       //上仓门状态 1-打开,0-关闭-(通道) 打开为落虫,关闭为排水
-    cJSON_AddNumberToObject(pSubJson,"dnds",device_status.down_status);     //下仓门状态 1-打开,0-关闭
+    //上仓门状态 1-打开,0-关闭-(通道) 打开为落虫,关闭为排水
+    cJSON_AddNumberToObject(pSubJson,"upds",device_status.up_status);
+    //下仓门状态 1-打开,0-关闭
+
+    cJSON_AddNumberToObject(pSubJson,"dnds",device_status.down_status);
     //经度
     cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
     //纬度
@@ -436,13 +455,14 @@ char * makeJson()
     //加热状态
     cJSON_AddNumberToObject(pSubJson,"hs",device_status.heat_status);
     //收集时间(参数)
+
     cJSON_AddNumberToObject(pSubJson,"collt",device_status.clt_time);
     //加热时间(参数)
     cJSON_AddNumberToObject(pSubJson,"htim",device_status.heattime);
     //加热温度(参数)
-    cJSON_AddNumberToObject(pSubJson,"hst",device_status.heatvale);
+    cJSON_AddNumberToObject(pSubJson,"hst",device_status.heatvalue);
     //信号强度
-    cJSON_AddNumberToObject(pSubJson,"csq",device_status.csq);
+    cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
     //高温保护
     cJSON_AddNumberToObject(pSubJson,"tph",device_status.tph);
     //低温保护
@@ -488,10 +508,10 @@ void parseDtu(char *json_string)
     cJSON* project = NULL;  //Project
     cJSON* ds = NULL;   //设备状态
     cJSON* vt = NULL;   //版本类型
-    cJSON* account_status = NULL;   //卡状态
-    cJSON* data_plan = NULL;        //套餐
-    cJSON* data_usage = NULL;       //已使用
-    cJSON* expiry_date = NULL;      //到期时间
+//    cJSON* account_status = NULL;   //卡状态
+//    cJSON* data_plan = NULL;        //套餐
+//    cJSON* data_usage = NULL;       //已使用
+//    cJSON* expiry_date = NULL;      //到期时间
     cJSON* mqttcfg1 = NULL;
     cJSON* mqttcfg2 = NULL;
     cJSON* type =NULL;
@@ -584,32 +604,34 @@ void parseDtu(char *json_string)
                   lng = cJSON_GetObjectItem(item_ext,"lng");
                   csq = cJSON_GetObjectItem(item_ext,"csq");
                   net = cJSON_GetObjectItem(item_ext,"net");
+                  sim = cJSON_GetObjectItem(item_ext,"sim");
                   iccid = cJSON_GetObjectItem(item_ext,"iccid");
                   imei = cJSON_GetObjectItem(item_ext,"imei");
                   gps = cJSON_GetObjectItem(item_ext,"gps");
                   mqttcfg1 = cJSON_GetObjectItem(item_ext,"mqttcfg1");
                   mqttcfg2 = cJSON_GetObjectItem(item_ext,"mqttcfg2");
                   //如果DTU的IMEI和FLash中的不一样,保存到FLASH
-                  if(strstr(imei->valuestring,device_status.imei)==RT_NULL)
+                  if(strstr(device_status.imei,imei->valuestring)==RT_NULL)
                   {
                       LOG_W("Change IMEI:new:%s-old:%s",imei->valuestring,device_status.imei);
                       rt_sprintf(device_status.imei, "%s",imei->valuestring);
                       ef_set_env_blob("imei", &device_status.imei, sizeof(device_status.imei));  //IMEI
                   }
-
                   else {
                       rt_sprintf(device_status.imei,"%s",imei->valuestring);
                       LOG_W("IMEI not change:%s-%s",imei->valuestring,device_status.imei);
                  }
                   //如果DTU的ICCID和FLash中的不一样,保存到FLASH
-                  if(strstr(iccid->valuestring,device_status.iccid)==RT_NULL)
+                  if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL)
                   {
                       LOG_W("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
                       rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
-                      ef_set_env_blob("iccid", &iccid->valuestring, sizeof(iccid->valuestring));  //Iccid
-
+                      ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid));  //Iccid
+                  }
+                  else {
+                      rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
+                      LOG_W("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
                   }
-                  sim = cJSON_GetObjectItem(item_ext,"sim");
                   rt_kprintf("DTU时间:%s",datetime->valuestring);
                       char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
                       strncpy(year_s, datetime->valuestring, 4);
@@ -621,7 +643,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)
+                          if(net->valueint==0||atoi(net->valuestring)==0)
                           {
                               set_date(atoi(year_s),atoi(month_s),atoi(day_s));
                           }
@@ -633,7 +655,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)
+                          if(net->valueint==0||atoi(net->valuestring)==0)
                           {
                               set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
                           }
@@ -643,26 +665,41 @@ void parseDtu(char *json_string)
                         }
                       }
                       rt_kprintf("参数同步:\nlat:%s\nlng:%s\n",lat->valuestring,lng->valuestring);
-                  if(sim->valueint==0)
+                  //CSQ
+                  if(csq->valuestring!=NULL&&sizeof(csq->valuestring)<3)
                   {
-                      device_status.sim = 0;
+                      rt_sprintf(device_status.csq,"%s",csq->valuestring);
                   }
-                  else {
-                      device_status.sim = 1;
+                  //NET
+                  if (net!=NULL&&sizeof(net->valuestring)<2)
+                  {
+                      rt_kprintf("网络状态:%s\n",net->valuestring);
+                      rt_sprintf(device_status.net,"%s",net->valuestring);
+                  }
+                  //SIM
+                  if (sim!=NULL&&sizeof(net->valuestring)<2)
+                  {
+                      rt_sprintf(device_status.sim,"%s",sim->valuestring);
                   }
-                  device_status.csq = atoi(csq->valuestring);
-                  device_status.net = net->valueint;
-                  device_status.gps = gps->valueint;
-                  if(gps->valueint!=0&&sizeof(lat->valuestring)>2)
+                  //GPS
+                  if (gps!=NULL&&sizeof(gps->valuestring)<2)
                   {
-                      sprintf(device_status.lat,"%s",lat->valuestring);
-                      sprintf(device_status.lng,"%s",lng->valuestring);
+                      rt_sprintf(device_status.gps,"%s",gps->valuestring);
+                      if(atoi(gps->valuestring)!=0)
+                      {
+                          sprintf(device_status.lat,"%s",lat->valuestring);
+                          sprintf(device_status.lng,"%s",lng->valuestring);
+                      }else if(atoi(gps->valuestring)==0)
+                      {
+                          sprintf(device_status.lat,"%s","34.8088073");
+                          sprintf(device_status.lng,"%s","113.6624298");
+                      }
                   }
-                  else if(gps->valueint==0||sizeof(lat->valuestring)<2) {
+                  else {
+                      rt_sprintf(device_status.gps,"0");
                       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);
                   sprintf(device_status.mqttcfg1,"%s",mqttcfg1->valuestring);
@@ -682,9 +719,7 @@ void parseDtu(char *json_string)
                           rt_thread_delay(2000);
                           UpLoad_Data();
                       }
-
                   }
-
                   device_status.hmi_fresh = 0;
               }
               if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
@@ -703,61 +738,71 @@ void parseDtu(char *json_string)
                           htim = cJSON_GetObjectItem(item_ext,"htim");
                           ds = cJSON_GetObjectItem(item_ext,"ds");
                           vt = cJSON_GetObjectItem(item_ext,"vt");
-                          if(hst->valueint>10&&hst->valueint<150&&hst!=NULL)
+                          if(atoi(hst->valuestring)>10&&atoi(hst->valuestring)<150&&hst!=NULL)
                           {
-                              device_status.heatvale = hst->valueint;
-                              ef_set_env_blob("jheat", &device_status.heatvale, sizeof(device_status.heatvale));      //加热温度
-                              rt_kprintf("加热温度hst:%d\n",hst->valueint);
+                              device_status.heatvalue=atoi(hst->valuestring);
+                              ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));      //加热温度
+                              rt_kprintf("加热温度hst:%d\n",atoi(hst->valuestring));
                           }
                           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));
                           }
+                          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));
                           }
-                          if(collt->valueint>=1&&collt->valueint<=60&&collt!=NULL){
-                              device_status.clt_time = collt->valueint;
+                          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));      //收集时间
-                              rt_kprintf("收集时间collt:%d\n",collt->valueint);
+                              rt_kprintf("收集时间collt:%d\n",atoi(collt->valuestring));
                           }
-                          if(datt->valueint>=1&&datt->valueint<=60&&datt!=NULL)
+                          if(atoi(datt->valuestring)>=1&&atoi(datt->valuestring)<=60&&datt!=NULL)
                           {
-                              device_status.dattim = datt->valueint;
+                              device_status.dattim = atoi(datt->valuestring);
                               ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
-                              rt_kprintf("数据上传间隔datt:%d\n",datt->valueint);
+                              rt_kprintf("数据上传间隔datt:%d\n",atoi(datt->valuestring));
                           }
-                          if(shake_sec->valueint>=1&&shake_sec->valueint<=10&&shake_sec!=NULL)
+                          if(atoi(shake_sec->valuestring)>=1&&atoi(shake_sec->valuestring)<=10&&shake_sec!=NULL)
                           {
-                              device_status.shake_sec = shake_sec->valueint;
+                              device_status.shake_sec = atoi(shake_sec->valuestring);
                               ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));      //震动时间
-                              rt_kprintf("震动时间shake_sec:%d\n",shake_sec->valueint);
+                              rt_kprintf("震动时间shake_sec:%d\n",atoi(shake_sec->valuestring));
                           }
-                          if((shake->valueint==0||shake->valueint==1)&&shake!=NULL)
+                          if((atoi(shake->valuestring)==0||atoi(shake->valuestring)==1)&&shake!=NULL)
                           {
-                              device_status.shake_ws = shake->valueint;
+                              device_status.shake_ws = atoi(shake->valuestring);
                               ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));      //震动开关
-                              rt_kprintf("震动开关shake:%d\n",shake->valueint);
+                              rt_kprintf("震动开关shake:%d\n",atoi(shake->valuestring));
                           }
-                          if(tt->valueint>=1&&tt->valueint<=10&&tt!=NULL)
+                          if(atoi(tt->valuestring)>=1&&atoi(tt->valuestring)<=10&&tt!=NULL)
                           {
 
-                              device_status.sunBar = tt->valueint;
+                              device_status.sunBar = atoi(tt->valuestring);
                               ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));         //光控定时
-                              rt_kprintf("光控定时tt:%d\n",tt->valueint);
+                              rt_kprintf("光控定时tt:%d\n",atoi(tt->valuestring));
                           }
-                          if(htim->valueint>=1&&htim->valueint<=30&&htim!=NULL)
+                          if(atoi(htim->valuestring)>=1&&atoi(htim->valuestring)<=30&&htim!=NULL)
                           {
-                              device_status.heattime = htim -> valueint;
+                              device_status.heattime = atoi(htim->valuestring);
                               ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));      //加热时间
-                              rt_kprintf("加热时长htim:%d\n",htim->valueint);
+                              rt_kprintf("加热时长htim:%d\n",atoi(htim->valuestring));
                           }
-                          if((ts->valueint==0||ts->valueint==1)&&ts!=NULL)
+                          if((atoi(ts->valuestring)==0||atoi(ts->valuestring)==1)&&ts!=NULL)
                           {
-                              device_status.timeSwitch = ts->valueint;
+                              device_status.timeSwitch = atoi(ts->valuestring);
                               ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch)); //工作模式
                               time_t now;
                               time(&now);
@@ -767,31 +812,31 @@ void parseDtu(char *json_string)
                               static rt_uint32_t nowstamp_num = 0;
                               nowstamp_num = mktime(&nowstamp);
                               device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
-                              rt_kprintf("定时模式ts:%d\n",ts->valueint);
+                              rt_kprintf("定时模式ts:%d\n",atoi(ts->valuestring));
                           }
-                          if(tpl ->valueint>=-50&&tpl ->valueint<=50&&tpl!=NULL)
+                          if(atoi(tpl->valuestring)>=-50&&atoi(tpl->valuestring)<=50&&tpl!=NULL)
                           {
-                              device_status.tpl = tpl ->valueint;
+                              device_status.tpl = atoi(tpl->valuestring);
                               ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl)); //低温保护
-                              rt_kprintf("低温保护tpl:%d\n",tpl->valueint);
+                              rt_kprintf("低温保护tpl:%d\n",atoi(tpl->valuestring));
                           }
-                          if(tph ->valueint>=50&&tph ->valueint<=80&&tph!=NULL)
+                          if(atoi(tph->valuestring)>=50&&atoi(tpl->valuestring)<=80&&tph!=NULL)
                           {
-                              device_status.tph = tph ->valueint;
+                              device_status.tph = atoi(tph->valuestring);
                               ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph)); //高温保护
-                              rt_kprintf("高温保护tph:%d\n",tph->valueint);
+                              rt_kprintf("高温保护tph:%d\n",atoi(tph->valuestring));
                           }
-                          if(ds ->valueint>=0&&ds->valueint <=1&&ds!=NULL)
+                          if(atoi(ds->valuestring)>=0&&atoi(ds->valuestring) <=1&&ds!=NULL)
                           {
-                              device_status.ds = ds ->valueint;
+                              device_status.ds = atoi(ds->valuestring);
                               ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
-                              rt_kprintf("开关机状态:%d\n",ds->valueint);
+                              rt_kprintf("开关机状态:%d\n",atoi(ds->valuestring));
                           }
-                          if(vt->valueint>=0&&vt->valueint<=10&&vt!=NULL)
+                          if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=10&&vt!=NULL)
                           {
-                              device_status.version_type = vt->valueint;
+                              device_status.version_type = atoi(vt->valuestring);
                               ef_set_env_blob("version_type", &device_status.version_type, sizeof(device_status.version_type));
-                              rt_kprintf("版本类型vt:%d\n",vt->valueint);
+                              rt_kprintf("版本类型vt:%d\n",atoi(vt->valuestring));
                           }
                           MA_save();
                           rt_thread_delay(2000);
@@ -800,35 +845,37 @@ void parseDtu(char *json_string)
           }
           if(item_data!=NULL)
           {
-              account_status = cJSON_GetObjectItem(item_data,"account_status");
-              data_plan = cJSON_GetObjectItem(item_data,"data_plan");
-              data_usage = cJSON_GetObjectItem(item_data,"data_usage");
-              expiry_date = cJSON_GetObjectItem(item_data,"expiry_date");
-              iccid = cJSON_GetObjectItem(item_data,"iccid");
-              device_status.account_status = account_status->valueint;
-              device_status.data_plan = data_plan->valueint;
-              char data_usage_f[6];
-              struct tm t;
-              time_t expiry_date_time = expiry_date->valueint;
-              t= *localtime(&expiry_date_time);
-              rt_kprintf("expiry_date:%04d-%02d-%02d %02d:%02d:%02d\r\n",t.tm_year+1900,t.tm_mon+1,t.tm_mday,t.tm_hour+8,t.tm_min,t.tm_sec);
-              rt_kprintf("account_status:%d\n",account_status->valueint);
-              rt_kprintf("expiry_date:%d\n",expiry_date->valueint);
-              rt_kprintf("data_plan:%d\n",data_plan->valueint);
-              HMI_WRITE("sim.iccid.txt=\"%s\"",iccid->valuestring);
-              HMI_WRITE("sim.account_status.txt=\"%d\"",device_status.account_status);
-              HMI_WRITE("sim.data_plan.txt=\"%d\"",device_status.data_plan);
-              sprintf(data_usage_f,"%.5f",data_usage->valuedouble);
-              rt_kprintf("data_usage_f:%s\n",data_usage_f);
-              HMI_WRITE("sim.data_usage.txt=\"%s\"",data_usage_f);
-              HMI_WRITE("sim.expiry_date.txt=\"%04d-%02d-%02d %02d:%02d:%02d\"",t.tm_year+1900,t.tm_mon+1,t.tm_mday,t.tm_hour+8,t.tm_min,t.tm_sec);
+//              account_status = cJSON_GetObjectItem(item_data,"account_status");
+//              data_plan = cJSON_GetObjectItem(item_data,"data_plan");
+//              data_usage = cJSON_GetObjectItem(item_data,"data_usage");
+//              expiry_date = cJSON_GetObjectItem(item_data,"expiry_date");
+//              iccid = cJSON_GetObjectItem(item_data,"iccid");
+//              device_status.account_status = account_status->valueint;
+//              device_status.data_plan = data_plan->valueint;
+//              char data_usage_f[6];
+//              struct tm t;
+//              time_t expiry_date_time = expiry_date->valueint;
+//              t= *localtime(&expiry_date_time);
+//              rt_kprintf("expiry_date:%04d-%02d-%02d %02d:%02d:%02d\r\n",t.tm_year+1900,t.tm_mon+1,t.tm_mday,t.tm_hour+8,t.tm_min,t.tm_sec);
+//              rt_kprintf("account_status:%d\n",account_status->valueint);
+//              rt_kprintf("expiry_date:%d\n",expiry_date->valueint);
+//              rt_kprintf("data_plan:%d\n",data_plan->valueint);
+//              HMI_WRITE("sim.iccid.txt=\"%s\"",iccid->valuestring);
+//              HMI_WRITE("sim.account_status.txt=\"%d\"",device_status.account_status);
+//              HMI_WRITE("sim.data_plan.txt=\"%d\"",device_status.data_plan);
+//              sprintf(data_usage_f,"%.5f",data_usage->valuedouble);
+//              rt_kprintf("data_usage_f:%s\n",data_usage_f);
+//              HMI_WRITE("sim.data_usage.txt=\"%s\"",data_usage_f);
+//              HMI_WRITE("sim.expiry_date.txt=\"%04d-%02d-%02d %02d:%02d:%02d\"",t.tm_year+1900,t.tm_mon+1,t.tm_mday,t.tm_hour+8,t.tm_min,t.tm_sec);
           }
         cJSON_Delete(root);
     }
     return;
 }
+
 void UpLoad_Data(void)
 {
+
     char *updata = makeJson();
     rt_kprintf("upload data:%d\n%s\n",rt_strlen(updata),updata);
     DTU_Write("%s",updata);

+ 1 - 1
Application_CBD/applications/dtu_uart2.h

@@ -33,5 +33,5 @@ char * makeJson_ReadInfo();
 char * makeJson_takephoto();
 char *makeJson_Warn(char * s,char *t);
 void UpLoad_Data(void);
-
+char *uint8tostring(uint8_t dat);
 #endif /* APPLICATIONS_INC_DTU_UART2_H_ */

+ 81 - 57
Application_CBD/applications/hmi.c

@@ -124,14 +124,17 @@ static void Hmi_thread_entry(void *parameter)
     rt_uint32_t rx_length;
     while(1)
     {
+
         rt_memset(&msg, 0, sizeof(msg));
         /* 从消息队列中读取消息*/
-        result = rt_mq_recv(&rx_mq, &msg, sizeof(msg), 100);
+        result = rt_mq_recv(&rx_mq, &msg, sizeof(msg), 50);
         if (result == RT_EOK)
         {
+
                 rx_length = rt_device_read(msg.dev, 0, rx_buffer, msg.size);
                 rx_buffer[rx_length] = '\0';
                 LOG_I("%s\n",rx_buffer);
+                //\r 对应的hex为0x0d,0x0a,占两个字节,屏幕发送的数据都以\r结尾
                 HMI_Decode(rx_buffer,rx_length);
         }
         /*********************************************************************************************************************/
@@ -153,9 +156,9 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         char *readinfo =  makeJson_ReadInfo();
         if(device_status.refresh_num==5)
         {
-            device_status.net = 1;
-            device_status.sim = 1;
-            device_status.csq = 1;
+            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();
@@ -164,7 +167,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         }
         rt_free(readinfo);
         device_status.refresh_num--;
-        HMI_WRITE("workSta.iccid.txt=\"%s\"",device_status.iccid);
+        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);
         //更新固件版本号
@@ -201,10 +204,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         //更新光控状态
         HMI_WRITE("workSta.sunStatus.val=%d",device_status.sun_status);
         //更新CSQ
-        static char csq_str[10];
-        itoa(device_status.csq,csq_str,10);
-        HMI_WRITE("menu.csq_value.txt=\"%s\"",csq_str);
-        HMI_WRITE("workSta.csq_value.txt=\"%s\"",csq_str);
+        HMI_WRITE("menu.csq_value.txt=\"%s\"",device_status.csq);
+        HMI_WRITE("workSta.csq_value.txt=\"%s\"",device_status.csq);
         //更新收集时间
         HMI_WRITE("sysSet.stime.val=%d",device_status.clt_time);
         //更新加热时间
@@ -212,7 +213,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
         //更新加热温度
         HMI_WRITE("workSta.heatTem.val=%d",device_status.heattem);
-        HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvale);
+        HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
         //更新加热状态
         HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
         //更新熄屏时间
@@ -232,7 +233,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         //更新时控结束
         HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
         //SIM卡状态
-        HMI_WRITE("workSta.bt0.val=%d",device_status.sim);
+        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);
@@ -241,7 +242,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         //语音音量
         HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
         //更新联网状态
-        if(device_status.net==1)
+        if(atoi(device_status.net)==1)
         {
             HMI_WRITE("menu.net.val=1");
             HMI_WRITE("workSta.net.val=1");
@@ -250,7 +251,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             HMI_WRITE("workSta.net.val=0");
             HMI_WRITE("menu.net.val=0");
         }
-        if(device_status.csq==1)
+        if(atoi(device_status.csq)==0)
         {
             HMI_WRITE("menu.net.val=1");
             HMI_WRITE("workSta.net.val=2");
@@ -345,13 +346,15 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         rt_kprintf("CLOSE down!\n");
     }
     //定时设置
-    else if (strstr(rx_buffer,"saveClockSet")!=NULL) {
+    else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
+        char sun_str[3],start_str[3],stop_str[3],timeswitch_str[3];
         rt_kprintf("时间设置!\n");
-        var = strstr(rx_buffer,"=");
-        var ++;
-        device_status.sunBar = *((int *)var); //光控时间
-        if(device_status.sunBar > 0 && device_status.sunBar <11)
+        var=strstr(rx_buffer,"=");
+        var++;
+        strncpy(sun_str,var,2);
+        if(atoi(sun_str) > 0 && atoi(sun_str) <12)
         {
+            device_status.sunBar=atoi(sun_str);
             time_t now;
             time(&now);
             static struct tm nowstamp;
@@ -360,33 +363,36 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             static rt_uint32_t nowstamp_num = 0;
             nowstamp_num = mktime(&nowstamp);
             device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
-           ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
+            ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
         }
         else {
             rt_kprintf("参数设置异常!!!");
         }
-        var+=4;
-        device_status.startBar = *((int *)var); //时控开始时间
-        if(device_status.startBar >= 0 && device_status.startBar < 24)
+        //时控开始时间
+        strncpy(start_str,var+2,2);
+        if(atoi(start_str) >= 0 && atoi(start_str) < 24)
         {
+            device_status.startBar=atoi(start_str);
             ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
         }
         else {
             rt_kprintf("参数设置异常!!!");
         }
-        var+=4;
-        device_status.stopBar = *((int *)var); //时控结束时间
-        if(device_status.stopBar >= 0&& device_status.stopBar < 24)
+        //
+        strncpy(stop_str,var+4,2);
+        if(atoi(stop_str) >= 0&& atoi(stop_str) < 24)
         {
+            device_status.stopBar=atoi(stop_str);
             ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
         }
         else {
             rt_kprintf("参数设置异常!!!");
         }
-        var+=4;
-        device_status.timeSwitch = *((int *)var); //模式
-        if(device_status.timeSwitch >= 0 && device_status.timeSwitch <= 1)
+        //
+        strncpy(timeswitch_str,var+6,2);
+        if(atoi(timeswitch_str) >= 0 && atoi(timeswitch_str) <= 1)
         {
+            device_status.timeSwitch=atoi(timeswitch_str);
             ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
         }
         else {
@@ -396,42 +402,60 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         rt_kprintf("工作时间参数已保存:模式-%d,光控时间-%d,时控开始时间-%d,时控结束时间-%d\n",device_status.timeSwitch,device_status.sunBar,device_status.startBar,device_status.stopBar);
     }
     else if (strstr(rx_buffer,"saveSystemSet")!=NULL) {
+        char clt_time_str[3],heattime_str[3],heatvale_str[4],vol_str[4],thsp_str[5];
         rt_kprintf("系统设置!\n");
         var = strstr(rx_buffer,"=");
         var ++;
-        device_status.clt_time = *((int *)var); //收集时间
-        if(device_status.clt_time>0 && device_status.clt_time <= 30)
+        strncpy(clt_time_str,var,2);
+        if(atoi(clt_time_str)>0 && atoi(clt_time_str) <= 30)
         {
+            device_status.clt_time = atoi(clt_time_str); //收集时间
             ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
         }
-        var+=4;
-        device_status.heattime = *((int *)var); //加热时间
-        if(device_status.heattime>0 && device_status.heattime <= 30)
+        strncpy(heattime_str,var+2,2);
+        if(atoi(heattime_str)>0 && atoi(heattime_str) <= 30)
         {
+            rt_kprintf("加热时间:%d\n",atoi(heattime_str));
+            device_status.heattime = atoi(heattime_str); //加热时间
             ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
         }
-        var+=4;
-        device_status.heatvale = *((int *)var); //加热温度
-        if(device_status.heatvale > 0 && device_status.heatvale <= 130)
+        strncpy(heatvale_str,var+4,3);
+        if(atoi(heatvale_str) > 0 && atoi(heatvale_str) <= 130)
+        {
+            device_status.heatvalue=atoi(heatvale_str);
+            ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
+        }
+        strncpy(vol_str,var+7,3);
+        if(atoi(vol_str)>0&&atoi(vol_str)<8)
         {
-            ef_set_env_blob("jheat", &device_status.heatvale, sizeof(device_status.heatvale));
+            device_status.vol = atoi(vol_str);   //音量
+        }
+        strncpy(thsp_str,var+10,4);
+        if(atoi(thsp_str)>0&&atoi(thsp_str)<3600)
+        {
+            device_status.thsp = atoi(thsp_str);  //熄屏时间
+        }
+        else {
+            rt_kprintf("参数设置失败!!!\n");
         }
-        var+=4;
-        device_status.vol = *((int *)var);   //音量
-        var+=4;
-        device_status.thsp = *((int *)var);  //熄屏时间
         MA_save();
-        rt_kprintf("系统设置已保存:收集时间-%d,加热时间-%d,加热温度-%d,音量-%d,自动关屏-%d",device_status.clt_time,device_status.heattime,device_status.heatvale,device_status.vol,device_status.thsp);
+        rt_kprintf("系统设置已保存:收集时间-%d,加热时间-%d,加热温度-%d,音量-%d,自动关屏-%d\n",device_status.clt_time,device_status.heattime,device_status.heatvalue,device_status.vol,device_status.thsp);
     }
-    else if(strstr(rx_buffer,"saveUploadSet")!=NULL)
+    else if(strstr(rx_buffer,"saveUploadSet=")!=NULL)
     {
+        static char dattim_str[3];
         rt_kprintf("上传间隔设置!\n");
         var = strstr(rx_buffer,"=");
         var ++;
-        var+=4;
-        var+=4;
-        device_status.dattim = *((int *)var); //数据上传间隔
-        MA_save();
+        strncpy(dattim_str,var,2);
+        if(atoi(dattim_str)>=1&&atoi(dattim_str)<=120)
+        {
+            device_status.dattim =atoi(dattim_str); //数据上传间隔
+            MA_save();
+        }
+        else {
+            rt_kprintf("设置失败!!!\n");
+        }
         rt_kprintf("数据上传设置:%d\n",device_status.dattim);
     }
     //光控测试
@@ -652,7 +676,7 @@ void Check_ParamConfig(void)
         device_status.iSave=FLASH_FLAG;
         device_status.clt_time = 20;    //收集时间
         device_status.heattime = 20;    //加热时间
-        device_status.heatvale = 110;   //加热温度
+        device_status.heatvalue=100;//加热温度
         device_status.thsp = 300;       //默认熄屏时间5分钟
         device_status.sunBar = 8;       //光控定时时长
         device_status.startBar = 20;    //定时开始时间
@@ -676,7 +700,7 @@ void Check_ParamConfig(void)
         ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
         ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
         ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
-        ef_set_env_blob("jheat", &device_status.heatvale, sizeof(device_status.heatvale));
+        ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
         ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
         ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
         ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));   //震动开关
@@ -701,7 +725,7 @@ void Check_ParamConfig(void)
         rt_kprintf("timeSwitch:%d\n",device_status.timeSwitch);
         rt_kprintf("sunBar:%d\n",device_status.sunBar);
         rt_kprintf("jtime:%d\n",device_status.heattime);
-        rt_kprintf("jheat:%d\n",device_status.heatvale);
+        rt_kprintf("jheat:%d\n",device_status.heatvalue);
         rt_kprintf("thsp:%d\n", device_status.thsp);
         rt_kprintf("密码:%d\n",device_status.passWord);
 
@@ -714,7 +738,7 @@ void Check_ParamConfig(void)
         ef_get_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch), NULL);           //模式
         ef_get_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar), NULL);                       //光控时间
         ef_get_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime), NULL);                    //加热时间
-        ef_get_env_blob("jheat", &device_status.heatvale, sizeof(device_status.heatvale), NULL);                    //加热温度
+        ef_get_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue), NULL);                    //加热温度
         ef_get_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws), NULL);                 //震动开关
         ef_get_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec), NULL);              //震动时间
         ef_get_env_blob("tph", &device_status.tph, sizeof(device_status.tph), NULL);                                //高温保护
@@ -750,7 +774,7 @@ void Check_ParamConfig(void)
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
         }
 
-        LOG_I("SOFTWARE VERSION:%s-imei:%s\n",device_status.driver,device_status.imei);
+        LOG_I("SOFTWARE VERSION:%s-imei:%s--iccid:%s\n",device_status.driver,device_status.imei,device_status.iccid);
         rt_kprintf("read flash paramconfis:%d-%s-%s\r\n",device_status.version_type,device_status.driver_bl,device_status.driver_compile);
         rt_kprintf("开机次数:%d\n",device_status.rebootcnt);
         rt_kprintf("收集时间:%d\n",device_status.clt_time);
@@ -759,7 +783,7 @@ void Check_ParamConfig(void)
         rt_kprintf("timeSwitch:%d\n",device_status.timeSwitch);
         rt_kprintf("光控定时时长:%d\n",device_status.sunBar);
         rt_kprintf("收集时间:%d\n",device_status.heattime);
-        rt_kprintf("加热温度:%d\n",device_status.heatvale);
+        rt_kprintf("加热温度:%d\n",device_status.heatvalue);
         rt_kprintf("震动开关:%d\n",device_status.shake_ws);
         rt_kprintf("震动时间:%d\n",device_status.shake_sec);
         rt_kprintf("高温保护:%d\n",device_status.tph);
@@ -799,7 +823,7 @@ void ResetParamDefault(void)
     device_status.tph = 70;         //高温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
-    device_status.heatvale = 110;    //加热温度
+    device_status.heatvalue=110;//加热温度
     device_status.ds = 0;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
@@ -810,7 +834,7 @@ void ResetParamDefault(void)
     ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
     ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
     ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
-    ef_set_env_blob("jheat", &device_status.heatvale, sizeof(device_status.heatvale));
+    ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
     ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
     ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
     ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));   //震动开关
@@ -831,7 +855,7 @@ void ResetParamDefault_DC(void)
     device_status.tph = 70;         //高温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
-    device_status.heatvale = 110;    //加热温度
+    device_status.heatvalue=110;
     device_status.ds = 0;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
@@ -843,7 +867,7 @@ void ResetParamDefault_DC(void)
     ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
     ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
     ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
-    ef_set_env_blob("jheat", &device_status.heatvale, sizeof(device_status.heatvale));
+    ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
     ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
     ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
     ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));   //震动开关

+ 9 - 2
Application_CBD/applications/sht30_collect.c

@@ -86,8 +86,15 @@ static void sht30_collect_thread_entry(void *parameter)
             {
                 hum_value = sht3x_device->humidity;
                 tem_value = sht3x_device->temperature;
-                rt_sprintf(device_status.humidity,"%d.%d",(int)sht3x_device->humidity, (uint)(sht3x_device->humidity * 10) % 10);
-                rt_sprintf(device_status.tempture,"%d.%d",(int)sht3x_device->temperature, (uint)(sht3x_device->temperature * 10) % 10);
+                if(hum_value!=0)
+                {
+                    rt_sprintf(device_status.humidity,"%d.%d",(int)sht3x_device->humidity, (uint)(sht3x_device->humidity * 10) % 10);
+                    rt_sprintf(device_status.tempture,"%d.%d",(int)sht3x_device->temperature, (uint)(sht3x_device->temperature * 10) % 10);
+                }
+                else {
+                    rt_sprintf(device_status.humidity,"30.0");
+                    rt_sprintf(device_status.tempture,"25.0");
+                }
                 if(tem_value>=device_status.tph||tem_value<=device_status.tpl)
                 {
                     device_status.temp_status = 1;

+ 8 - 1
Application_CBD/drivers/board.c

@@ -22,7 +22,7 @@ void SystemClock_Config(void)
 {
     RCC_OscInitTypeDef RCC_OscInitStruct = {0};
     RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
+    RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
     /**Initializes the CPU, AHB and APB busses clocks
     */
     RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
@@ -49,6 +49,13 @@ void SystemClock_Config(void)
     {
       Error_Handler();
     }
+    PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_ADC;
+    PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+    PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+    {
+      Error_Handler();
+    }
     /**Enables the Clock Security System
     */
     HAL_RCC_EnableCSS();

+ 4 - 2
Application_CBD/drivers/drv_flash_f1.c

@@ -91,7 +91,8 @@ int stm32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
         LOG_E("write outrange flash size! addr is (0x%p)", (void *)(addr + size));
         return -RT_EINVAL;
     }
-
+    //APM32此处关闭中断
+    __disable_irq();
     HAL_FLASH_Unlock();
 
     while (addr < end_addr)
@@ -114,7 +115,8 @@ int stm32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
     }
 
     HAL_FLASH_Lock();
-
+    //打开中断
+    __enable_irq();
     if (result != RT_EOK)
     {
         return result;

+ 29 - 9
Application_CBD/readme.md

@@ -48,18 +48,38 @@ void ymodem_ota(uint8_t argc, char **argv)
 - HMI_THREAD_PRIORITY         26>24          //线程优先级
 ## 2021-03-26-版本:1.5.41(HK)
 - 屏幕串口4波特率修改,9600>115200
-## 2021-04-0-版本:1.5.41(HK)
+## 2021-04-02-版本:1.5.41(HK)
 - 定时重启增加关闭DTU供电,开机初始化打开供电
 - 增加远程断电:
 {"ext": {"type": "rtu_off_on"}, "cmd": "ctrl"}
-
-
-
-
-
-
-
-
+## 2021-04-06-版本:1.6.41(HK)
+- 数据参数设置模块:	
+	增加开始时间和结束时间整形数值的解析.
+## 2021-04-07-版本:1.6.41(HK)
+- 屏幕参数设置本部分修改.
+## 2021-04-08-版本:1.8.41(HK)
+###版本更新:
+- 1.apm32在flash操作,解锁前需要手动关闭中断,上锁后手动打开中断,这一点在差异文件内没写。
+对应文件:drv_flash_f1.c
+
+	__disable_irq();
+
+	__enable_irq();
+
+- 2.board.c时钟初始化:
+    PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_ADC;
+    PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+    PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+- 3.DTU串口协议优化:
+{"cmd": "GetInfo"}>>>>={"uart": "getinfo"}
+同步消息:
+	csq->valueint-----csq->valuestring
+	
 
 
 

+ 80 - 8
CBD_FOTA_BootLoader/.config

@@ -312,8 +312,6 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_LIBRWS is not set
 # CONFIG_PKG_USING_TCPSERVER is not set
 # CONFIG_PKG_USING_PROTOBUF_C is not set
-# CONFIG_PKG_USING_ONNX_PARSER is not set
-# CONFIG_PKG_USING_ONNX_BACKEND is not set
 # CONFIG_PKG_USING_DLT645 is not set
 # CONFIG_PKG_USING_QXWZ is not set
 # CONFIG_PKG_USING_SMTP_CLIENT is not set
@@ -327,6 +325,11 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_PDULIB is not set
 # CONFIG_PKG_USING_BTSTACK is not set
 # CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
+# CONFIG_PKG_USING_WAYZ_IOTKIT is not set
+# CONFIG_PKG_USING_MAVLINK is not set
+# CONFIG_PKG_USING_RAPIDJSON is not set
+# CONFIG_PKG_USING_BSAL is not set
+# CONFIG_PKG_USING_AGILE_MODBUS is not set
 # end of IoT - internet of things
 
 #
@@ -367,6 +370,8 @@ CONFIG_TINY_CRYPT_SHA256=y
 # CONFIG_PKG_USING_WAVPLAYER is not set
 # CONFIG_PKG_USING_TJPGD is not set
 # CONFIG_PKG_USING_HELIX is not set
+# CONFIG_PKG_USING_AZUREGUIX is not set
+# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
 # end of multimedia packages
 
 #
@@ -400,9 +405,12 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x99999
 # CONFIG_PKG_USING_RDB is not set
 # CONFIG_PKG_USING_QRCODE is not set
 # CONFIG_PKG_USING_ULOG_EASYFLASH is not set
+# CONFIG_PKG_USING_ULOG_FILE is not set
+# CONFIG_PKG_USING_LOGMGR is not set
 # CONFIG_PKG_USING_ADBD is not set
 # CONFIG_PKG_USING_COREMARK is not set
 # CONFIG_PKG_USING_DHRYSTONE is not set
+# CONFIG_PKG_USING_MEMORYPERF is not set
 # CONFIG_PKG_USING_NR_MICRO_SHELL is not set
 # CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
 # CONFIG_PKG_USING_LUNAR_CALENDAR is not set
@@ -410,6 +418,18 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x99999
 # CONFIG_PKG_USING_GPS_RMC is not set
 # CONFIG_PKG_USING_URLENCODE is not set
 # CONFIG_PKG_USING_UMCN is not set
+# CONFIG_PKG_USING_LWRB2RTT is not set
+# CONFIG_PKG_USING_CPU_USAGE is not set
+# CONFIG_PKG_USING_GBK2UTF8 is not set
+# CONFIG_PKG_USING_VCONSOLE is not set
+# CONFIG_PKG_USING_KDB is not set
+# CONFIG_PKG_USING_WAMR is not set
+# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set
+# CONFIG_PKG_USING_LWLOG is not set
+# CONFIG_PKG_USING_ANV_TRACE is not set
+# CONFIG_PKG_USING_ANV_MEMLEAK is not set
+# CONFIG_PKG_USING_ANV_TESTSUIT is not set
+# CONFIG_PKG_USING_ANV_BENCH is not set
 # end of tools packages
 
 #
@@ -442,6 +462,8 @@ CONFIG_PKG_FAL_VER_NUM=0x00500
 # CONFIG_PKG_USING_CMSIS is not set
 # CONFIG_PKG_USING_DFS_YAFFS is not set
 # CONFIG_PKG_USING_LITTLEFS is not set
+# CONFIG_PKG_USING_DFS_JFFS2 is not set
+# CONFIG_PKG_USING_DFS_UFFS is not set
 # CONFIG_PKG_USING_THREAD_POOL is not set
 # CONFIG_PKG_USING_ROBOTS is not set
 # CONFIG_PKG_USING_EV is not set
@@ -468,11 +490,27 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_RAMDISK is not set
 # CONFIG_PKG_USING_MININI is not set
 # CONFIG_PKG_USING_QBOOT is not set
+
+#
+# Micrium: Micrium software products porting for RT-Thread
+#
 # CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
+# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
 # CONFIG_PKG_USING_UC_CRC is not set
 # CONFIG_PKG_USING_UC_CLK is not set
 # CONFIG_PKG_USING_UC_COMMON is not set
+# CONFIG_PKG_USING_UC_MODBUS is not set
+# end of Micrium: Micrium software products porting for RT-Thread
+
 # CONFIG_PKG_USING_PPOOL is not set
+# CONFIG_PKG_USING_OPENAMP is not set
+# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
+# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
+# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
+# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
+# CONFIG_PKG_USING_QFPLIB_M3 is not set
+# CONFIG_PKG_USING_LPM is not set
+# CONFIG_PKG_USING_TLSF is not set
 # end of system packages
 
 #
@@ -482,6 +520,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_REALTEK_AMEBA is not set
 # CONFIG_PKG_USING_SHT2X is not set
 # CONFIG_PKG_USING_SHT3X is not set
+# CONFIG_PKG_USING_AS7341 is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_U8G2 is not set
@@ -541,9 +580,33 @@ CONFIG_PKG_SIGNAL_LED_VER="latest"
 # CONFIG_PKG_USING_LY68L6400 is not set
 # CONFIG_PKG_USING_DM9051 is not set
 # CONFIG_PKG_USING_SSD1306 is not set
+# CONFIG_PKG_USING_QKEY is not set
+# CONFIG_PKG_USING_RS485 is not set
+# CONFIG_PKG_USING_NES is not set
+# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set
+# CONFIG_PKG_USING_VDEVICE is not set
+# CONFIG_PKG_USING_SGM706 is not set
+# CONFIG_PKG_USING_STM32WB55_SDK is not set
+# CONFIG_PKG_USING_RDA58XX is not set
+# CONFIG_PKG_USING_LIBNFC is not set
+# CONFIG_PKG_USING_MFOC is not set
+# CONFIG_PKG_USING_TMC51XX is not set
 # end of peripheral libraries and drivers
 
 #
+# AI packages
+#
+# CONFIG_PKG_USING_LIBANN is not set
+# CONFIG_PKG_USING_NNOM is not set
+# CONFIG_PKG_USING_ONNX_BACKEND is not set
+# CONFIG_PKG_USING_ONNX_PARSER is not set
+# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
+# CONFIG_PKG_USING_ELAPACK is not set
+# CONFIG_PKG_USING_ULAPACK is not set
+# CONFIG_PKG_USING_QUEST is not set
+# end of AI packages
+
+#
 # miscellaneous packages
 #
 # CONFIG_PKG_USING_LIBCSV is not set
@@ -564,6 +627,7 @@ CONFIG_QLZ_COMPRESSION_LEVEL=3
 CONFIG_PKG_USING_QUICKLZ_V101=y
 # CONFIG_PKG_USING_QUICKLZ_V100 is not set
 CONFIG_PKG_QUICKLZ_VER="v1.0.1"
+# CONFIG_PKG_USING_LZMA is not set
 # CONFIG_PKG_USING_MULTIBUTTON is not set
 # CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set
 # CONFIG_PKG_USING_CANFESTIVAL is not set
@@ -586,19 +650,27 @@ CONFIG_PKG_QUICKLZ_VER="v1.0.1"
 
 # CONFIG_PKG_USING_HELLO is not set
 # CONFIG_PKG_USING_VI is not set
-# CONFIG_PKG_USING_NNOM is not set
-# CONFIG_PKG_USING_LIBANN is not set
-# CONFIG_PKG_USING_ELAPACK is not set
+# CONFIG_PKG_USING_KI is not set
 # CONFIG_PKG_USING_ARMv7M_DWT is not set
 # CONFIG_PKG_USING_VT100 is not set
-# CONFIG_PKG_USING_TETRIS is not set
-# CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_UKAL is not set
 # CONFIG_PKG_USING_CRCLIB is not set
+
+#
+# entertainment: terminal games and other interesting software packages
+#
 # CONFIG_PKG_USING_THREES is not set
 # CONFIG_PKG_USING_2048 is not set
+# CONFIG_PKG_USING_SNAKE is not set
+# CONFIG_PKG_USING_TETRIS is not set
+# CONFIG_PKG_USING_DONUT is not set
+# CONFIG_PKG_USING_ACLOCK is not set
+# end of entertainment: terminal games and other interesting software packages
+
 # CONFIG_PKG_USING_LWGPS is not set
-# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
+# CONFIG_PKG_USING_STATE_MACHINE is not set
+# CONFIG_PKG_USING_MCURSES is not set
+# CONFIG_PKG_USING_COWSAY is not set
 # end of miscellaneous packages
 # end of RT-Thread online packages
 

+ 82 - 10
CBD_FOTA_BootLoader/.config.old

@@ -154,7 +154,7 @@ CONFIG_RT_USING_SFUD=y
 CONFIG_RT_SFUD_USING_SFDP=y
 CONFIG_RT_SFUD_USING_FLASH_INFO_TABLE=y
 # CONFIG_RT_SFUD_USING_QSPI is not set
-CONFIG_RT_SFUD_SPI_MAX_HZ=50000000
+CONFIG_RT_SFUD_SPI_MAX_HZ=40000000
 # CONFIG_RT_DEBUG_SFUD is not set
 # CONFIG_RT_USING_ENC28J60 is not set
 # CONFIG_RT_USING_SPI_WIFI is not set
@@ -312,8 +312,6 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_LIBRWS is not set
 # CONFIG_PKG_USING_TCPSERVER is not set
 # CONFIG_PKG_USING_PROTOBUF_C is not set
-# CONFIG_PKG_USING_ONNX_PARSER is not set
-# CONFIG_PKG_USING_ONNX_BACKEND is not set
 # CONFIG_PKG_USING_DLT645 is not set
 # CONFIG_PKG_USING_QXWZ is not set
 # CONFIG_PKG_USING_SMTP_CLIENT is not set
@@ -327,6 +325,11 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_PDULIB is not set
 # CONFIG_PKG_USING_BTSTACK is not set
 # CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
+# CONFIG_PKG_USING_WAYZ_IOTKIT is not set
+# CONFIG_PKG_USING_MAVLINK is not set
+# CONFIG_PKG_USING_RAPIDJSON is not set
+# CONFIG_PKG_USING_BSAL is not set
+# CONFIG_PKG_USING_AGILE_MODBUS is not set
 # end of IoT - internet of things
 
 #
@@ -367,6 +370,8 @@ CONFIG_TINY_CRYPT_SHA256=y
 # CONFIG_PKG_USING_WAVPLAYER is not set
 # CONFIG_PKG_USING_TJPGD is not set
 # CONFIG_PKG_USING_HELIX is not set
+# CONFIG_PKG_USING_AZUREGUIX is not set
+# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
 # end of multimedia packages
 
 #
@@ -400,9 +405,12 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x99999
 # CONFIG_PKG_USING_RDB is not set
 # CONFIG_PKG_USING_QRCODE is not set
 # CONFIG_PKG_USING_ULOG_EASYFLASH is not set
+# CONFIG_PKG_USING_ULOG_FILE is not set
+# CONFIG_PKG_USING_LOGMGR is not set
 # CONFIG_PKG_USING_ADBD is not set
 # CONFIG_PKG_USING_COREMARK is not set
 # CONFIG_PKG_USING_DHRYSTONE is not set
+# CONFIG_PKG_USING_MEMORYPERF is not set
 # CONFIG_PKG_USING_NR_MICRO_SHELL is not set
 # CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
 # CONFIG_PKG_USING_LUNAR_CALENDAR is not set
@@ -410,6 +418,18 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x99999
 # CONFIG_PKG_USING_GPS_RMC is not set
 # CONFIG_PKG_USING_URLENCODE is not set
 # CONFIG_PKG_USING_UMCN is not set
+# CONFIG_PKG_USING_LWRB2RTT is not set
+# CONFIG_PKG_USING_CPU_USAGE is not set
+# CONFIG_PKG_USING_GBK2UTF8 is not set
+# CONFIG_PKG_USING_VCONSOLE is not set
+# CONFIG_PKG_USING_KDB is not set
+# CONFIG_PKG_USING_WAMR is not set
+# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set
+# CONFIG_PKG_USING_LWLOG is not set
+# CONFIG_PKG_USING_ANV_TRACE is not set
+# CONFIG_PKG_USING_ANV_MEMLEAK is not set
+# CONFIG_PKG_USING_ANV_TESTSUIT is not set
+# CONFIG_PKG_USING_ANV_BENCH is not set
 # end of tools packages
 
 #
@@ -442,6 +462,8 @@ CONFIG_PKG_FAL_VER_NUM=0x00500
 # CONFIG_PKG_USING_CMSIS is not set
 # CONFIG_PKG_USING_DFS_YAFFS is not set
 # CONFIG_PKG_USING_LITTLEFS is not set
+# CONFIG_PKG_USING_DFS_JFFS2 is not set
+# CONFIG_PKG_USING_DFS_UFFS is not set
 # CONFIG_PKG_USING_THREAD_POOL is not set
 # CONFIG_PKG_USING_ROBOTS is not set
 # CONFIG_PKG_USING_EV is not set
@@ -459,7 +481,7 @@ CONFIG_SYSWATCH_THREAD_PRIO=0
 CONFIG_SYSWATCH_THREAD_STK_SIZE=512
 CONFIG_SYSWATCH_THREAD_NAME="syswatch"
 CONFIG_SYSWATCH_WDT_NAME="wdt"
-CONFIG_SYSWATCH_WDT_TIMEOUT=5
+CONFIG_SYSWATCH_WDT_TIMEOUT=10
 CONFIG_PKG_USING_SYSWATCH_LATEST_VERSION=y
 # CONFIG_PKG_USING_SYSWATCH_V100 is not set
 CONFIG_PKG_SYSWATCH_VER="latest"
@@ -468,11 +490,27 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_RAMDISK is not set
 # CONFIG_PKG_USING_MININI is not set
 # CONFIG_PKG_USING_QBOOT is not set
+
+#
+# Micrium: Micrium software products porting for RT-Thread
+#
 # CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
+# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
 # CONFIG_PKG_USING_UC_CRC is not set
 # CONFIG_PKG_USING_UC_CLK is not set
 # CONFIG_PKG_USING_UC_COMMON is not set
+# CONFIG_PKG_USING_UC_MODBUS is not set
+# end of Micrium: Micrium software products porting for RT-Thread
+
 # CONFIG_PKG_USING_PPOOL is not set
+# CONFIG_PKG_USING_OPENAMP is not set
+# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
+# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
+# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
+# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
+# CONFIG_PKG_USING_QFPLIB_M3 is not set
+# CONFIG_PKG_USING_LPM is not set
+# CONFIG_PKG_USING_TLSF is not set
 # end of system packages
 
 #
@@ -482,6 +520,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_REALTEK_AMEBA is not set
 # CONFIG_PKG_USING_SHT2X is not set
 # CONFIG_PKG_USING_SHT3X is not set
+# CONFIG_PKG_USING_AS7341 is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_U8G2 is not set
@@ -541,9 +580,33 @@ CONFIG_PKG_SIGNAL_LED_VER="latest"
 # CONFIG_PKG_USING_LY68L6400 is not set
 # CONFIG_PKG_USING_DM9051 is not set
 # CONFIG_PKG_USING_SSD1306 is not set
+# CONFIG_PKG_USING_QKEY is not set
+# CONFIG_PKG_USING_RS485 is not set
+# CONFIG_PKG_USING_NES is not set
+# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set
+# CONFIG_PKG_USING_VDEVICE is not set
+# CONFIG_PKG_USING_SGM706 is not set
+# CONFIG_PKG_USING_STM32WB55_SDK is not set
+# CONFIG_PKG_USING_RDA58XX is not set
+# CONFIG_PKG_USING_LIBNFC is not set
+# CONFIG_PKG_USING_MFOC is not set
+# CONFIG_PKG_USING_TMC51XX is not set
 # end of peripheral libraries and drivers
 
 #
+# AI packages
+#
+# CONFIG_PKG_USING_LIBANN is not set
+# CONFIG_PKG_USING_NNOM is not set
+# CONFIG_PKG_USING_ONNX_BACKEND is not set
+# CONFIG_PKG_USING_ONNX_PARSER is not set
+# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
+# CONFIG_PKG_USING_ELAPACK is not set
+# CONFIG_PKG_USING_ULAPACK is not set
+# CONFIG_PKG_USING_QUEST is not set
+# end of AI packages
+
+#
 # miscellaneous packages
 #
 # CONFIG_PKG_USING_LIBCSV is not set
@@ -564,6 +627,7 @@ CONFIG_QLZ_COMPRESSION_LEVEL=3
 CONFIG_PKG_USING_QUICKLZ_V101=y
 # CONFIG_PKG_USING_QUICKLZ_V100 is not set
 CONFIG_PKG_QUICKLZ_VER="v1.0.1"
+# CONFIG_PKG_USING_LZMA is not set
 # CONFIG_PKG_USING_MULTIBUTTON is not set
 # CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set
 # CONFIG_PKG_USING_CANFESTIVAL is not set
@@ -586,19 +650,27 @@ CONFIG_PKG_QUICKLZ_VER="v1.0.1"
 
 # CONFIG_PKG_USING_HELLO is not set
 # CONFIG_PKG_USING_VI is not set
-# CONFIG_PKG_USING_NNOM is not set
-# CONFIG_PKG_USING_LIBANN is not set
-# CONFIG_PKG_USING_ELAPACK is not set
+# CONFIG_PKG_USING_KI is not set
 # CONFIG_PKG_USING_ARMv7M_DWT is not set
 # CONFIG_PKG_USING_VT100 is not set
-# CONFIG_PKG_USING_TETRIS is not set
-# CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_UKAL is not set
 # CONFIG_PKG_USING_CRCLIB is not set
+
+#
+# entertainment: terminal games and other interesting software packages
+#
 # CONFIG_PKG_USING_THREES is not set
 # CONFIG_PKG_USING_2048 is not set
+# CONFIG_PKG_USING_SNAKE is not set
+# CONFIG_PKG_USING_TETRIS is not set
+# CONFIG_PKG_USING_DONUT is not set
+# CONFIG_PKG_USING_ACLOCK is not set
+# end of entertainment: terminal games and other interesting software packages
+
 # CONFIG_PKG_USING_LWGPS is not set
-# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
+# CONFIG_PKG_USING_STATE_MACHINE is not set
+# CONFIG_PKG_USING_MCURSES is not set
+# CONFIG_PKG_USING_COWSAY is not set
 # end of miscellaneous packages
 # end of RT-Thread online packages
 

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 239 - 239
CBD_FOTA_BootLoader/.cproject


binární
CBD_FOTA_BootLoader/.settings/.rtmenus


+ 2 - 2
CBD_FOTA_BootLoader/applications/main.c

@@ -33,8 +33,8 @@
 #include "sys_config.h"
 #include <easyflash.h>
 
-#define BL_VERSION "1.1.1"
-#define COMPILE "20210305"
+#define BL_VERSION "1.1.2"
+#define COMPILE "20210408"
 
 #define RTU_DTU GET_PIN(B,13)
 

+ 2 - 1
CBD_FOTA_BootLoader/drivers/board.c

@@ -45,7 +45,6 @@ void SystemClock_Config(void)
 {
     RCC_OscInitTypeDef RCC_OscInitStruct = {0};
     RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
     /**Initializes the CPU, AHB and APB busses clocks
     */
     RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
@@ -72,9 +71,11 @@ void SystemClock_Config(void)
     {
       Error_Handler();
     }
+
     /**Enables the Clock Security System
     */
     HAL_RCC_EnableCSS();
+
 }
 /**
 * @brief SPI MSP Initialization

+ 4 - 2
CBD_FOTA_BootLoader/drivers/drv_flash_f1.c

@@ -91,7 +91,8 @@ int stm32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
         LOG_E("write outrange flash size! addr is (0x%p)", (void *)(addr + size));
         return -RT_EINVAL;
     }
-
+    //APM32此处关闭中断
+    __disable_irq();
     HAL_FLASH_Unlock();
 
     while (addr < end_addr)
@@ -114,7 +115,8 @@ int stm32_flash_write(rt_uint32_t addr, const rt_uint8_t *buf, size_t size)
     }
 
     HAL_FLASH_Lock();
-
+    //打开中断
+    __enable_irq();
     if (result != RT_EOK)
     {
         return result;

+ 2 - 1
CBD_FOTA_BootLoader/libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c

@@ -656,7 +656,8 @@ __weak void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
   */
 HAL_StatusTypeDef HAL_FLASH_Unlock(void)
 {
-  HAL_StatusTypeDef status = HAL_OK;
+
+    HAL_StatusTypeDef status = HAL_OK;
 
   if(READ_BIT(FLASH->CR, FLASH_CR_LOCK) != RESET)
   {

+ 1 - 1
CBD_FOTA_BootLoader/packages/fal-v0.5.0/samples/porting/fal_flash_sfud_port.c

@@ -30,7 +30,7 @@ struct fal_flash_dev nor_flash0 =
 {
     .name       = FAL_USING_NOR_FLASH_DEV_NAME,
     .addr       = 0,
-    .len        = 16 * 1024 * 1024,
+    .len        = 4 * 1024 * 1024,
     .blk_size   = 4096,
     .ops        = {init, read, write, erase},
     .write_gran = 1

+ 1 - 1
CBD_FOTA_BootLoader/packages/fal-v0.5.0/src/fal_flash_stm32f1_port.c

@@ -46,4 +46,4 @@ static int erase(long offset, size_t size)
     return stm32_flash_erase(stm32f1_onchip_flash.addr + offset, size);
 }
 
-const struct fal_flash_dev stm32f1_onchip_flash = {"onchip_flash", 0x08000000, 1024 * 1024, 128 * 1024, {init, read, write, erase}};
+const struct fal_flash_dev stm32f1_onchip_flash = {"onchip_flash", 0x08000000, 512 * 1024, 128 * 1024, {init, read, write, erase}};

+ 12 - 1
CBD_FOTA_BootLoader/readme.md

@@ -12,4 +12,15 @@
     {FAL_PART_MAGIC_WORD, "easyflash",     FAL_USING_NOR_FLASH_DEV_NAME,             0,                       3*1024*1024,   0}, \
     {FAL_PART_MAGIC_WORD,  "fm_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024,             512*1024,      0}, \
     {FAL_PART_MAGIC_WORD,  "df_area",     FAL_USING_NOR_FLASH_DEV_NAME,             3*1024*1024 + 512*1024,  512*1024,      0}, \
-}
+}
+# 2021年4月8日:
+## VERSION "1.1.1"
+版本更新:
+apm32在flash操作,解锁前需要手动关闭中断,上锁后手动打开中断,这一点在差异文件内没写。
+对应文件:drv_flash_f1.c
+
+	__disable_irq();
+
+	__enable_irq();
+
+

binární
CBD_FOTA_BootLoader/rt-thread/tools/building.pyc


binární
CBD_FOTA_BootLoader/rt-thread/tools/eclipse.pyc


binární
CBD_FOTA_BootLoader/rt-thread/tools/menuconfig.pyc


binární
CBD_FOTA_BootLoader/rt-thread/tools/mkdist.pyc


binární
CBD_FOTA_BootLoader/rt-thread/tools/utils.pyc


+ 12 - 0
CBD_FOTA_BootLoader/rtconfig.h

@@ -223,6 +223,10 @@
 #define SYSWATCH_WDT_NAME "wdt"
 #define SYSWATCH_WDT_TIMEOUT 10
 #define PKG_USING_SYSWATCH_LATEST_VERSION
+
+/* Micrium: Micrium software products porting for RT-Thread */
+
+/* end of Micrium: Micrium software products porting for RT-Thread */
 /* end of system packages */
 
 /* peripheral libraries and drivers */
@@ -235,6 +239,10 @@
 /* end of signalLed Options */
 /* end of peripheral libraries and drivers */
 
+/* AI packages */
+
+/* end of AI packages */
+
 /* miscellaneous packages */
 
 #define PKG_USING_FASTLZ
@@ -246,6 +254,10 @@
 /* samples: kernel and components samples */
 
 /* end of samples: kernel and components samples */
+
+/* entertainment: terminal games and other interesting software packages */
+
+/* end of entertainment: terminal games and other interesting software packages */
 /* end of miscellaneous packages */
 /* end of RT-Thread online packages */
 

binární
CBD_FOTA_BootLoader/rtconfig.pyc