zhunk 7 meses atrás
pai
commit
653b74d1a6

+ 1 - 1
Application_CBD/.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="1271424796576257041" 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="1293618710119634749" 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>

+ 5 - 2
Application_cbd_apm32f1/applications/control.c

@@ -1602,7 +1602,11 @@ void WorkTask(void)
     static int heat_time = 0;
     LOG_I("工作状态:%d",device_status.work_status);
     LOG_I("开关机状态:%d",device_status.ds);
-    while(device_status.work_status==1&&device_status.temp_status==0&&device_status.bat_status==0&&device_status.rain_status==0&&device_status.ds==1&&device_status.clear_status==0)
+    while(device_status.clear_status==1){
+        LOG_I("等待清扫执行完成....");
+        rt_thread_delay(1000);
+    }
+    while(device_status.work_status==1&&device_status.temp_status==0&&device_status.bat_status==0&&device_status.rain_status==0&&device_status.ds==1)
     {
         device_status.work_done = 0;
         if(clt_time==0)
@@ -1952,7 +1956,6 @@ static void Control_Check_thread_entry(void *parameter)
         if(device_status.update_flag==1) break;
         if(device_status.work_status==1&&device_status.heat_sw==1)
         {
-
             calorstat(device_status.heattime*60);
             rt_thread_delay(10000);
         }

+ 2 - 2
Application_cbd_apm32f1/applications/control.h

@@ -38,9 +38,9 @@
 #else
     #define VERSION_HK          "2.35.41(HK)"            //4.0海康-1200W
     #if TG_MODULE == 0
-    #define VERSION_HK_2000W    "2.35.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.36.4(2000W)"         //4.0水稻
     #else
-    #define VERSION_HK_2000W    "2.6.4(TG)"             //推杆结构
+    #define VERSION_HK_2000W    "2.7.4(TG)"             //推杆结构
     #endif
 #endif
 

+ 2 - 4
Application_cbd_apm32f1/applications/hmi.c

@@ -1601,10 +1601,8 @@ static void Ctr_Mortor_entry(void* parameter)
             {
                 ctr_led(OFF);
                 device_status.photo_ws = 0;
-                if(device_status.work_status==1)
-                {
-                    device_status.clear_status = 1;
-                }
+                photo_led_sec = 900;
+                device_status.clear_status = 1;
                 HMI_WRITE("sysTest.switchPhoto.val=0");
                 HMI_WRITE("sysTest.switchFill.val=0");
             }

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2026-04-23 更新说明
+	"2.7.4(TG)"
+	"2.36.4(2000W)"
+	拍照完成后执行清扫,不加工作状态判断!
 # 2026-03-13 更新说明
 	"2.35.4(2000W)"
 	1. 修复测试加热开关,状态界面不更新