Browse Source

比赛设备,还原为早期的单仓结构支持,调整电机控制

niujiuru 4 months atrás
parent
commit
ef85ab1092

BIN
Application_cbd_apm32f1/.settings/.rtmenus


+ 1 - 1
Application_cbd_apm32f1/.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="-406456977695124745" 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="-495673559781908112" 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>

+ 2 - 2
Application_cbd_apm32f1/.settings/projcfg.ini

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Mon Apr 21 16:30:25 CST 2025
+#Fri Jun 26 10:16:48 CST 2026
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None
@@ -18,6 +18,6 @@ tool_chain=gcc
 uart_name=uart1
 tx_pin_name=PA9
 rtt_nano_path=
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+output_project_path=E\:\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
 project_name=Application_cbd_apm32f1

+ 1 - 1
Application_cbd_apm32f1/Kconfig

@@ -18,7 +18,7 @@ config PKGS_DIR
 config PLATFORM_DIR
     string
     option env="PLATFORM_DIR"
-    default "D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/Application_cbd_apm32f1/platform"
+    default "E:/iot_-cbd_-bzy_-ctrl/Application_cbd_apm32f1/platform"
 
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"

+ 3 - 19
Application_cbd_apm32f1/applications/control.c

@@ -2014,22 +2014,6 @@ static void Work_Loop_thread_entry(void *parameter)
             if((tm_tg_run.tm_hour)==alarm_h&&(tm_tg_run.tm_min==alarm_m)&&(tm_tg_run.tm_sec>=alarm_s))
             {
                 LOG_W("预制执行 开始!");
-                if(device_status.motor_active==0){
-                    ctr_Cold(ON);    //推杆打开
-                    rt_thread_delay(20000);
-                    //震动
-                    ctr_Collect_Fan(ON);
-                    for(uint8_t i = 0; i < 30; i++){
-                        rt_thread_delay(1000);
-                        LOG_I("等待震动完成:%d",i);
-                    }
-                    ctr_Collect_Fan(OFF);
-                    rt_thread_delay(2000);
-                    ctr_Cold(OFF);   //推杆关闭
-                    rt_thread_delay(1000);
-                    device_status.motor_active=1;
-                    ef_set_env_blob("motor_active", &device_status.motor_active, sizeof(device_status.motor_active));
-                }else{
                     /* 发送 Modbus RTU 获取电机状态 */
                     uart5_rx_flag = 0;   /* 先清除上次的接收标志 */
                     Uart5_Write_Bin(get_status, sizeof(get_status));   /* 必须用_Bin,%s会截断0x00字节 */
@@ -2058,17 +2042,17 @@ static void Work_Loop_thread_entry(void *parameter)
                     Uart5_Write_Bin(motor1_Forword, sizeof(motor1_Forword));   //推杆打开
                     rt_thread_delay(20000);
                     Uart5_Write_Bin(motor2_Forword, sizeof(motor2_Forword));   //震动
+                    ctr_Collect_Fan(ON)
                     for(uint8_t i = 0; i < 30; i++){
                         rt_thread_delay(1000);
                         LOG_I("等待震动完成:%d",i);
                     }
                     Uart5_Write_Bin(motor2_Stop, sizeof(motor2_Stop));   //关闭震动
+                    ctr_Collect_Fan(OFF)
                     rt_thread_delay(2000);
                     Uart5_Write_Bin(motor1_Backward, sizeof(motor1_Backward));   //推杆关闭
                     rt_thread_delay(1000);
-                    device_status.motor_active=0;
-                    ef_set_env_blob("motor_active", &device_status.motor_active, sizeof(device_status.motor_active));
-                }
+
                 char *temp_s =makeJson_Warn("执行完成", "预制模式");
                 DTU_Write("%s",temp_s);
                 rt_free(temp_s);

+ 6 - 6
Application_cbd_apm32f1/applications/control.h

@@ -18,15 +18,15 @@
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
+#define MATCH_DEVICE     1             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
-#define TG_MODULE        1             //推杆电机结构模块化控制
+#define TG_MODULE        0             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define QINGSAO_IO       1             //调整清扫顺序20250801
-#define WENKONG          1             //温控功能1-开启 0-关闭
-#define YUKONG           1             //雨控功能1-开启 0-关闭
-#define QIANYA           1             //欠压功能1-开启 0-关闭
+#define WENKONG          0             //温控功能1-开启 0-关闭
+#define YUKONG           0             //雨控功能1-开启 0-关闭
+#define QIANYA           0             //欠压功能1-开启 0-关闭
 
 
 #if MATCH_DEVICE == 1
@@ -41,7 +41,7 @@
 #else
     #define VERSION_HK          "2.40.41(HK)"            //4.0海康-1200W
     #if TG_MODULE == 0
-    #define VERSION_HK_2000W    "2.40.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.40.000(2000W)"         //4.0水稻
     #else
     #if MATCH_DEVICE == 1
     #define VERSION_HK_2000W    "3.3.4(TG)"             //推杆结构比赛设备

+ 2 - 0
Application_cbd_apm32f1/applications/hmi.c

@@ -1597,6 +1597,7 @@ static void Ctr_Mortor_entry(void* parameter)
         #endif
         if(device_status.ctr_up_motor==1)
         {
+            ctr_Cold(ON);
             ctr_cangmen_up(OPEN);
             num_up_open--;
             if (num_up_open == 0)
@@ -1609,6 +1610,7 @@ static void Ctr_Mortor_entry(void* parameter)
         }
         else if(device_status.ctr_up_motor==2)
         {
+            ctr_Cold(OFF);
             ctr_cangmen_up(CLOSE);
             num_up_close --;
             if (num_up_close == 0)

+ 1 - 1
Application_cbd_apm32f1/packages/ota_downloader-v1.0.0/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="1.68.*" />
+  <configs SELEFILE="E:\iot_-cbd_-bzy_-ctrl\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="E:\iot_-cbd_-bzy_-ctrl\Application_cbd_apm32f1\Debug\rtthread.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="2.40.000(2000W)" />
 </configuration>

+ 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="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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1325107878458243260" 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>

+ 2 - 2
CBD_FOTA_BootLoader/.settings/projcfg.ini

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Mon Apr 21 16:30:36 CST 2025
+#Fri Jun 26 10:18:15 CST 2026
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None
@@ -17,6 +17,6 @@ tool_chain=gcc
 uart_name=uart1
 tx_pin_name=PA9
 rtt_nano_path=
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+output_project_path=E\:\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
 project_name=CBD_FOTA_BootLoader