zhunk 1 год назад
Родитель
Сommit
6cd564371b

+ 6 - 28
Application_CBD/applications/control.c

@@ -792,11 +792,6 @@ uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num)
 //震动电机
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
-    static rt_uint16_t shake_i = 0;
-    shake_i = atoi(device_status.power);
-    LOG_I("震动电机待机电流:%d",shake_i);
-    if(device_status.dtype==7&&shake_sec!=0)
-        DTU_Write("drop");
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     #if 0
     rt_pin_write(SHAKE_SW,ON);
@@ -804,32 +799,16 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
     #endif
     if(status_shake==ON&&device_status.shake_ws==1)
     {
-        #if 0
-        for(int8_t s = 0;s++;s<2)
-        {
-            rt_pin_write(SHAKE_SW,ON);
-            rt_thread_delay(100);
-            rt_pin_write(SHAKE_SW,OFF);
-            rt_thread_delay(1000);
-        }
-        #endif
-
-        rt_pin_write(SHAKE_SW,ON);
         if(device_status.dtype==3)
         {
-            while(shake_sec--)
+            for(uint8_t shake_i = 0;shake_i<shake_sec;shake_i++)
             {
+                rt_pin_write(SHAKE_SW,ON);
                 rt_thread_delay(100);
-                if(shake_sec==20&&device_status.clear_status==0&&device_status.work_status==1&&atoi(device_status.power)-shake_i<100&&shake_i!=0&&shake_i<5000)
-                {
-                    char * shake_warn = makeJson_Warn("电流不足", "震动电机");
-                    DTU_Write("%s",shake_warn);
-                    rt_free(shake_warn);
-                }
-                LOG_D("震动电机:%d",atoi(device_status.power));
+                rt_pin_write(SHAKE_SW,OFF);
+                rt_thread_delay(1000);
             }
         }
-        if(device_status.dtype==7)  rt_thread_delay(shake_sec*1000);
         rt_pin_write(SHAKE_SW,OFF);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
     }
@@ -838,10 +817,9 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
         rt_pin_write(SHAKE_SW,OFF);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
     }
-    if(device_status.dtype==7)
-    HMI_WRITE("sysTest.switchDrop.val=%d",OFF);
     return status_shake;
 }
+
 //补光
 uint8_t ctr_led(uint8_t status_led)
 {
@@ -2724,7 +2702,7 @@ static void Control_Clear_thread_entry(void *parameter)
         if(device_status.clear_status==1)
         {
             ///if(ctr_clear(1200)==0)
-            ctr_TG_Clear(400);
+            ctr_TG_Clear(500);  //2025-1021,由400修改为500,解决金朵推杆慢导致行程走不完
         }
         rt_thread_delay(100);
         #endif

+ 4 - 4
Application_CBD/applications/control.h

@@ -26,12 +26,12 @@
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
 #else
-    #define VERSION_HK          "1.59.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "1.59.40(2000W)"         //4.0水稻
+    #define VERSION_HK          "1.60.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.60.40(2000W)"         //4.0水稻
 #endif
 
-#define VERSION_ZP          "1.59.1(ZP)"            //1.0转盘
-#define VERSION_GK          "1.59.1(GK)"            //1.0高空
+#define VERSION_ZP          "1.60.1(ZP)"            //1.0转盘
+#define VERSION_GK          "1.60.1(GK)"            //1.0高空
 
 #define VERSION_XCT         "1.13.6(HK)"            //吸虫塔-海康
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人

+ 1 - 0
Application_CBD/applications/dtu_uart2.c

@@ -86,6 +86,7 @@ void DTU_Write(char *fmt, ...)
         str_length = 1024 - 1;
     rt_device_write(dtuserial, 0, dtu_str, str_length);
     LOG_D("DTU_Write:%s",dtu_str);
+    rt_thread_delay(10);
 }
 
 /* 接收数据回调函数 */

+ 10 - 1
Application_CBD/readme.md

@@ -1,6 +1,15 @@
+
+# 2025-10-21 更新说明
+	清扫推杆输出时间由40s改为50s
+# 2025-10-13 更新说明
+	#define VERSION_HK          "1.60.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.60.40(2000W)"         //4.0水稻
+	#define VERSION_ZP          "1.60.1(ZP)"            //1.0转盘
+	#define VERSION_GK          "1.60.1(GK)"            //1.0高空
+	1.震动函数调整,周期100模式,1000ms停顿;
+
 # 2025-09-25 更新说明
 	转仓修改为每天8:00
-
 # 2025-08-28 更新说明
 	#define VERSION_HK          "1.59.41(HK)"            //4.0海康-1200W
     #define VERSION_HK_2000W    "1.59.40(2000W)"         //4.0水稻

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370230865913647974" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1369183061114295484" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>