|
|
@ -104,7 +104,7 @@ shared_ptr<Receipt> ZSCanProtocolCom::base_callcmd(int32_t to, int32_t cmdid, ui |
|
|
|
|
|
|
|
if (m_receipt_frame->ptype == kerror_receipt) { |
|
|
|
int32_t ecode = *(int32_t *)m_receipt_frame->params; |
|
|
|
THROW_APP_EXCEPTION(ecode, Internationalization::ecode2description(ecode, cmdid, to, param, paramLen)); |
|
|
|
THROW_APP_EXCEPTION(ecode, Internationalization::ecode2description(ecode, to, cmdid, param, paramLen)); |
|
|
|
} |
|
|
|
|
|
|
|
shared_ptr<Receipt> receipt = make_shared<Receipt>(); |
|
|
@ -146,7 +146,7 @@ shared_ptr<Receipt> ZSCanProtocolCom::callcmd(int32_t to, int32_t cmdid, uint8_t |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
THROW_APP_EXCEPTION(ecode, Internationalization::ecode2description(ecode, cmdid, to, param, paramLen)); |
|
|
|
THROW_APP_EXCEPTION(ecode, Internationalization::ecode2description(ecode, to, cmdid, param, paramLen)); |
|
|
|
return nullptr; |
|
|
|
} |
|
|
|
shared_ptr<Receipt> ZSCanProtocolCom::callcmd0(int32_t to, int32_t cmdid, int32_t overtime) { return callcmd(to, cmdid, nullptr, 0, overtime); } |
|
|
@ -186,7 +186,6 @@ shared_ptr<Receipt> ZSCanProtocolCom::callcmd5(int32_t to, int32_t cmdid, int32_ |
|
|
|
return callcmd(to, cmdid, (uint8_t *)param, 20, overtime); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void ZSCanProtocolCom::callOnReport(uint8_t from, uint8_t *hex, uint32_t hexlen) { |
|
|
|
shared_ptr<ZBin> hexbin = make_shared<ZBin>(hex, hexlen); |
|
|
|
m_wq->enQueue([this, from, hexbin]() { onReport(from, (uint8_t *)hexbin->data(), hexbin->size()); }); |
|
|
|