diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index fe9f6eb..cfc7c92 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/pipeline_disinfection_high_power_ctrl_prj (1).launch b/pipeline_disinfection_high_power_ctrl_prj Debug.launch
similarity index 96%
rename from pipeline_disinfection_high_power_ctrl_prj (1).launch
rename to pipeline_disinfection_high_power_ctrl_prj Debug.launch
index 7b73caf..6d7d7fa 100644
--- a/pipeline_disinfection_high_power_ctrl_prj (1).launch
+++ b/pipeline_disinfection_high_power_ctrl_prj Debug.launch
@@ -36,8 +36,8 @@
-
-
+
+
@@ -78,6 +78,5 @@
-
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 8e5b0c8..d74c186 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -56,8 +56,8 @@ ZGPIO AirBlowerCtrl2;
ZGPIO HeatingStripCtrl1;
ZGPIO HeatingStripCtrl2;
-ZGPIO output8;
-ZGPIO output9;
+ZGPIO IO_PD13;
+ZGPIO IO_PD14;
ZCanReceiver m_canReceiver;
ZCanBasicOrderModule m_basicOrderModule;
@@ -135,14 +135,18 @@ void Main::run() {
AirCompressorCtrl1.initAsOutput(PC2, ZGPIO::kMode_nopull, true, false);
AirCompressorCtrl2.initAsOutput(PC3, ZGPIO::kMode_nopull, true, false);
- AirBlowerCtrl1.initAsOutput(PC4, ZGPIO::kMode_nopull, true, false);
- AirBlowerCtrl2.initAsOutput(PC5, ZGPIO::kMode_nopull, true, false);
+ // AirBlowerCtrl1.initAsOutput(PC4, ZGPIO::kMode_nopull, true, false);
+ // AirBlowerCtrl2.initAsOutput(PC5, ZGPIO::kMode_nopull, true, false);
+ AirBlowerCtrl1.initAsOutput(PD13, ZGPIO::kMode_nopull, true, false);
+ AirBlowerCtrl2.initAsOutput(PD14, ZGPIO::kMode_nopull, true, false);
HeatingStripCtrl1.initAsOutput(PC6, ZGPIO::kMode_nopull, true, false);
HeatingStripCtrl2.initAsOutput(PC7, ZGPIO::kMode_nopull, true, false);
- output8.initAsOutput(PD13, ZGPIO::kMode_nopull, true, false);
- output9.initAsOutput(PD14, ZGPIO::kMode_nopull, true, false);
+#if 0
+ IO_PD13.initAsOutput(PD13, ZGPIO::kMode_nopull, true, false);
+ IO_PD14.initAsOutput(PD14, ZGPIO::kMode_nopull, true, false);
+#endif
// ZHAL_CORE_REG(3000, {
// AirCompressorCtrl1.toggleState();
@@ -192,15 +196,16 @@ void Main::run() {
HeatingStripCtrl2.setState(val);
return true;
}
-
+#if 0
if (id == 8) {
- output8.setState(val);
+ IO_PD13.setState(val);
return true;
}
if (id == 9) {
- output9.setState(val);
+ IO_PD14.setState(val);
return true;
}
+#endif
return false;
});