Browse Source

update

master
zhaohe 1 year ago
parent
commit
e705cddc59
  1. 2
      a8000_protocol
  2. 2
      sdk
  3. 12
      usrc/public_service/ext_board_impl.cpp
  4. 16
      usrc/public_service/ext_board_impl.hpp

2
a8000_protocol

@ -1 +1 @@
Subproject commit e8d9d4b95cb890e152a78a7f1d7c583bcc35039f
Subproject commit 8bdd1adfe6d5bf44fe6289b5cc339ee292c427c1

2
sdk

@ -1 +1 @@
Subproject commit ca94ff1ee8c1ae30c3e806936bb67863b400f196
Subproject commit 85d2a97eb11c755dc0ad6098e6d50e96a0b658c3

12
usrc/public_service/ext_board_impl.cpp

@ -13,13 +13,13 @@ int32_t ExtBoardImpl::getid(int32_t *id) {
return 0;
}
int32_t ExtBoardImpl::module_xxx_reg(int32_t param_id, bool read, int32_t &val) { return err::kmodule_not_find_reg; }
int32_t ExtBoardImpl::board_read_ext_inio(int32_t ioindex, int32_t *val) {
int32_t ExtBoardImpl::extboard_read_inio(int32_t ioindex, int32_t *val) {
if (ioindex < 0 || ioindex >= ZARRAY_SIZE(IO)) return err::kparam_out_of_range;
*val = IO[ioindex].getState();
return 0;
}
int32_t ExtBoardImpl::board_read_muti_inio(int32_t *val) {
int32_t ExtBoardImpl::extboard_read_muti_inio(int32_t *val) {
*val = 0;
for (int i = 0; i < ZARRAY_SIZE(IO); i++) {
*val |= IO[i].getState() << i;
@ -28,24 +28,24 @@ int32_t ExtBoardImpl::board_read_muti_inio(int32_t *val) {
return 0;
}
int32_t ExtBoardImpl::board_read_inio_index_in_stm32(int32_t ioindex, int32_t *val) {
int32_t ExtBoardImpl::extboard_read_inio_index_in_stm32(int32_t ioindex, int32_t *val) {
if (ioindex < 0 || ioindex >= ZARRAY_SIZE(IO)) return err::kparam_out_of_range;
*val = IO[ioindex].getPin();
return 0;
}
int32_t ExtBoardImpl::kboard_write_ext_outio(int32_t ioindex, int32_t val) {
int32_t ExtBoardImpl::kextboard_write_outio(int32_t ioindex, int32_t val) {
if (ioindex < 0 || ioindex >= ZARRAY_SIZE(IO)) return err::kparam_out_of_range;
OutputIO[ioindex].setState(val);
return 0;
}
int32_t ExtBoardImpl::board_read_outio_index_in_stm32(int32_t ioindex, int32_t *val) {
int32_t ExtBoardImpl::extboard_read_outio_index_in_stm32(int32_t ioindex, int32_t *val) {
if (ioindex < 0 || ioindex >= ZARRAY_SIZE(IO)) return err::kparam_out_of_range;
*val = OutputIO[ioindex].getPin();
return 0;
}
int32_t ExtBoardImpl::board_read_outio(int32_t ioindex, int32_t *val) {
int32_t ExtBoardImpl::extboard_read_outio(int32_t ioindex, int32_t *val) {
if (ioindex < 0 || ioindex >= ZARRAY_SIZE(IO)) return err::kparam_out_of_range;
*val = OutputIO[ioindex].getState();
return 0;

16
usrc/public_service/ext_board_impl.hpp

@ -27,17 +27,17 @@ class ExtBoardImpl : public ZIBoard, public ZIModule {
/***********************************************************************************************************************
* ZIModule *
***********************************************************************************************************************/
virtual int32_t getid(int32_t *id);
virtual int32_t module_xxx_reg(int32_t param_id, bool read, int32_t &val);
virtual int32_t getid(int32_t *id) override;
virtual int32_t module_xxx_reg(int32_t param_id, bool read, int32_t &val) override;
/***********************************************************************************************************************
* ZIBoard *
***********************************************************************************************************************/
virtual int32_t board_read_ext_inio(int32_t ioindex, int32_t *val);
virtual int32_t kboard_write_ext_outio(int32_t ioindex, int32_t val);
virtual int32_t board_read_muti_inio(int32_t *val);
virtual int32_t board_read_inio_index_in_stm32(int32_t ioindex, int32_t *val);
virtual int32_t board_read_outio_index_in_stm32(int32_t ioindex, int32_t *val);
virtual int32_t board_read_outio(int32_t ioindex, int32_t *val);
virtual int32_t extboard_read_inio(int32_t ioindex, int32_t *val) override;
virtual int32_t kextboard_write_outio(int32_t ioindex, int32_t val) override;
virtual int32_t extboard_read_muti_inio(int32_t *val) override;
virtual int32_t extboard_read_inio_index_in_stm32(int32_t ioindex, int32_t *val) override;
virtual int32_t extboard_read_outio_index_in_stm32(int32_t ioindex, int32_t *val) override;
virtual int32_t extboard_read_outio(int32_t ioindex, int32_t *val) override;
virtual int32_t getmoduleId(int off);
};

Loading…
Cancel
Save