Browse Source

update

master
zhaohe 2 years ago
parent
commit
e78069f293
  1. 4
      components/modbus/modbus_block_host.cpp
  2. 2
      components/vaisala_sensor/hpp272.cpp
  3. 3
      components/zcan_module/zcan_m211887_module_manager.cpp

4
components/modbus/modbus_block_host.cpp

@ -6,7 +6,9 @@ using namespace iflytop;
ModbusBlockHost::ModbusBlockHost() {} ModbusBlockHost::ModbusBlockHost() {}
ModbusBlockHost::~ModbusBlockHost() {} ModbusBlockHost::~ModbusBlockHost() {}
void ModbusBlockHost::initialize(UART_HandleTypeDef *huart) {}
void ModbusBlockHost::initialize(UART_HandleTypeDef *huart) {
this->huart = huart;
}
void ModbusBlockHost::cleanRxBuff() { // void ModbusBlockHost::cleanRxBuff() { //
HAL_StatusTypeDef status; HAL_StatusTypeDef status;
do { do {

2
components/vaisala_sensor/hpp272.cpp

@ -9,7 +9,7 @@ void HPP272::initialize(UART_HandleTypeDef *huart, uint8_t id) {
this->id = id; this->id = id;
} }
hpp272_data_t *HPP272::readVal() { hpp272_data_t *HPP272::readVal() {
bool suc = modbusBlockHost.readReg03Muti(id, 0x02, (uint16_t *)&datacache, sizeof(datacache) / 2, 50);
bool suc = modbusBlockHost.readReg03Muti(id, 0x0100, (uint16_t *)&datacache, sizeof(datacache) / 2, 30);
if (!suc) { if (!suc) {
return NULL; return NULL;
} }

3
components/zcan_module/zcan_m211887_module_manager.cpp

@ -26,7 +26,8 @@ void ZCanM211887ModuleManager::regSubmodule(int id, UART_HandleTypeDef* huart, u
void ZCanM211887ModuleManager::onRceivePacket(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t len) { void ZCanM211887ModuleManager::onRceivePacket(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t len) {
Cmdheader_t* cmdheader = (Cmdheader_t*)packet; Cmdheader_t* cmdheader = (Cmdheader_t*)packet;
if (cmdheader->cmdid == kcmd_read_huacheng_pressure_sensor && cmdheader->subcmdid == 0) {
if (cmdheader->cmdid == kcmd_m211887_operation && cmdheader->subcmdid == 0) {
ZLOGI(TAG, "kcmd_m211887_operation read");
/** /**
* @brief (0) * @brief (0)
* cmd : b0:sensorid * cmd : b0:sensorid

Loading…
Cancel
Save