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

Разлика између датотеке није приказан због своје велике величине
+ 2 - 2
Application_CBD/.cproject


+ 3 - 3
Application_CBD/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Sat Oct 24 16:25:44 CST 2020
-mcu_name=STM32F101RETX
+#Wed Jun 16 18:20:33 CST 2021
 output_project_path=D\:/RT-ThreadStudio/workspace
+mcu_name=STM32F101RETX
 hardware_adapter=ST-LINK
-selected_rtt_version=v4.0.2
 mcu_base_nano_proj=false
+selected_rtt_version=v4.0.2
 project_base_bsp=false
 cfg_version=v2.0

+ 33 - 20
Application_CBD/applications/control.c

@@ -254,8 +254,8 @@ uint8_t ctr_clear(uint16_t status_clear)
         //已到达检测位置
         if(rt_pin_read(CLEAR_L_LIMIT)==1||rt_pin_read(CLEAR_R_LIMIT)==1)
         {
-            rt_pin_write(CLEAR_R,OFF);
-            rt_pin_write(CLEAR_L,OFF);
+            rt_pin_write(CLEAR_R,ON);
+            rt_pin_write(CLEAR_L,ON);
             rt_thread_delay(2000);
             break;
         }
@@ -263,8 +263,8 @@ uint8_t ctr_clear(uint16_t status_clear)
         {
             rt_kprintf("Clear Motor ERR:%d",atoi(device_status.power));
             DTU_Write("%s",makeJson_Warn("Clear Motor ERR","device"));
-            rt_pin_write(CLEAR_R,OFF);
-            rt_pin_write(CLEAR_L,OFF);
+            rt_pin_write(CLEAR_R,ON);
+            rt_pin_write(CLEAR_L,ON);
             rt_free(makeJson_Warn("Clear Motor ERR","device"));
             if(Read_Real_Voltage()/100<12)
             {
@@ -288,8 +288,8 @@ uint8_t ctr_clear(uint16_t status_clear)
         {
             rt_kprintf("Clear Motor ERR:%d",atoi(device_status.power));
             DTU_Write("%s",makeJson_Warn("Clear Motor ERR","device"));
-            rt_pin_write(CLEAR_R,OFF);
-            rt_pin_write(CLEAR_L,OFF);
+            rt_pin_write(CLEAR_R,ON);
+            rt_pin_write(CLEAR_L,ON);
             rt_free(makeJson_Warn("Clear Motor ERR","device"));
             if(Read_Real_Voltage()/100<12)
             {
@@ -304,8 +304,8 @@ uint8_t ctr_clear(uint16_t status_clear)
     clear_num = 0;
     while(rt_pin_read(CLEAR_L_LIMIT)==1||rt_pin_read(CLEAR_R_LIMIT)==1||(Read_Real_Voltage()/100)<12)
     {
-        rt_pin_write(CLEAR_R,OFF);
-        rt_pin_write(CLEAR_L,OFF);
+        rt_pin_write(CLEAR_R,ON);
+        rt_pin_write(CLEAR_L,ON);
         if(Read_Real_Voltage()/100<12)
         {
             HMI_WRITE("cangWei.rotateFlag.val=%d",0);
@@ -327,8 +327,8 @@ uint8_t ctr_clear(uint16_t status_clear)
             rt_kprintf("Clear Motor ERR:%d",atoi(device_status.power));
             char * Clear_ERR = makeJson_Warn("Clear Motor ERR","device");
             DTU_Write("%s",Clear_ERR);
-            rt_pin_write(CLEAR_R,OFF);
-            rt_pin_write(CLEAR_L,OFF);
+            rt_pin_write(CLEAR_R,ON);
+            rt_pin_write(CLEAR_L,ON);
             rt_free(Clear_ERR);
             if(Read_Real_Voltage()/100<12)
             {
@@ -342,8 +342,8 @@ uint8_t ctr_clear(uint16_t status_clear)
     }
     while(rt_pin_read(CLEAR_L_LIMIT)==1||rt_pin_read(CLEAR_R_LIMIT)==1)
     {
-        rt_pin_write(CLEAR_R,OFF);
-        rt_pin_write(CLEAR_L,OFF);
+        rt_pin_write(CLEAR_R,ON);
+        rt_pin_write(CLEAR_L,ON);
         rt_thread_delay(2000);
         break;
     }
@@ -353,12 +353,14 @@ uint8_t ctr_clear(uint16_t status_clear)
         char * Clear_ERR = makeJson_Warn("Clear Motor Limit Not Access","device");
         DTU_Write("%s",Clear_ERR);
         rt_free(Clear_ERR);
-        rt_pin_write(CLEAR_R,OFF);
-        rt_pin_write(CLEAR_L,OFF);
+        rt_pin_write(CLEAR_R,ON);
+        rt_pin_write(CLEAR_L,ON);
         return 0;
     }
     clear_num = 0;
-    rt_thread_delay(1000);
+    rt_thread_delay(3000);
+    rt_pin_write(CLEAR_R,OFF);
+    rt_pin_write(CLEAR_L,OFF);
     HMI_WRITE("cangWei.rotateFlag.val=%d",0);
     HMI_WRITE("sysTest.switchClear.val=%d",0);
     device_status.clear_status = 0;
@@ -405,9 +407,9 @@ void ctr_TG_Clear(uint16_t clear_timeout)
         clear_count--;
         rt_thread_delay(100);
     }
-    rt_pin_write(CLEAR_R,OFF);
-    rt_pin_write(CLEAR_L,OFF);
-    rt_thread_delay(2000);
+    rt_pin_write(CLEAR_R,ON);
+    rt_pin_write(CLEAR_L,ON);
+    rt_thread_delay(3000);
     while(clear_timeout!=clear_count)
     {
         rt_pin_write(CLEAR_R,OFF);
@@ -415,9 +417,11 @@ void ctr_TG_Clear(uint16_t clear_timeout)
         clear_count++;
         rt_thread_delay(100);
     }
+    rt_pin_write(CLEAR_R,ON);
+    rt_pin_write(CLEAR_L,ON);
+    rt_thread_delay(3000);
     rt_pin_write(CLEAR_R,OFF);
     rt_pin_write(CLEAR_L,OFF);
-    rt_thread_delay(1000);
     HMI_WRITE("cangWei.rotateFlag.val=%d",0);
     HMI_WRITE("sysTest.switchClear.val=%d",0);
 }
@@ -487,6 +491,7 @@ void calorstat(uint16_t heat_time)
             break;
         }
         rt_thread_delay(1000);
+        rt_kprintf("=======正在加热======:%d-%d\n",n,heat_time);
     }
     ctr_Heat(OFF);
 }
