p_transmit_disinfection
/
liquid_path_control
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 2 years ago
parent
4301544edc
commit
0806e55067
3 changed files with 37 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 2
      sdk
  3. 61
      usrc/main.cpp

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/> <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.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="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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/> <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.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="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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

2
sdk

@ -1 +1 @@
Subproject commit 49fdc5fc4c5176eb911e4e1eb1b1d70713f4767d
Subproject commit a7de98e58158f59c3b3d78e37b2ef4c2ebe5c992

61
usrc/main.cpp
View File

@ -44,6 +44,12 @@ ZGPIO triLight_BEEP;
ZGPIO m_input1; ZGPIO m_input1;
ZGPIO m_input2; ZGPIO m_input2;
ZGPIO m_input3;
ZGPIO m_input4;
ZGPIO m_input5;
ZGPIO output1;
ZGPIO output2;
ZCanReceiver m_canReceiver; ZCanReceiver m_canReceiver;
ZCanBasicOrderModule m_basicOrderModule; ZCanBasicOrderModule m_basicOrderModule;
@ -81,6 +87,10 @@ void Main::run() {
*/ */
m_input1.initAsInput(PD11, ZGPIO::kMode_nopull, ZGPIO::kIRQ_noIrq, true /*mirror*/); 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_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.initialize(&m_canReceiver);
m_basicOrderModule.regInputCtl([this](uint8_t id, bool &val) { m_basicOrderModule.regInputCtl([this](uint8_t id, bool &val) {
if (id == 1) { if (id == 1) {
@ -91,9 +101,28 @@ void Main::run() {
val = m_input2.getState(); val = m_input2.getState();
return true; 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; 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_B.initAsOutput(PD9, ZGPIO::kMode_nopull, false, false);
triLight_BEEP.initAsOutput(PD10, 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.initialize(&m_canReceiver);
m_warningLightCtlModule.regSubmodule(1, [&](uint8_t r, uint8_t g, uint8_t b, uint8_t beep) { 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); 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.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"); ZLOGI(TAG, "init done");

Write Preview
Loading…
Cancel
Save