From 4e098b453e3bd4c54d3f55a4c8e59bb1404f69c7 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 4 Nov 2023 11:29:27 +0800 Subject: [PATCH] update --- components/zcancmder/zcan_board_module.cpp | 10 +++++----- components/zprotocols/zcancmder_v2 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/zcancmder/zcan_board_module.cpp b/components/zcancmder/zcan_board_module.cpp index 6e1592d..86a6fc5 100644 --- a/components/zcancmder/zcan_board_module.cpp +++ b/components/zcancmder/zcan_board_module.cpp @@ -39,11 +39,11 @@ int32_t ZCanBoardModule::module_writeio(int32_t idindex, int32_t io) { int32_t ZCanBoardModule::module_xxx_reg(int32_t param_id, bool read, int32_t &val) { switch (param_id) { - PROCESS_REG(kreg_module_version, /* */ val = 0x0001, ACTION_NONE); - PROCESS_REG(kreg_module_type, /* */ val = 0, ACTION_NONE); - PROCESS_REG(kreg_module_initflag, /* */ val = module_get_inited_flag(), module_set_inited_flag(val)); - PROCESS_REG(kreg_module_output_state, /* */ val = readoutput(), ACTION_NONE); - PROCESS_REG(kreg_module_input_state, /* */ val = readinput(), ACTION_NONE); + PROCESS_REG(kreg_module_version, /* */ REG_GET(0x0001), ACTION_NONE); + PROCESS_REG(kreg_module_type, /* */ REG_GET(0), ACTION_NONE); + PROCESS_REG(kreg_module_initflag, /* */ REG_GET(module_get_inited_flag()), module_set_inited_flag(val)); + PROCESS_REG(kreg_module_output_state, /* */ REG_GET(readoutput()), ACTION_NONE); + PROCESS_REG(kreg_module_input_state, /* */ REG_GET(readinput()), ACTION_NONE); default: return err::kmodule_not_find_config_index; break; diff --git a/components/zprotocols/zcancmder_v2 b/components/zprotocols/zcancmder_v2 index b7ad588..c28aa03 160000 --- a/components/zprotocols/zcancmder_v2 +++ b/components/zprotocols/zcancmder_v2 @@ -1 +1 @@ -Subproject commit b7ad588d0936f7b5800e9a3628e8d88d9a9a1489 +Subproject commit c28aa03e3b0c649948d53224158ce5198b0552bb