From 343b1aa5f1ad35a1645586755db4c7ce4c3f756c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 12 Dec 2023 15:38:06 +0800 Subject: [PATCH] update --- .settings/language.settings.xml | 4 +- ...ine_disinfection_high_power_ctrl_prj (1).launch | 83 ---------------------- ...e_disinfection_high_power_ctrl_prj Debug.launch | 82 +++++++++++++++++++++ usrc/main.cpp | 23 +++--- 4 files changed, 98 insertions(+), 94 deletions(-) delete mode 100644 pipeline_disinfection_high_power_ctrl_prj (1).launch create mode 100644 pipeline_disinfection_high_power_ctrl_prj Debug.launch 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 (1).launch deleted file mode 100644 index 7b73caf..0000000 --- a/pipeline_disinfection_high_power_ctrl_prj (1).launch +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pipeline_disinfection_high_power_ctrl_prj Debug.launch b/pipeline_disinfection_high_power_ctrl_prj Debug.launch new file mode 100644 index 0000000..6d7d7fa --- /dev/null +++ b/pipeline_disinfection_high_power_ctrl_prj Debug.launch @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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; });