diff --git a/src/iflytop/components/zcanreceiver/zcanreceiver_master.cpp b/src/iflytop/components/zcanreceiver/zcanreceiver_master.cpp index 2a21cd0..8640f4c 100644 --- a/src/iflytop/components/zcanreceiver/zcanreceiver_master.cpp +++ b/src/iflytop/components/zcanreceiver/zcanreceiver_master.cpp @@ -50,9 +50,9 @@ int32_t ZcanReceiverMaster::sendCmd(int32_t cmdid, int32_t submoduleid, int32_t zcr_cmd_header_t *cmdheader = (zcr_cmd_header_t *)txbuff; cmdheader->packetType = kptv2_cmd; cmdheader->packetindex = generateFreeIndex(); - cmdheader->cmdmoduleid = MODULE_CMDID(cmdid); - cmdheader->subcmdid = SUBCMDID(cmdid); - cmdheader->submoduleid = submoduleid; + cmdheader->cmdMainId = MODULE_CMDID(cmdid); + cmdheader->cmdSubId = CMD_SUB_ID(cmdid); + cmdheader->subModuleid = submoduleid; int32_t *sendparam = (int32_t *)cmdheader->data; for (size_t i = 0; i < npara; i++) { @@ -99,10 +99,10 @@ int32_t ZcanReceiverMaster::sendCmdAndReceiveBuf(int32_t cmdid, int32_t submodul zcr_cmd_header_t *cmdheader = (zcr_cmd_header_t *)txbuff; cmdheader->packetType = kptv2_cmd; cmdheader->packetindex = generateFreeIndex(); - cmdheader->cmdmoduleid = MODULE_CMDID(cmdid); - cmdheader->subcmdid = SUBCMDID(cmdid); - cmdheader->submoduleid = submoduleid; - // ZLOGI(TAG, "sendCmd %d %d %d %d", cmdheader->packetindex, cmdheader->cmdmoduleid, cmdheader->subcmdid, cmdheader->submoduleid); + cmdheader->cmdMainId = MODULE_CMDID(cmdid); + cmdheader->cmdSubId = CMD_SUB_ID(cmdid); + cmdheader->subModuleid = submoduleid; + // ZLOGI(TAG, "sendCmd %d %d %d %d", cmdheader->packetindex, cmdheader->cmdMainId, cmdheader->cmdSubId, cmdheader->submoduleid); int32_t *sendparam = (int32_t *)cmdheader->data; for (size_t i = 0; i < npara; i++) { sendparam[i] = param[i]; diff --git a/src/iflytop/zprotocols b/src/iflytop/zprotocols index 9581189..b07e34e 160000 --- a/src/iflytop/zprotocols +++ b/src/iflytop/zprotocols @@ -1 +1 @@ -Subproject commit 9581189118a3a559d3f11895a422a95399113b53 +Subproject commit b07e34e08cd6954295d3a6c2104fd0457bc4dab4