@@ -899,6 +904,8 @@ void WorkTast(void)
             //清扫
             if(ctr_clear(1200)==0)
             ctr_TG_Clear(250);
+            //清扫失效则使用震动
+            //ctr_shake(ON, 100);
         }
     }
     if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1||device_status.ds==0)
@@ -917,11 +924,17 @@ void WorkTast(void)
 /* 入口函数-工作状态检测 */
 static void Work_status_thread_entry(void *parameter)
 {
+    static uint16_t sun_status_num = 300;
     //如果是光控定时,进行光控监测的消抖
      if(device_status.timeSwitch==0&&device_status.sun_status==0)
      {
         rt_kprintf("光控定时!!!\n");
-        rt_thread_delay(1000*200);
+        while(sun_status_num!=0)
+        {
+            sun_status_num--;
+            rt_thread_delay(1000);
+            rt_kprintf("开机光控检测:%d\n",sun_status_num);
+        }
         time_t now;
         time(&now);
         static struct tm nowstamp;

+ 3 - 3
Application_CBD/applications/control.h

@@ -14,10 +14,10 @@
 
 #include <rtdevice.h>
 
-#define VERSION_HK "1.19.41(HK)"         //版本
-#define VERSION_ZP "1.19.1(ZP)"         //版本
+#define VERSION_HK "1.22.41(HK)"         //版本
+#define VERSION_ZP "1.22.1(ZP)"         //版本
 
-#define CompileTime "20210611"
+#define CompileTime "20210621"
 
 
 /*******************************测试任务****************************************/

+ 159 - 65
Application_CBD/applications/dtu_uart2.c

@@ -569,6 +569,14 @@ void parseDtu(char *json_string)
                   rt_free(photo);
                   rt_thread_delay(2000);
               }
+              else if (strstr(item_cmd->valuestring,"shake")!=RT_NULL)
+              {
+                  ctr_shake(ON, 30);
+                  char *shake = makeJson_Warn("shake","control");
+                  DTU_Write("%s",shake);
+                  rt_free(shake);
+                  rt_thread_delay(2000);
+              }
               //远程给rtu重新上电
               else if (strstr(item_cmd->valuestring,"ctrl")!=RT_NULL)
               {
@@ -788,97 +796,183 @@ void parseDtu(char *json_string)
                           htim = cJSON_GetObjectItem(item_ext,"htim");
                           ds = cJSON_GetObjectItem(item_ext,"ds");
                           vt = cJSON_GetObjectItem(item_ext,"vt");
-                          if(atoi(hst->valuestring)>10&&atoi(hst->valuestring)<150&&hst!=NULL)
+                          if(hst!=NULL)
                           {
-                              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(hst->valuestring)>10&&atoi(hst->valuestring)<150)
+                              {
+                                  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));
+                              }
+                              else {
+                                  rt_kprintf("加热温度hst设置失败参数错误!!!\n");
+                            }
                           }
