From e16eb17e0608b8e18c88e6c19ce3d840fde327ee Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 15 Aug 2023 15:21:53 +0800
Subject: [PATCH] update

---
 .settings/language.settings.xml |  4 ++--
 sdk                             |  2 +-
 usrc/main.cpp                   | 33 +++++++++++++++++++++++----------
 usrc/project.hpp                |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index c61406d..089a477 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" 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 class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-778146388411498358" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="803182146675939763" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${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>
@@ -16,7 +16,7 @@
 			<provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" 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 class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-732098128503100595" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="849230406584337526" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${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>
diff --git a/sdk b/sdk
index e946480..242b348 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit e94648010b6703383da7ce6ff3b9e4463f4ec6d6
+Subproject commit 242b34891a51b504ea38d50199207c29fe96b9e6
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 23d0c18..c6e654f 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -52,7 +52,7 @@ ZCanBasicOrderModule             m_basicOrderModule;
 ZCanHighPowerElectricalCtlModule m_highPowerElectricalCtlModule;
 
 void Main::onRceivePacket(CanPacketRxBuffer *rxbuf, uint8_t *packet, size_t len) {
-  ZLOGI(TAG, "onRceivePacket from %d %d", rxbuf->id, len);
+  printf("can rx from %d %d,", rxbuf->id, len);
   for (size_t i = 0; i < len; i++) {
     printf("%02X ", packet[i]);
   }
@@ -74,12 +74,31 @@ void Main::run() {
   m_canReceiver.init(cfg);
   m_canReceiver.registerListener(this);
 
+  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);
+
+  HeatingStripCtrl1.initAsOutput(PC6, ZGPIO::kMode_nopull, true, false);
+  HeatingStripCtrl2.initAsOutput(PC7, ZGPIO::kMode_nopull, true, false);
+
+  ZHAL_CORE_REG(3000, {
+    AirCompressorCtrl1.toggleState();
+    AirCompressorCtrl2.toggleState();
+    AirBlowerCtrl1.toggleState();
+    AirBlowerCtrl2.toggleState();
+    HeatingStripCtrl1.toggleState();
+    HeatingStripCtrl2.toggleState();
+  });
+
   /**
    * @brief 基础模块
    */
   m_basicOrderModule.initialize(&m_canReceiver);
   m_basicOrderModule.regInputCtl([this](uint8_t id, bool &val) { return false; });
   m_basicOrderModule.regOutCtl([this](uint8_t id, bool val) {
+    ZLOGI(TAG, "set io %d %d", id, val);
     if (id == 0) {
       AirCompressorCtrl1.setState(val);
       return true;
@@ -88,44 +107,38 @@ void Main::run() {
       AirCompressorCtrl2.setState(val);
       return true;
     }
-
     if (id == 2) {
       AirBlowerCtrl1.setState(val);
       return true;
     }
-
     if (id == 3) {
       AirBlowerCtrl2.setState(val);
       return true;
     }
-
     if (id == 4) {
       HeatingStripCtrl1.setState(val);
       return true;
     }
-
     if (id == 5) {
       HeatingStripCtrl2.setState(val);
       return true;
     }
-
     return false;
   });
 
   m_basicOrderModule.regReadAdcVal([this](uint8_t id, int32_t &val) {
     if (id == 0) {
-      val = 0;
+      val = 1;
       return true;
     }
     if (id == 1) {
-      val = 0;
+      val = 2;
       return true;
     }
     if (id == 2) {
-      val = 0;
+      val = 3;
       return true;
     }
-
     return false;
   });
 
diff --git a/usrc/project.hpp b/usrc/project.hpp
index e2dfad5..d0d8042 100644
--- a/usrc/project.hpp
+++ b/usrc/project.hpp
@@ -2,7 +2,7 @@
 
 #define VERSION "v1.0"
 // 设备ID
-#define DEVICE_ID (2)
+#define DEVICE_ID (3)
 // 调试串口
 #define DEBUG_UART huart1
 // 调试指示灯