Kaynağa Gözat

dtu power ctrl

yf_zjb 5 yıl önce
ebeveyn
işleme
9891d8e5ea

BIN
Application_CBD/Debug/packages/EasyFlash-latest/src/ef_fal_port.o


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


+ 14 - 2
Application_CBD/applications/control.c

@@ -53,11 +53,10 @@ uint8_t ctr_Heat(uint8_t status_heat)
     return status_heat;
     return status_heat;
 }
 }
 /*相机供电*/
 /*相机供电*/
-uint8_t ctr_photo(uint8_t status_photo)
+void ctr_photo(uint8_t status_photo)
 {
 {
     rt_pin_mode(PHOTO,PIN_MODE_OUTPUT);
     rt_pin_mode(PHOTO,PIN_MODE_OUTPUT);
     rt_pin_write(PHOTO,status_photo);
     rt_pin_write(PHOTO,status_photo);
-    return status_photo;
 }
 }
 /*采集风机/上仓门*/
 /*采集风机/上仓门*/
 uint8_t ctr_cangmen_up(uint8_t status_up)
 uint8_t ctr_cangmen_up(uint8_t status_up)
@@ -349,6 +348,19 @@ void ctr_router(uint8_t status_router)
         rt_pin_write(ROUTER,OFF);
         rt_pin_write(ROUTER,OFF);
     }
     }
 }
 }
