diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 02e817d..3313117 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/ucomponents/preportional_valve/preportional_valve_ctrl.cpp b/ucomponents/preportional_valve/preportional_valve_ctrl.cpp
index 8f8fdcb..8c72a34 100644
--- a/ucomponents/preportional_valve/preportional_valve_ctrl.cpp
+++ b/ucomponents/preportional_valve/preportional_valve_ctrl.cpp
@@ -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;
}
\ No newline at end of file
diff --git a/usrc/base/protocol_processer_utils.hpp b/usrc/base/protocol_processer_utils.hpp
index b514d5e..bae2c8c 100644
--- a/usrc/base/protocol_processer_utils.hpp
+++ b/usrc/base/protocol_processer_utils.hpp
@@ -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; \
}
diff --git a/usrc/module/blower_controller.hpp b/usrc/module/blower_controller.hpp
index c598456..9e4d0b9 100644
--- a/usrc/module/blower_controller.hpp
+++ b/usrc/module/blower_controller.hpp
@@ -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) {