Browse Source

update

master
zhaohe 1 year ago
parent
commit
0ad0ea28e7
  1. 3
      usrc/base/hardware.cpp
  2. 2
      usrc/base/hardware.hpp
  3. 11
      usrc/protocol_impl/function_impl/h2o2_fn_impl.cpp

3
usrc/base/hardware.cpp

@ -2,8 +2,7 @@
#include "adc.h"
#include "tim.h"
#include "zsdk/hmp110/hmp110.hpp"
#include "zsdk/hpp272/hpp272.hpp"
#include "zsdk/zcanreceiver/zcanreceiver.hpp"
#define TAG "HARD"
using namespace iflytop;

2
usrc/base/hardware.hpp

@ -5,6 +5,8 @@
#include "base/device_info.hpp"
#include "spi.h"
#include "usart.h"
#include "zsdk/hmp110/hmp110.hpp"
#include "zsdk/hpp272/hpp272.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "zsdk/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp"
#include "zsdk/tmc/ztmc5130.hpp"

11
usrc/protocol_impl/function_impl/h2o2_fn_impl.cpp

@ -13,21 +13,20 @@ static void onPacketReportTimer(void const* argument) {
}
void fn_cmd_h2o2_sensor_read_calibration_date(uint8_t from, uint8_t to, zcanbus_packet_t* packet, size_t len) {
CHECK_PARAM_LEN(PARAM_LEN(), 1);
int32_t subic = GET_PARAM(packet->params, 0);
CHECK_PARAM_LEN(PARAM_LEN(), 0);
int32_t data[3];
Hardware::ins().h2o2_sensor_read_calibration_date(&data[0], &data[1], &data[2]);
zcanbus_send_ack(packet, (uint8_t*)&data, sizeof(data));
}
void fn_cmd_h2o2_sensor_read_sub_ic_errorcode(uint8_t from, uint8_t to, zcanbus_packet_t* packet, size_t len) {
CHECK_PARAM_LEN(PARAM_LEN(), 0);
int32_t ecode = Hardware::ins().h2o2_sensor_read_sub_ic_errorcode();
zcanbus_send_ack(packet, (uint8_t*)&ecode, sizeof(ecode));
}
void fn_cmd_h2o2_sensor_read_sub_ic_reg(uint8_t from, uint8_t to, zcanbus_packet_t* packet, size_t len) {
CHECK_PARAM_LEN(PARAM_LEN(), 3);
int32_t subic = GET_PARAM(packet->params, 0);
int32_t addr = GET_PARAM(packet->params, 1);
int32_t regNum = GET_PARAM(packet->params, 2);
CHECK_PARAM_LEN(PARAM_LEN(), 2);
int32_t addr = GET_PARAM(packet->params, 0);
int32_t regNum = GET_PARAM(packet->params, 1);
if (regNum > 10) regNum = 10; // 最多读10个寄存器
static uint16_t data[10];
memset(data, 0, sizeof(data));

Loading…
Cancel
Save