+//DTU_RTU供电
+void ctr_DTU_Power(uint8_t DTU_Power)
+{
+    rt_pin_mode(RTU_DTU, PIN_MODE_OUTPUT);
+
+    if(DTU_Power==ON)
+    {
+        rt_pin_write(ROUTER,ON);
+    }
+    else {
+        rt_pin_write(ROUTER,OFF);
+    }
+}
 //清扫-推杆电机
 //清扫-推杆电机
 void ctr_TG_Clear(uint16_t clear_timeout)
 void ctr_TG_Clear(uint16_t clear_timeout)
 {
 {

+ 18 - 38
Application_CBD/applications/control.h

@@ -70,33 +70,22 @@ typedef struct{
     rt_uint32_t light_over_tim;     //光控定时差秒数
     rt_uint32_t light_over_tim;     //光控定时差秒数
     rt_uint32_t data_plan;          //流量套餐
     rt_uint32_t data_plan;          //流量套餐
     rt_uint32_t expiry_date;        //到期时间
     rt_uint32_t expiry_date;        //到期时间
-    int  sleep_p;           //待机功耗
-    int  up_motor_p;        //上仓门功率
-    int  down_motor_p;      //下仓门功率
-    int  clear_motor_p;     //清扫电机功率
-    int  lamp_p;            //镇流器功率
-    int  shake_p;           //震动电机
-    int  hk_power;          //海康相机功率
-    int  heat_p;            //加热带功率
-    int  led_p;             //补光灯功率
-    int  router_p;          //路由器功率
-    int  rtu_dtu_p;         //外接12V功率
     int passWord;           //初始密码
     int passWord;           //初始密码
-    char tempture[10];      //温度
-    char humidity[10];      //湿度
-    char driver[30];           //版本
-    char driver_4g[30];        //4g版本
-    char driver_bl[30];        //BL版本
-    char driver_compile[30];   //BL编译时间
-    char mqttcfg1[30];
-    char mqttcfg2[100];
-    char project[30];          //project,用于判断升级
-    char iccid[30];            //SIM卡ICCID
-    char lng[30];           //经度
-    char lat[30];           //纬度
-    char imei[30];          //IMEI,唯一ID
-    char stamp[30];         //系统时间
-    char fuse_voltage[30];  //保险丝电压
+    char tempture[12];      //温度
+    char humidity[12];      //湿度
+    char driver[32];           //版本
+    char driver_4g[32];        //4g版本
+    char driver_bl[32];        //BL版本
+    char driver_compile[32];   //BL编译时间
+    char mqttcfg1[32];
+    char mqttcfg2[128];
+    char project[32];          //project,用于判断升级
+    char lng[32];           //经度
+    char lat[32];           //纬度
+    char stamp[32];         //系统时间
+    char fuse_voltage[32];  //保险丝电压
+    char iccid[32];            //SIM卡ICCID
+    char imei[32];          //IMEI,唯一ID
     char  *power;          //功率
     char  *power;          //功率
     char *voltage;     //电池电压
     char *voltage;     //电池电压
 
 
@@ -154,25 +143,16 @@ void ctr_TG_Clear(uint16_t clear_timeout);      //清扫2
 uint8_t ctr_led(uint8_t status_led);            //补光灯
 uint8_t ctr_led(uint8_t status_led);            //补光灯
 void calorstat(uint16_t heat_time);             //恒温
 void calorstat(uint16_t heat_time);             //恒温
 void ctr_router(uint8_t status_router);         //路由器
 void ctr_router(uint8_t status_router);         //路由器
-void ctr_rtu_dtu(uint8_t status_rtu);           //RTU
 void turnzp(void);                              //转仓
 void turnzp(void);                              //转仓
 void HK_TakePhoto(void);                        //拍照
 void HK_TakePhoto(void);                        //拍照
+void ctr_photo(uint8_t status_photo);
+void ctr_RTU_DTU(uint8_t status_rtu);
 void HardWare_Init(uint8_t boot);               //初始化
 void HardWare_Init(uint8_t boot);               //初始化
 void HardWare_Check(uint8_t boot);              //自检
 void HardWare_Check(uint8_t boot);              //自检
 void ResetInit(void);                           //上电复位
 void ResetInit(void);                           //上电复位
 void SunTest(void);                             //光控测试
 void SunTest(void);                             //光控测试
 /*****************************************************/
 /*****************************************************/
-void ReadUpMotorPower(uint16_t timeout);
-void ReadDownMotorPower(uint16_t timeout);
-void ReadClearMortorPower(uint16_t timeout);
-void ReadLampPower(uint16_t timeout);
-void ReadLedPower(uint16_t timeout);
-void ReadShakePower(uint16_t timeout);
-void ReadHeatPower(uint16_t timeout);
-void ReadRouterPower(uint16_t timeout);
-void ReadHkPower(uint16_t timeout);
-void ReadRtuDtuPower(uint16_t timeout);
-void ReadSleepPower(uint8_t boot);
+
 /****************************************************/
 /****************************************************/
 void CheckRead_Power(void);         //功率检测
 void CheckRead_Power(void);         //功率检测
 void WorkCheck(void);               //工作检测
 void WorkCheck(void);               //工作检测

+ 27 - 7
Application_CBD/applications/dtu_uart2.c

@@ -176,7 +176,7 @@ static void dtu_thread_entry_send(void *parameter)
                     {
                     {
                         rt_thread_delay(500);
                         rt_thread_delay(500);
                         static char warn_power[20];
                         static char warn_power[20];
-                        sprintf(warn_power,"Power up");
+                        sprintf(warn_power,"Power down");
                         char * res_power_warn = makeJson_Warn(warn_power,"power");
                         char * res_power_warn = makeJson_Warn(warn_power,"power");
                         DTU_Write("%s",res_power_warn);
                         DTU_Write("%s",res_power_warn);
                         rt_free(res_power_warn);
                         rt_free(res_power_warn);
@@ -494,6 +494,7 @@ void parseDtu(char *json_string)
     cJSON* expiry_date = NULL;      //到期时间
     cJSON* expiry_date = NULL;      //到期时间
     cJSON* mqttcfg1 = NULL;
     cJSON* mqttcfg1 = NULL;
     cJSON* mqttcfg2 = NULL;
     cJSON* mqttcfg2 = NULL;
+    cJSON* type =NULL;
     rt_kprintf("%s\n",json_string);
     rt_kprintf("%s\n",json_string);
     cJSON *root = cJSON_Parse(json_string);
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
     if(!root)
@@ -517,6 +518,18 @@ void parseDtu(char *json_string)
                   rt_free(photo);
                   rt_free(photo);
                   rt_thread_delay(2000);
                   rt_thread_delay(2000);
               }
               }
+              //远程给rtu重新上电
+              else if (strstr(item_cmd->valuestring,"ctrl")!=RT_NULL)
+              {
+                  type = cJSON_GetObjectItem(item_ext,"type");
+                  if(strstr(type->valuestring,"rtu_off_on")!=RT_NULL)
+                  {
+                      LOG_W("DTU 12V Power down");
+                      ctr_RTU_DTU(OFF);
+                      rt_thread_delay(5000);
+                      ctr_RTU_DTU(ON);
+                  }
+              }
               //水稻2000万像素的串口拍照指令
               //水稻2000万像素的串口拍照指令
               else if (strstr(item_cmd->valuestring,"mvs_photo")!=RT_NULL)
               else if (strstr(item_cmd->valuestring,"mvs_photo")!=RT_NULL)
               {
               {
@@ -579,14 +592,22 @@ void parseDtu(char *json_string)
                   //如果DTU的IMEI和FLash中的不一样,保存到FLASH
                   //如果DTU的IMEI和FLash中的不一样,保存到FLASH
                   if(strstr(imei->valuestring,device_status.imei)==RT_NULL)
                   if(strstr(imei->valuestring,device_status.imei)==RT_NULL)
                   {
                   {
-                      LOG_W("Change IMEI:%s-%s",imei->valuestring,device_status.imei);
-                      ef_set_env_blob("imei", imei->valuestring, sizeof(device_status.imei));  //IMEI
+                      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
                   //如果DTU的ICCID和FLash中的不一样,保存到FLASH
                   if(strstr(iccid->valuestring,device_status.iccid)==RT_NULL)
                   if(strstr(iccid->valuestring,device_status.iccid)==RT_NULL)
                   {
                   {
-                      LOG_W("Change ICCID:%s-%s",iccid->valuestring,device_status.iccid);
-                      ef_set_env_blob("iccid", iccid->valuestring, sizeof(device_status.iccid));  //IMEI
+                      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
+
                   }
                   }
                   sim = cJSON_GetObjectItem(item_ext,"sim");
                   sim = cJSON_GetObjectItem(item_ext,"sim");
                   rt_kprintf("DTU时间:%s",datetime->valuestring);
                   rt_kprintf("DTU时间:%s",datetime->valuestring);
@@ -641,8 +662,7 @@ void parseDtu(char *json_string)
                       sprintf(device_status.lat,"%s","34.8088073");
                       sprintf(device_status.lat,"%s","34.8088073");
                       sprintf(device_status.lng,"%s","113.6624298");
                       sprintf(device_status.lng,"%s","113.6624298");
                   }
                   }
-                  sprintf(device_status.iccid,"%s",iccid->valuestring);
-                  sprintf(device_status.imei,"%s",imei->valuestring);
+
                   sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
                   sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
                   sprintf(device_status.project,"%s",project->valuestring);
                   sprintf(device_status.project,"%s",project->valuestring);
                   sprintf(device_status.mqttcfg1,"%s",mqttcfg1->valuestring);
                   sprintf(device_status.mqttcfg1,"%s",mqttcfg1->valuestring);

+ 11 - 34
Application_CBD/applications/hmi.c

@@ -164,8 +164,9 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         }
         }
         rt_free(readinfo);
         rt_free(readinfo);
         device_status.refresh_num--;
         device_status.refresh_num--;
-        HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
-        HMI_WRITE("mqttcfg.mqtt2Message.txt=\"%s\"",device_status.mqttcfg2);
+        HMI_WRITE("workSta.iccid.txt=\"%s\"",device_status.iccid);
+        //HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
+        HMI_WRITE("uploadSet.t0.txt=\"%s\"",device_status.mqttcfg2);
         //更新固件版本号
         //更新固件版本号
         HMI_WRITE("debug.t3.txt=\"%s\"",device_status.driver);
         HMI_WRITE("debug.t3.txt=\"%s\"",device_status.driver);
         //更新固件编译日期
         //更新固件编译日期
@@ -663,7 +664,6 @@ void Check_ParamConfig(void)
         device_status.vol = 7;          //音量
         device_status.vol = 7;          //音量
         device_status.timeSwitch = 1;   //工作模式
         device_status.timeSwitch = 1;   //工作模式
         device_status.passWord = 8888;    //屏幕密码
         device_status.passWord = 8888;    //屏幕密码
-        device_status.sleep_p = 70;         //待机功耗
         device_status.work_done = 0;        //工作完成标志位
         device_status.work_done = 0;        //工作完成标志位
         device_status.dattim = 20;      //数据上传间隔
         device_status.dattim = 20;      //数据上传间隔
         device_status.ds = 1;           //设备状态
         device_status.ds = 1;           //设备状态
@@ -683,10 +683,6 @@ void Check_ParamConfig(void)
         ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));   //震动时间
         ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));   //震动时间
         ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
         ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
         ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
         ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