-                          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 (st!=NULL)
+                          {
+                              if(atoi(st->valuestring)>=0&&atoi(st->valuestring)<=23)
+                              {
+                                  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 {
+                                  rt_kprintf("开始时间st设置失败参数错误!!!\n");
+                            }
                           }
 
-                          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(et!=NULL)
+                          {
+                              if(atoi(et->valuestring)>=0&&atoi(et->valuestring)<=23)
+                              {
+                                  device_status.stopBar = atoi(et->valuestring);
+                                  ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));      //结束时间
+                                  rt_kprintf("结束时间et:%d\n",atoi(et->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("结束时间et设置失败参数错误!!!\n");
+                            }
                           }
 
-                          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",atoi(collt->valuestring));
+                          if(collt!=NULL)
+                          {
+                              if(atoi(collt->valuestring)>=1&&atoi(collt->valuestring)<=60)
+                              {
+                                  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",atoi(collt->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("收集时间collt设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(datt->valuestring)>=1&&atoi(datt->valuestring)<=60&&datt!=NULL)
+                          if(datt!=NULL)
                           {
-                              device_status.dattim = atoi(datt->valuestring);
-                              ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
-                              rt_kprintf("数据上传间隔datt:%d\n",atoi(datt->valuestring));
+                              if(atoi(datt->valuestring)>=1&&atoi(datt->valuestring)<=60)
+                              {
+                                  device_status.dattim = atoi(datt->valuestring);
+                                  ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
+                                  rt_kprintf("数据上传间隔datt:%d\n",atoi(datt->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("数据上传间隔datt设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(shake_sec->valuestring)>=1&&atoi(shake_sec->valuestring)<=10&&shake_sec!=NULL)
+                          if(shake_sec!=NULL)
                           {
-                              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",atoi(shake_sec->valuestring));
+                              if(atoi(shake_sec->valuestring)>=1&&atoi(shake_sec->valuestring)<=10)
+                              {
+                                  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",atoi(shake_sec->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("震动时间shake_sec设置失败参数错误!!!\n");
+                            }
                           }
-                          if((atoi(shake->valuestring)==0||atoi(shake->valuestring)==1)&&shake!=NULL)
+                          if(shake!=NULL)
                           {
-                              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",atoi(shake->valuestring));
+                              if(atoi(shake->valuestring)==0||atoi(shake->valuestring)==1)
+                              {
+                                  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",atoi(shake->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("震动开关shake设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(tt->valuestring)>=1&&atoi(tt->valuestring)<=10&&tt!=NULL)
+                          if(tt!=NULL)
                           {
-
-                              device_status.sunBar = atoi(tt->valuestring);
-                              ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));         //光控定时
-                              rt_kprintf("光控定时tt:%d\n",atoi(tt->valuestring));
+                              if(atoi(tt->valuestring)>=1&&atoi(tt->valuestring)<=10)
+                              {
+                                  device_status.sunBar = atoi(tt->valuestring);
+                                  ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));         //光控定时
+                                  rt_kprintf("光控定时tt:%d\n",atoi(tt->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("光控定时tt设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(htim->valuestring)>=1&&atoi(htim->valuestring)<=30&&htim!=NULL)
+                          if(htim!=NULL)
                           {
-                              device_status.heattime = atoi(htim->valuestring);
-                              ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));      //加热时间
-                              rt_kprintf("加热时长htim:%d\n",atoi(htim->valuestring));
+                              if(atoi(htim->valuestring)>=1&&atoi(htim->valuestring)<=30)
+                              {
+                                  device_status.heattime = atoi(htim->valuestring);
+                                  ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));      //加热时间
+                                  rt_kprintf("加热时长htim:%d\n",atoi(htim->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("加热时长htim设置失败参数错误!!!\n");
+                            }
                           }
-                          if((atoi(ts->valuestring)==0||atoi(ts->valuestring)==1)&&ts!=NULL)
+                          if(ts!=NULL)
                           {
-                              device_status.timeSwitch = atoi(ts->valuestring);
-                              ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch)); //工作模式
-                              time_t now;
-                              time(&now);
-                              static struct tm nowstamp;
-                              nowstamp =*localtime(&now);
-                              nowstamp.tm_hour = nowstamp.tm_hour - 8;
-                              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",atoi(ts->valuestring));
+                              if(atoi(ts->valuestring)==0||atoi(ts->valuestring)==1)
+                              {
+                                  device_status.timeSwitch = atoi(ts->valuestring);
+                                  ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch)); //工作模式
+                                  time_t now;
+                                  time(&now);
+                                  static struct tm nowstamp;
+                                  nowstamp =*localtime(&now);
+                                  nowstamp.tm_hour = nowstamp.tm_hour - 8;
+                                  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",atoi(ts->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("定时模式ts设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(tpl->valuestring)>=-50&&atoi(tpl->valuestring)<=50&&tpl!=NULL)
+                          if(tpl!=NULL)
                           {
-                              device_status.tpl = atoi(tpl->valuestring);
-                              ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl)); //低温保护
-                              rt_kprintf("低温保护tpl:%d\n",atoi(tpl->valuestring));
+                              if(atoi(tpl->valuestring)>=-50&&atoi(tpl->valuestring)<=50)
+                              {
+                                  device_status.tpl = atoi(tpl->valuestring);
+                                  ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl)); //低温保护
+                                  rt_kprintf("低温保护tpl:%d\n",atoi(tpl->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("低温保护tpl设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(tph->valuestring)>=50&&atoi(tpl->valuestring)<=80&&tph!=NULL)
+                          if(tph!=NULL)
                           {
-                              device_status.tph = atoi(tph->valuestring);
-                              ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph)); //高温保护
-                              rt_kprintf("高温保护tph:%d\n",atoi(tph->valuestring));
+                              if(atoi(tph->valuestring)>=50&&atoi(tpl->valuestring)<=80)
+                              {
+                                  device_status.tph = atoi(tph->valuestring);
+                                  ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph)); //高温保护
+                                  rt_kprintf("高温保护tph:%d\n",atoi(tph->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("高温保护tph设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(ds->valuestring)>=0&&atoi(ds->valuestring) <=1&&ds!=NULL)
+                          if(ds!=NULL)
                           {
-                              device_status.ds = atoi(ds->valuestring);
-                              ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
-                              rt_kprintf("开关机状态:%d\n",atoi(ds->valuestring));
+                              if(atoi(ds->valuestring)>=0&&atoi(ds->valuestring) <=1)
+                              {
+                                  device_status.ds = atoi(ds->valuestring);
+                                  ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
+                                  rt_kprintf("开关机状态:%d\n",atoi(ds->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("开关机状态设置失败参数错误!!!\n");
+                            }
                           }
-                          if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=10&&vt!=NULL)
+                          if(vt!=NULL)
                           {
-                              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",atoi(vt->valuestring));
+                              if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=10)
+                              {
+                                  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",atoi(vt->valuestring));
+                              }
+                              else {
+                                  rt_kprintf("版本类型设置失败参数错误!!!\n");
+                            }
                           }
                           MA_save();
                           rt_thread_delay(2000);

+ 6 - 5
Application_CBD/applications/sht30_collect.c

@@ -49,7 +49,6 @@ int8_t hum_value,tem_value;
 static rt_thread_t tid1 = RT_NULL;
 static rt_thread_t tid2 = RT_NULL;
 ADC_HandleTypeDef hadc1;
-
 /*串口初始化*/
 int UART_485_INIT(void)
 {
@@ -128,20 +127,22 @@ static void sht30_collect_thread_entry(void *parameter)
         if(Read_Light_Voltage()>500)
         {
             checklightnum++;
-            if(checklightnum==60)
+            if(checklightnum==40)
             {
                 device_status.sun_status = 1;
+                checklightnum =0;
             }
-            checknightnum = 0;
+
         }
         else {
             checknightnum ++;
-            if(checknightnum==60)
+            if(checknightnum==40)
             {
                 device_status.sun_status = 0;
+                checknightnum = 0;
             }
-            checklightnum = 0;
         }
+        rt_kprintf("光控计数:%d-%d\n",checklightnum,checknightnum);
         rt_thread_mdelay(5000);
     }
 }

+ 17 - 1
Application_CBD/readme.md

@@ -164,4 +164,20 @@ RAM:            19072 B               18.62 KB
 #define CompileTime "20210611"
 ## 更新说明
 - 1.开机光控优化
-- 2.时控工作时下发参数设置导致工作流程异常
+	开机未检测光照的等待时间200s改为320s
+#define VERSION_HK "1.20.41(HK)"         //版本
+#define VERSION_ZP "1.20.1(ZP)"         //版本
+#define CompileTime "20210617"
+- 1.时控工作时下发参数设置导致工作流程异常
+	原因是数据解析中版本vt字段判断问题导致
+#define VERSION_HK "1.21.41(HK)"         //版本
+#define VERSION_ZP "1.21.1(ZP)"         //版本
+#define CompileTime "20210618"
+- 1.电机停止刹车
+https://item.szlcsc.com/114902.html		插件电阻 > 1Ω(1R00) ±1%  
+https://item.szlcsc.com/754502.html     100欧姆插件电阻,金属膜,功率3W
+https://item.szlcsc.com/245499.html     直插瓷片电容 > 470pF ±10% 500V 
+#define VERSION_HK "1.22.41(HK)"         //版本
+#define VERSION_ZP "1.22.1(ZP)"         //版本
+#define CompileTime "20210621"
+- 1.清扫完毕震动