zhunk 1 年之前
父节点
当前提交
bc13b23524

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

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="1335513985103623877" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

+ 2 - 33
Application_cbd_apm32f1/applications/control.c

@@ -818,30 +818,6 @@ void Hk_Take_io(void)
     rt_pin_write(HK_IO, 1);
     rt_pin_write(HK_IO, 1);
 }
 }
 
 
-//初始化所有控制驱动,关闭
-void HardWare_Init(uint8_t boot)
-{
-    Beep_Tip(200);
-    //关闭上仓门
-    ctr_cangmen_up(OFF);
-
-    ctr_cangmen_down(OFF);
-
-    //关闭镇流器
-    ctr_lamp(OFF,1);
-
-    //关闭震动电机
-    ctr_shake(OFF,0);
-
-    //关闭加热
-    ctr_Heat(OFF);
-
-    //关闭补光灯
-    ctr_led(OFF);
-
-    //关闭12V供电(海康相机,RTU)
-    ctr_photo(OFF);
-}
 //拍照
 //拍照
 void HK_TakePhoto(void)
 void HK_TakePhoto(void)
 {
 {
@@ -911,8 +887,8 @@ void ResetInit(void)
     ctr_photo(ON);
     ctr_photo(ON);
     //关闭电磁阀
     //关闭电磁阀
     ctr_shake(OFF, 0);
     ctr_shake(OFF, 0);
-    //关闭加热
-    ctr_Heat(OFF);
+    //开启 工控机供电
+    ctr_Heat(ON);
     //关闭制冷
     //关闭制冷
     ctr_Cold(OFF);
     ctr_Cold(OFF);
     //关闭补光灯
     //关闭补光灯
@@ -922,12 +898,6 @@ void ResetInit(void)
     //关闭X轴驱动电源
     //关闭X轴驱动电源
 }
 }
 
 
-//出厂前自检 0-开机自检  1-屏幕或指令下发手动自检
-void HardWare_Check(uint8_t boot)
-{
-   //停止所有动作                                      -完成
-   HardWare_Init(boot);
-}
 //工作状态检测
 //工作状态检测
 /*孢子仪多段定时功能函数
 /*孢子仪多段定时功能函数
  * 循环判断定时的触发
  * 循环判断定时的触发
@@ -1234,7 +1204,6 @@ int slide_Fresh(void)
     return ret;
     return ret;
 }
 }
 
 
-MSH_CMD_EXPORT(HardWare_Check,HardWare_Check<ON|OFF>);
 MSH_CMD_EXPORT(ctr_lamp,ctr_lamp<ON|OFF>);
 MSH_CMD_EXPORT(ctr_lamp,ctr_lamp<ON|OFF>);
 MSH_CMD_EXPORT(ctr_led,sample:ctr_led <ON|OFF>);
 MSH_CMD_EXPORT(ctr_led,sample:ctr_led <ON|OFF>);
 //INIT_APP_EXPORT(Control_heat);
 //INIT_APP_EXPORT(Control_heat);

+ 1 - 3
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////
 
 
-#define VERSION_BZY         "2.4.5"                   //孢子仪
+#define VERSION_BZY         "2.5.5"                   //孢子仪
 
 
 
 
 /*********************************************************************/
 /*********************************************************************/
@@ -299,8 +299,6 @@ void Hk_Take_io(void);                          //触发拍照
 void HK_TakePhoto(void);                        //拍照
 void HK_TakePhoto(void);                        //拍照
 void ctr_photo(uint8_t status_photo);
 void ctr_photo(uint8_t status_photo);
 void ctr_RTU_DTU(uint8_t status_rtu);
 void ctr_RTU_DTU(uint8_t status_rtu);
-void HardWare_Init(uint8_t boot);               //初始化
-void HardWare_Check(uint8_t boot);              //自检
 void ResetInit(void);                           //上电复位
 void ResetInit(void);                           //上电复位
 void SunTest(void);                             //光控测试
 void SunTest(void);                             //光控测试
 /*****************************************************/
 /*****************************************************/

+ 1 - 0
Application_cbd_apm32f1/applications/main.c

@@ -32,6 +32,7 @@ int main(void)
     led_set_level(1,0);
     led_set_level(1,0);
     clock_information();
     clock_information();
     Beep_Tip(100);
     Beep_Tip(100);
+    ctr_Heat(ON);
     Check_ParamConfig();
     Check_ParamConfig();
     //打印内存占用
     //打印内存占用
     memtrace(0, NULL);
     memtrace(0, NULL);

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2025-10-31 更新说明
+	#define VERSION_BZY         "2.5.5"                   //孢子仪
+	工控机供电修改为加热接口
 # 2025-09-18 更新说明
 # 2025-09-18 更新说明
 	#define VERSION_BZY         "2.4.5"                   //孢子仪
 	#define VERSION_BZY         "2.4.5"                   //孢子仪
 	1、增加温度保护,温湿度探头等相关字段;
 	1、增加温度保护,温湿度探头等相关字段;