yf_zjb 2 gadi atpakaļ
vecāks
revīzija
a48a638c81

BIN
Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.bin


BIN
Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.elf


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 969 - 969
Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.map


BIN
Application_BZYV2-NHT/Debug/applications/beep.o


BIN
Application_BZYV2-NHT/Debug/applications/control.o


BIN
Application_BZYV2-NHT/Debug/applications/dtu_uart2.o


BIN
Application_BZYV2-NHT/Debug/applications/hmi.o


BIN
Application_BZYV2-NHT/Debug/applications/main.o


+ 1 - 1
Application_BZYV2-NHT/applications/beep.c

@@ -115,7 +115,7 @@ void Motor_Juandai(uint8_t on_off)
 void Motor_Qingsao_R_PWM(uint8_t on_off)
 {
     pwm8_init();
-    rt_pwm_set(pwm_tim8, PC7_TIM3_CH, 200000, 150000);//channel,period,pulse
+    rt_pwm_set(pwm_tim8, PC7_TIM3_CH, 200000, 100000);//channel,period,pulse
     if(on_off==ON){
         rt_pwm_enable(pwm_tim8, PC7_TIM3_CH);
     }

+ 8 - 6
Application_BZYV2-NHT/applications/control.c

@@ -2545,7 +2545,8 @@ void slidelock()
 //限位开关判断函数
 void turnlimit(void)
 {
-    Motor_shake(ON,0);
+    //Motor_shake(ON,0);
+    Motor_Qingsao_R_PWM(ON);
     static uint16_t turn_timeout = 0;
 
     rt_pin_mode(LIMIT_DOWN,PIN_MODE_INPUT);
@@ -2558,7 +2559,7 @@ void turnlimit(void)
             //ctr_cangmen_down(CLOSE);
             rt_thread_delay(50);
             turn_timeout++;
-            if(turn_timeout==100){
+            if(turn_timeout==200){
                 char *translate = makeJson_Warn("translate","limit timeout");
                 DTU_Write("%s",translate);
                 rt_free(translate);
@@ -2574,7 +2575,7 @@ void turnlimit(void)
         {
             turn_timeout++;
             rt_thread_delay(5);
-            if(turn_timeout==1000){
+            if(turn_timeout==2000){
                 char *translate = makeJson_Warn("translate","limit timeout");
                 DTU_Write("%s",translate);
                 rt_free(translate);
@@ -2589,15 +2590,16 @@ void turnlimit(void)
         rt_thread_delay(20);
         if(rt_pin_read(LIMIT_DOWN)==0)
         {
-            Motor_shake(OFF,0);
+            //Motor_shake(OFF,0);
+            Motor_Qingsao_R_PWM(OFF);
             break;
         }
         else {
             break;
         }
     }
-    Motor_shake(OFF,0);
-
+    //Motor_shake(OFF,0);
+    Motor_Qingsao_R_PWM(OFF);
     turn_timeout = 0;
     char *translate = makeJson_Warn("translate","done");
     DTU_Write("%s",translate);

+ 1 - 1
Application_BZYV2-NHT/applications/control.h

@@ -33,7 +33,7 @@
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
-#define VERSION_BZY         "2.4"                   //孢子仪
+#define VERSION_BZY         "2.6.1"                   //孢子仪
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/

+ 0 - 1
Application_BZYV2-NHT/applications/hmi.c

@@ -1360,7 +1360,6 @@ static void Ctr_Mortor_entry(void* parameter)
             DTU_Write("%s",photo);
             rt_free(photo);
             device_status.autotakepic = 0;
-            ctr_Cold(OFF);
         }
         if(device_status.fsl_sw==1)
         {

BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 768 - 767
Application_CBD/Debug/Application_CBD.map


BIN
Application_CBD/Debug/applications/main.o


BIN
Application_CBD/Debug/applications/sht30_collect.o


BIN
Application_CBD/Debug/rt-thread/src/kservice.o


BIN
Application_CBD/Debug/rtthread.rbl


+ 1 - 1
Application_CBD/applications/control.h

@@ -38,7 +38,7 @@
 
 
 
-#define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
+#define CompileTime         sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
 typedef struct  _packed
 {

+ 10 - 5
Application_CBD/applications/sht30_collect.c

@@ -149,6 +149,7 @@ static void sht30_collect_thread_entry(void *parameter)
 static void Power_ReadCheck(void *parameter)
 {
     int rain_cnt = 0;
+    int bat_cnt = 0;
     int RV;
     while(1)
     {
@@ -164,15 +165,16 @@ static void Power_ReadCheck(void *parameter)
                     ctr_cangmen_up(OFF);    //关闭上仓门输出(散热)
                     #endif
                 }
-        if(Read_Real_Voltage()/100<21)
+        if(Read_Real_Voltage()/100<22)
         {
             #if ROBOT_EN == 1
             ctr_led(OFF);
             HMI_WRITE("sleep=%d",1);
             #endif
-            device_status.bat_status = 1; //欠压
-        }
-        else {
+            bat_cnt++;
+        }else if(Read_Real_Voltage()/100>23)
+        {
+            bat_cnt = 0;
             device_status.bat_status = 0; //解除欠压
             ctr_router(ON);               //打开路由器供电
             ctr_photo(ON);                //打开相机供电
@@ -248,7 +250,10 @@ static void Power_ReadCheck(void *parameter)
                 }
             }
         }
-
+        if(bat_cnt>=1000){  //持续10s
+            bat_cnt = 0;
+            device_status.bat_status = 1; //欠压
+        }
         #if ROBOT_EN == 0
         rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
         //LOG_D("voltage is:%sV",device_status.voltage);

+ 3 - 0
Application_CBD/readme.md

@@ -1,3 +1,6 @@
+# 2024-05-20 更新说明
+1. 欠压检测消抖,10s
+2. 欠压保护电压设置为22V
 # 2024-03-21 更新说明
 1. 取消1.0开机初始化转仓;版本变更为1.44.1