diff --git a/components/sensors/i2ceeprom/m24lr64e_i2c_eeprom.cpp b/components/sensors/i2ceeprom/m24lr64e_i2c_eeprom.cpp index ba07493..7b8639a 100644 --- a/components/sensors/i2ceeprom/m24lr64e_i2c_eeprom.cpp +++ b/components/sensors/i2ceeprom/m24lr64e_i2c_eeprom.cpp @@ -103,7 +103,7 @@ void M24LR64E_I2CEEPROM::change_is_online_flag(bool state) { if (m_is_online_flag != state) { m_is_online_flag = state; if (m_event_bus_sender) { - m_event_bus_sender->push_reg_state_change_event(id, kreg_module_is_online, m_is_online_flag); + m_event_bus_sender->push_reg_state_change_event(id, kreg_module_is_online, !m_is_online_flag, m_is_online_flag); } } } diff --git a/components/zcancmder/zcanreceiver.cpp b/components/zcancmder/zcanreceiver.cpp index 1584f0b..d982cdc 100644 --- a/components/zcancmder/zcanreceiver.cpp +++ b/components/zcancmder/zcanreceiver.cpp @@ -183,12 +183,12 @@ int32_t ZCanCmder::sendBufAck(zcr_cmd_header_t *rx_cmd_header, uint8_t *data, in sendPacket(txbuff, sizeof(zcr_cmd_header_t) + len); return 0; } -int32_t ZCanCmder::triggerEvent(zcr_cmd_header_t *rx_cmd_header, uint8_t *data, int32_t len) { +int32_t ZCanCmder::triggerEvent(zcr_cmd_header_t *cmd_header, uint8_t *data, int32_t len) { zlock_guard l(m_lock); m_reportIndex++; ZASSERT(sizeof(txbuff) > sizeof(zcr_cmd_header_t) + len); zcr_cmd_header_t *txheader = (zcr_cmd_header_t *)txbuff; - memcpy(txheader, rx_cmd_header, sizeof(zcr_cmd_header_t)); + memcpy(txheader, cmd_header, sizeof(zcr_cmd_header_t)); txheader->packetType = kptv2_event; txheader->packetindex = m_reportIndex; memcpy(txheader->data, data, len); diff --git a/components/zcancmder/zcanreceiver.hpp b/components/zcancmder/zcanreceiver.hpp index 22408a4..15d25f9 100644 --- a/components/zcancmder/zcanreceiver.hpp +++ b/components/zcancmder/zcanreceiver.hpp @@ -75,7 +75,7 @@ class ZCanCmder : public ZCanIRQListener, public IZCanCmder { virtual int32_t sendBufAck(zcr_cmd_header_t *rx_cmd_header, uint8_t *data, int32_t len) override; virtual int32_t sendAck(zcr_cmd_header_t *rx_cmd_header, int32_t *ackvar, int32_t nack) override; virtual int32_t sendErrorAck(zcr_cmd_header_t *rx_cmd_header, int32_t errorcode) override; - virtual int32_t triggerEvent(zcr_cmd_header_t *rx_cmd_header, uint8_t *data, int32_t len) override; + virtual int32_t triggerEvent(zcr_cmd_header_t *cmd_header, uint8_t *data, int32_t len) override; void loop(); diff --git a/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp b/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp index 108e14a..63fe66c 100644 --- a/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp +++ b/components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp @@ -57,8 +57,8 @@ void MicroComputerModuleDeviceScriptCmderPaser::initialize(ICmdParser* cancmder, app_module_read_raw_str(paramN, paraV, ack); }); - deviceManager->regOnRegValChangeEvent([this](int32_t moduleid, int32_t event_id, int32_t eventval) { // - ZLOGI(TAG, "onRegValChangeEvent(%d,%d,%d)", moduleid, event_id, eventval); + deviceManager->regOnRegValChangeEvent([this](int32_t moduleid, int32_t regindex, int32_t oldval, int32_t toval) { // + ZLOGI(TAG, "onRegValChangeEvent(%d,%d,%d->%d)", moduleid, regindex, oldval,toval); }); } diff --git a/components/zprotocols/zcancmder_v2 b/components/zprotocols/zcancmder_v2 index fe55b29..4b222a9 160000 --- a/components/zprotocols/zcancmder_v2 +++ b/components/zprotocols/zcancmder_v2 @@ -1 +1 @@ -Subproject commit fe55b29b2ec36c1dba99d1d69c4dc9e607dcad63 +Subproject commit 4b222a92c6a0181ada0e4b0a04019eb085caa014