-        ef_set_env_blob("sleep_power", &device_status.sleep_p,sizeof(device_status.sleep_p));   //待机功耗
-        ef_set_env_blob("lat",&device_status.lat,sizeof(device_status.lat));        //纬度
-        ef_set_env_blob("lat",&device_status.lng,sizeof(device_status.lng));        //经度
-        ef_set_env_blob("lat",&device_status.stamp,sizeof(device_status.stamp));        //时间
         ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
         ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
         ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
         ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
         if(device_status.version_type==1)
         if(device_status.version_type==1)
@@ -708,7 +704,6 @@ void Check_ParamConfig(void)
         rt_kprintf("jheat:%d\n",device_status.heatvale);
         rt_kprintf("jheat:%d\n",device_status.heatvale);
         rt_kprintf("thsp:%d\n", device_status.thsp);
         rt_kprintf("thsp:%d\n", device_status.thsp);
         rt_kprintf("密码:%d\n",device_status.passWord);
         rt_kprintf("密码:%d\n",device_status.passWord);
-        rt_kprintf("待机电流:%d\n",device_status.sleep_p);
 
 
     }//从easyflash读取参数配置
     }//从easyflash读取参数配置
     else if (device_status.iSave==FLASH_FLAG) {
     else if (device_status.iSave==FLASH_FLAG) {
@@ -727,20 +722,13 @@ void Check_ParamConfig(void)
         ef_get_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim), NULL);                       //数据上传间隔
         ef_get_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim), NULL);                       //数据上传间隔
         ef_get_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp), NULL);                             //熄屏时间
         ef_get_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp), NULL);                             //熄屏时间
         ef_get_env_blob("passWord",&device_status.passWord,sizeof(device_status.passWord),NULL);                    //密码
         ef_get_env_blob("passWord",&device_status.passWord,sizeof(device_status.passWord),NULL);                    //密码
