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

v2

master
zhaohe 1 year ago
parent
f05f68f1fc
commit
ee762704bd
3 changed files with 5 additions and 5 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
      usrc/project_configs.h
  3. 4
      usrc/protocol_impl/protocol_impl_service.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="-859640089190887575" 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="1380098844774403941" 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="-897080592784661030" 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="1342658341180630486" 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
usrc/project_configs.h
View File

@ -9,7 +9,7 @@
* @brief 基础配置
*
*/
#define SOFTWARE_VERSION 5
#define SOFTWARE_VERSION 2
#define HARDWARE_VERSION 1
#define PROJECT "dbdb_liquid_path_control"
#define SN_HEADER "SN"

4
usrc/protocol_impl/protocol_impl_service.cpp
View File

@ -54,7 +54,8 @@ static void _zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t
if (power < 0 && power > 31) {
power = 15;
}
auto motor = Hardware::ins().motor(1);
auto motor = Hardware::ins().motor(0);
ZLOGI(TAG, "pump ctrl %d %d %d %d %d %d", acc_rpm2, rpm, idlepower, power, ppm, acc);
motor->setIHOLD_IRUN(idlepower, power, 10); // 5W
motor->setAcceleration(acc);
@ -77,7 +78,6 @@ static void _zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t
}
}
if (cmdheader->cmdid == kcmd_dbdb_spray_air_compressor_power_ctrl) {
int32_t val = *(int32_t*)(&cmdheader->data[0]);
Hardware::ins().atta_mini_air_compressor_ctrl()->write(val);

Write Preview
Loading…
Cancel
Save