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 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/sdk b/sdk
index 49fdc5f..a7de98e 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 49fdc5fc4c5176eb911e4e1eb1b1d70713f4767d
+Subproject commit a7de98e58158f59c3b3d78e37b2ef4c2ebe5c992
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 84baacf..18cbfa1 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -44,6 +44,12 @@ ZGPIO triLight_BEEP;
ZGPIO m_input1;
ZGPIO m_input2;
+ZGPIO m_input3;
+ZGPIO m_input4;
+ZGPIO m_input5;
+
+ZGPIO output1;
+ZGPIO output2;
ZCanReceiver m_canReceiver;
ZCanBasicOrderModule m_basicOrderModule;
@@ -81,6 +87,10 @@ void Main::run() {
*/
m_input1.initAsInput(PD11, ZGPIO::kMode_nopull, ZGPIO::kIRQ_noIrq, true /*mirror*/);
m_input2.initAsInput(PC5, ZGPIO::kMode_nopull, ZGPIO::kIRQ_noIrq, true /*mirror*/);
+ m_input3.initAsInput(PD12, ZGPIO::kMode_nopull, ZGPIO::kIRQ_noIrq, true /*mirror*/);
+ m_input4.initAsInput(PD13, ZGPIO::kMode_nopull, ZGPIO::kIRQ_noIrq, true /*mirror*/);
+ m_input5.initAsInput(PC6, ZGPIO::kMode_nopull, ZGPIO::kIRQ_noIrq, true /*mirror*/);
+
m_basicOrderModule.initialize(&m_canReceiver);
m_basicOrderModule.regInputCtl([this](uint8_t id, bool &val) {
if (id == 1) {
@@ -91,9 +101,28 @@ void Main::run() {
val = m_input2.getState();
return true;
}
+ if (id == 3) {
+ val = m_input3.getState();
+ return true;
+ }
+ if (id == 4) {
+ val = m_input4.getState();
+ return true;
+ }
+ if (id == 5) {
+ val = m_input5.getState();
+ return true;
+ }
return false;
});
- ZHAL_CORE_REG(1000, { ZLOGI(TAG, "IO1:%d IO2:%d", m_input1.getState(), m_input2.getState()); });
+
+ // output1.reg
+ // output2
+ m_basicOrderModule.regOutCtl([this](uint8_t id, bool val) { return false; });
+ ZHAL_CORE_REG(3000, {
+ // ZLOGI(TAG, "IO1:%d IO2:%d", m_input1.getState(), m_input2.getState());
+ ZLOGI(TAG, "IO1:%d IO2:%d IO3:%d IO4:%d IO5:%d", m_input1.getState(), m_input2.getState(), m_input3.getState(), m_input4.getState(), m_input5.getState());
+ });
/*******************************************************************************
* 蠕动泵驱动 *
@@ -155,28 +184,6 @@ void Main::run() {
triLight_B.initAsOutput(PD9, ZGPIO::kMode_nopull, false, false);
triLight_BEEP.initAsOutput(PD10, ZGPIO::kMode_nopull, false, false);
- // while(true){
- // triLight_R.setState(true);
- // HAL_Delay(3000);
- // triLight_R.setState(false);
- // HAL_Delay(3000);
-
- // triLight_G.setState(true);
- // HAL_Delay(3000);
- // triLight_G.setState(false);
- // HAL_Delay(3000);
-
- // triLight_B.setState(true);
- // HAL_Delay(3000);
- // triLight_B.setState(false);
- // HAL_Delay(3000);
-
- // triLight_BEEP.setState(true);
- // HAL_Delay(3000);
- // triLight_BEEP.setState(false);
- // HAL_Delay(3000);
- // }
-
m_warningLightCtlModule.initialize(&m_canReceiver);
m_warningLightCtlModule.regSubmodule(1, [&](uint8_t r, uint8_t g, uint8_t b, uint8_t beep) {
ZLOGI(TAG, "warningLightCtlModule r:%d g:%d b:%d beep:%d", r, g, b, beep);
@@ -192,10 +199,10 @@ void Main::run() {
*******************************************************************************/
{
m_huachengPressureSensor.initialize(&m_canReceiver);
- m_huachengPressureSensor.regSubmodule(1, &huart2, 1);
- m_huachengPressureSensor.regSubmodule(2, &huart2, 2);
- m_huachengPressureSensor.regSubmodule(3, &huart2, 3);
- m_huachengPressureSensor.regSubmodule(4, &huart2, 4);
+ m_huachengPressureSensor.regSubmodule(1, &huart3, 1);
+ m_huachengPressureSensor.regSubmodule(2, &huart3, 2);
+ m_huachengPressureSensor.regSubmodule(3, &huart3, 3);
+ m_huachengPressureSensor.regSubmodule(4, &huart3, 4);
}
ZLOGI(TAG, "init done");