-        ef_get_env_blob("sleep_power",&device_status.sleep_p,sizeof(device_status.sleep_p),NULL);                   //待机功耗
-        ef_get_env_blob("up_motor_power",&device_status.up_motor_p,sizeof(device_status.up_motor_p),NULL);          //上仓门电机功耗
-        ef_get_env_blob("down_motor_power",&device_status.down_motor_p,sizeof(device_status.down_motor_p),NULL);    //下仓门电机功耗
-        ef_get_env_blob("clear_motor_power",&device_status.clear_motor_p,sizeof(device_status.clear_motor_p),NULL); //清扫仓门电机功耗
-        ef_get_env_blob("lamp_power",&device_status.lamp_p,sizeof(device_status.lamp_p),NULL);                      //镇流器功耗
-        ef_get_env_blob("hk_power",&device_status.hk_power,sizeof(device_status.hk_power),NULL);                    //海康相机功耗
-        ef_get_env_blob("led_power",&device_status.led_p,sizeof(device_status.led_p),NULL);                         //补光灯功耗
-        ef_get_env_blob("shake_power",&device_status.shake_p,sizeof(device_status.shake_p),NULL);                   //震动电机功耗
-        ef_get_env_blob("router_power",&device_status.router_p,sizeof(device_status.router_p),NULL);                //路由器功耗
-        ef_get_env_blob("rtu_power",&device_status.rtu_dtu_p,sizeof(device_status.rtu_dtu_p),NULL);                 //RTU功耗
-        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);                          //数据上传间隔
-        ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),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("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("version_type",&device_status.version_type,sizeof(device_status.version_type),NULL);        //版本类型
+        ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL);     //BL版本号 进BL的时候存储到FLASH
+        ef_get_env_blob("driver_compile",&device_status.driver_compile,sizeof(device_status.driver_compile),NULL);     //BL版本号 进BL的时候存储到FLASH
         device_status.light_over_tim = device_status.sunBar * 3600;                                                 //光控计数
         device_status.light_over_tim = device_status.sunBar * 3600;                                                 //光控计数
         device_status.work_done = 0;
         device_status.work_done = 0;
         //工作完成标志位
         //工作完成标志位
@@ -761,9 +749,8 @@ void Check_ParamConfig(void)
         else if (device_status.version_type==4) {
         else if (device_status.version_type==4) {
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
         }
         }
-        ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL);     //BL版本号 进BL的时候存储到FLASH
-        ef_get_env_blob("driver_compile",&device_status.driver_compile,sizeof(device_status.driver_compile),NULL);     //BL版本号 进BL的时候存储到FLASH
-        LOG_I("SOFTWARE VERSION:%s\n",device_status.driver);
+
+        LOG_I("SOFTWARE VERSION:%s-imei:%s\n",device_status.driver,device_status.imei);
         rt_kprintf("read flash paramconfis:%d-%s-%s\r\n",device_status.version_type,device_status.driver_bl,device_status.driver_compile);
         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.rebootcnt);
         rt_kprintf("收集时间:%d\n",device_status.clt_time);
         rt_kprintf("收集时间:%d\n",device_status.clt_time);
@@ -779,16 +766,6 @@ void Check_ParamConfig(void)
         rt_kprintf("低温保护:%d\n",device_status.tpl);
         rt_kprintf("低温保护:%d\n",device_status.tpl);
         rt_kprintf("thsp:%d\n", device_status.thsp);
         rt_kprintf("thsp:%d\n", device_status.thsp);
         rt_kprintf("密码:%d\n",device_status.passWord);
         rt_kprintf("密码:%d\n",device_status.passWord);
