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

修复编译错误

moveToEndTestVersion
sunlight 11 months ago
parent
25c00264a3
commit
0ae5710ada
4 changed files with 15 additions and 15 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. 22
      ucomponents/preportional_valve/preportional_valve_ctrl.cpp
  3. 2
      usrc/base/protocol_processer_utils.hpp
  4. 2
      usrc/module/blower_controller.hpp

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="-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">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1673181134882187943" 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="-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">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1661574727031578776" 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>

22
ucomponents/preportional_valve/preportional_valve_ctrl.cpp
View File

@ -3,7 +3,7 @@
#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp"
using namespace iflytop;
using namespace zscanprotocol;
using namespace transmit_disfection_protocol;
#define WORK_STATE_REG 0x0000
#define CTRL_STATE_REG 0x0001
#define POS_STATE_REG 0x0013
@ -18,21 +18,21 @@ void PreportionalValveCtrl::initialize(UART_HandleTypeDef* huart) {//
int32_t PreportionalValveCtrl::writeReg06(uint8_t slaveAddr, uint16_t regAddr, uint16_t regVal) {
int32_t err = m_modbusBlockHost.writeReg06(slaveAddr, regAddr, regVal, OVERTIME);
if (err == 0) return 0;
return err::kerr_subdevice_overtime;
return kerr_subdevice_overtime;
}
int32_t PreportionalValveCtrl::readReg03(uint8_t slaveAddr, uint16_t regAddr, uint16_t* regVal) {
int32_t err = m_modbusBlockHost.readReg03(slaveAddr, regAddr, regVal, OVERTIME);
if (err == 0) return 0;
return err::kerr_subdevice_overtime;
return kerr_subdevice_overtime;
}
int32_t PreportionalValveCtrl::setValvePos(int32_t valueid, int32_t pos) { //
int32_t ret = 0;
if (valueid > 255 || valueid < 1) {
return err::kerr_invalid_param;
return kerr_invalid_param;
}
ret = writeReg06(valueid, CTRL_STATE_REG, pos);
if (!ret) return err::kerr_subdevice_overtime;
if (!ret) return kerr_subdevice_overtime;
m_last_set_valve_ticket = HAL_GetTick();
m_targetpos[valueid] = pos;
@ -42,12 +42,12 @@ int32_t PreportionalValveCtrl::setValvePos(int32_t valueid, int32_t pos) { //
int32_t PreportionalValveCtrl::getValvePos(int32_t valueid, int32_t* pos) {
int32_t ret = 0;
if (valueid > 255 || valueid < 1) {
return err::kerr_invalid_param;
return kerr_invalid_param;
}
uint16_t pos16 = 0;
ret = readReg03(valueid, POS_STATE_REG, &pos16);
if (!ret) return err::kerr_subdevice_overtime;
if (!ret) return kerr_subdevice_overtime;
*pos = pos16;
return 0;
@ -55,12 +55,12 @@ int32_t PreportionalValveCtrl::getValvePos(int32_t valueid, int32_t* pos) {
int32_t PreportionalValveCtrl::getValveOrderPos(int32_t valueid, int32_t* pos) {
int32_t ret = 0;
if (valueid > 255 || valueid < 1) {
return err::kerr_invalid_param;
return kerr_invalid_param;
}
uint16_t pos16 = 0;
ret = readReg03(valueid, CTRL_STATE_REG, &pos16);
if (!ret) return err::kerr_subdevice_overtime;
if (!ret) return kerr_subdevice_overtime;
*pos = pos16;
return 0;
@ -93,12 +93,12 @@ int32_t PreportionalValveCtrl::isBusy(int32_t valueid, int32_t* busy) {
int32_t PreportionalValveCtrl::getValveWorkState(int32_t valueid, int32_t* state) {
int32_t ret = 0;
if (valueid > 255 || valueid < 1) {
return err::kerr_invalid_param;
return kerr_invalid_param;
}
uint16_t state16 = 0;
ret = readReg03(valueid, WORK_STATE_REG, &state16);
if (!ret) return err::kerr_subdevice_overtime;
if (!ret) return kerr_subdevice_overtime;
*state = state16;
return 0;
}

2
usrc/base/protocol_processer_utils.hpp
View File

@ -19,7 +19,7 @@ using namespace transmit_disfection_protocol;
#define CHECK_PARAM_LEN(_paramNum, expectNum) \
if (_paramNum != expectNum) { \
zcanbus_send_errorack(cxt->packet, err::kerr_invalid_param_num); \
zcanbus_send_errorack(cxt->packet, kerr_invalid_param_num); \
return; \
}

2
usrc/module/blower_controller.hpp
View File

@ -117,7 +117,7 @@ class BlowerController {
zcanbus_send_ack(cxt->packet, NULL, 0);
isopen = GET_PARAM(0) > 0 ? true : false;
} else {
zcanbus_send_errorack(cxt->packet, err::kerr_subdevice_overtime);
zcanbus_send_errorack(cxt->packet, kerr_subdevice_overtime);
}
} else if (m_blowerType == kMiniPwmBlower) {

Write Preview
Loading…
Cancel
Save