Browse Source

fix some bug

master
zhaohe 2 years ago
parent
commit
5ca88d73b1
  1. 7
      protocol_parser.cpp

7
protocol_parser.cpp

@ -1,12 +1,14 @@
#include "protocol_parser.hpp" #include "protocol_parser.hpp"
#include <stdio.h>
using namespace iflytop; using namespace iflytop;
using namespace std; using namespace std;
#define TAG "ZIProtocolParser" #define TAG "ZIProtocolParser"
#define PROCESS_PACKET_BEGIN(var_cmdid, var_moduleType) \ #define PROCESS_PACKET_BEGIN(var_cmdid, var_moduleType) \
int32_t* param __attribute__((__unused__)) = (int32_t*)data; \ int32_t* param __attribute__((__unused__)) = (int32_t*)data; \
int paramNum __attribute__((__unused__)) = (len - sizeof(zcr_cmd_header_t)) / sizeof(int32_t); \
int paramNum __attribute__((__unused__)) = (len) / sizeof(int32_t); \
if (cmdid == var_cmdid) { \ if (cmdid == var_cmdid) { \
auto* mod = dynamic_cast<var_moduleType*>(module); \ auto* mod = dynamic_cast<var_moduleType*>(module); \
if (mod == nullptr) { \ if (mod == nullptr) { \
@ -76,14 +78,17 @@ void ZIProtocolParser::registerModule(ZIModule* module) {
} }
void ZIProtocolParser::onRceivePacket(zcr_cmd_header_t* rxcmd, uint8_t* data, int32_t len) { void ZIProtocolParser::onRceivePacket(zcr_cmd_header_t* rxcmd, uint8_t* data, int32_t len) {
printf("onRceivePacket cmdid:%d submoduleid:%d subcmdid:%d\n", rxcmd->cmdmoduleid, rxcmd->submoduleid, rxcmd->subcmdid);
uint16_t submoduleid = rxcmd->submoduleid; uint16_t submoduleid = rxcmd->submoduleid;
auto it = m_modulers.find(submoduleid); auto it = m_modulers.find(submoduleid);
if (it == m_modulers.end()) { if (it == m_modulers.end()) {
return; return;
} }
printf("1\n");
ZIModule* module = it->second; ZIModule* module = it->second;
int32_t cmdid = CMDID(rxcmd->cmdmoduleid, rxcmd->subcmdid); int32_t cmdid = CMDID(rxcmd->cmdmoduleid, rxcmd->subcmdid);
printf("2 %d\n", cmdid);
/******************************************************************************* /*******************************************************************************
* module * * module *

Loading…
Cancel
Save