-        rt_kprintf("待机电流:%d\n",device_status.sleep_p);
-        rt_kprintf("上仓门电机电流:%d\n",device_status.up_motor_p);
-        rt_kprintf("下仓门电机电流:%d\n",device_status.down_motor_p);
-        rt_kprintf("清扫电机电流:%d\n",device_status.clear_motor_p);
-        rt_kprintf("镇流器电流:%d\n",device_status.lamp_p);
-        rt_kprintf("海康相机电流:%d\n",device_status.hk_power);
-        rt_kprintf("震动电机电流:%d\n",device_status.shake_p);
-        rt_kprintf("路由器电流:%d\n",device_status.router_p);
-        rt_kprintf("RTU/DTU电流:%d\n",device_status.rtu_dtu_p);
-        rt_kprintf("加热带电流:%d\n",device_status.heat_p);
         rt_kprintf("数据上传间隔:%d\n",device_status.dattim);
         rt_kprintf("数据上传间隔:%d\n",device_status.dattim);
     }
     }
     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);
     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);

+ 2 - 0
Application_CBD/applications/main.c

@@ -119,6 +119,8 @@ static void idle_hook(void)
     alarm_new =*localtime(&now);
     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)==9&&(alarm_new.tm_min==0)&&(alarm_new.tm_sec==0))
     {
     {
+        ctr_RTU_DTU(OFF);
+        rt_thread_delay(2000);
         rt_hw_cpu_reset();
         rt_hw_cpu_reset();
     }
     }
 //    else {
 //    else {

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

@@ -57,17 +57,6 @@ static const ef_env default_env_set[] = {
         {"tpl","5"},        //低温保护
         {"tpl","5"},        //低温保护
         {"vol","30"},        //音量
         {"vol","30"},        //音量
         {"passWord","0"},    //屏幕密码
         {"passWord","0"},    //屏幕密码
-        {"sleep_power","0"},//待机功耗
-        {"up_motor_power","0"},//上仓门功耗
-        {"down_motor_power","0"},//下仓门功耗
-        {"clear_motor_power","0"},//清扫电机功耗
-        {"shake_motor_power","0"},//震动电机功率
-        {"lamp_power","0"}, //镇流器功耗
-        {"hk_power","0"},   //海康相机功耗
-        {"led_power","0"},  //补光灯功耗
-        {"heat_power","0"}, //加热带功耗
-        {"rtu_power","0"},  //RTU功耗
-        {"shake_power",0},  //震动功耗
         {"shake_sw","0"},   //震动开关
         {"shake_sw","0"},   //震动开关
         {"shake_sec","1"},  //震动时间
         {"shake_sec","1"},  //震动时间
         {"dattim","20"},    //数据上传间隔
         {"dattim","20"},    //数据上传间隔

+ 23 - 1
Application_CBD/readme.md

@@ -47,4 +47,26 @@ void ymodem_ota(uint8_t argc, char **argv)
 ## 2021-03-25-版本:1.5.41(HK)
 ## 2021-03-25-版本:1.5.41(HK)
 - HMI_THREAD_PRIORITY         26>24          //线程优先级
 - HMI_THREAD_PRIORITY         26>24          //线程优先级
 ## 2021-03-26-版本:1.5.41(HK)
 ## 2021-03-26-版本:1.5.41(HK)
-- 屏幕串口4波特率修改,9600>115200
+- 屏幕串口4波特率修改,9600>115200
+## 2021-04-0-版本:1.5.41(HK)
+- 定时重启增加关闭DTU供电,开机初始化打开供电
+- 增加远程断电:
+{"ext": {"type": "rtu_off_on"}, "cmd": "ctrl"}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 1 - 1
CBD_FOTA_BootLoader/applications/main.c

@@ -77,7 +77,7 @@ int Ota_uart2_init(void)
 {
 {
      otaserial  = rt_device_find("uart4");
      otaserial  = rt_device_find("uart4");
     /*修改串口配置参数*/
     /*修改串口配置参数*/
-         otaconfig.baud_rate = BAUD_RATE_9600;  //修改波特率115200
+         otaconfig.baud_rate = BAUD_RATE_115200;  //修改波特率115200
          otaconfig.data_bits = DATA_BITS_8;     //数据位8
          otaconfig.data_bits = DATA_BITS_8;     //数据位8
          otaconfig.stop_bits = STOP_BITS_1;     //停止位1
          otaconfig.stop_bits = STOP_BITS_1;     //停止位1
          otaconfig.bufsz = 1024;                 //缓冲区1k
          otaconfig.bufsz = 1024;                 //缓冲区1k