p_transmit_disinfection_v3
/
transmit_disinfection_micro
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改气密性检测电磁阀控制逻辑

moveToEndTestVersion
zhaohe 11 months ago
parent
a01b07c070
commit
983bea80e0
3 changed files with 25 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 2
      app_protocols/transmit_disfection_protocol
  3. 33
      usrc/app/dmapp.cpp

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<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="1333360294242618055" 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="-1128069368129573915" 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 copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<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="1225893259580527286" 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="-1235536402791664684" 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>

2
app_protocols/transmit_disfection_protocol

@ -1 +1 @@
Subproject commit 9135659ab41af623d10c691646501d313f927c14
Subproject commit 4aef96865307cfad9f2386253496f696c6ed5ecf

33
usrc/app/dmapp.cpp
View File

@ -144,22 +144,33 @@ void DisinfectionApp::initialize() {
static ZGPIO eValve0;
static ZGPIO eValve1;
airTightnessTestChGpio.initAsOutput(PD14, kxs_gpio_nopull, true, false);
eValve0.initAsOutput(PD15, kxs_gpio_nopull, false, true);
eValve1.initAsOutput(PC6, kxs_gpio_nopull, false, true);
eValve0.initAsOutput(PD15, kxs_gpio_nopull, true, false);
eValve1.initAsOutput(PC6, kxs_gpio_nopull, true, false);
REG_LAMADA_FN(kfn_air_leak_test_set_mode, [&](ProcessContext* cxt) {
if (GET_PARAM(0) == kAirLeakTestMode_disinfection) {
airTightnessTestChGpio.write(1); // 内管路
eValve0.write(1); // 电磁阀打开
eValve1.write(1); // 电磁阀打开
airTightnessTestChGpio.write(0); // 内管路
eValve0.write(0); // 联通
eValve1.write(0); // 联通
} else if (GET_PARAM(0) == kAirLeakTestMode_inflation) {
airTightnessTestChGpio.write(0); // 连接空气
eValve0.write(1); // 电磁阀打开
eValve1.write(1); // 电磁阀打开
airTightnessTestChGpio.write(1); // 连接空气
eValve0.write(0); // 联通
eValve1.write(0); // 联通
} else if (GET_PARAM(0) == kAirLeakTestMode_leakTest) {
airTightnessTestChGpio.write(1); // 内管路
eValve0.write(0); // 电磁阀闭合
eValve1.write(0); // 电磁阀闭合
airTightnessTestChGpio.write(0); // 内管路
eValve0.write(1); // 闭合
eValve1.write(1); // 闭合
} else if (GET_PARAM(0) == kAirLeakTestMode_closeAll) {
airTightnessTestChGpio.write(0);
eValve0.write(0);
eValve1.write(0);
} else if (GET_PARAM(0) == kAirLeakTestMode_openAll) {
airTightnessTestChGpio.write(1);
eValve0.write(1);
eValve1.write(1);
}
// kAirLeakTestMode_closeAll
// kAirLeakTestMode_openAll
airLeakTestMode = (air_leak_test_mode_t)GET_PARAM(0);
zcanbus_send_ack(cxt->packet, NULL, 0);
});

Write Preview
Loading…
Cancel
Save