From 5ed47307b153a256e90fc5031b58ff65102a7f03 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 27 Jun 2024 10:42:18 +0800 Subject: [PATCH] update --- api/apibasic/cmdid.cpp | 3 ++- api/apibasic/cmdid.hpp | 10 ++++++---- api/apibasic/packet_interface.hpp | 12 ++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/api/apibasic/cmdid.cpp b/api/apibasic/cmdid.cpp index e00100d..c1d2742 100644 --- a/api/apibasic/cmdid.cpp +++ b/api/apibasic/cmdid.cpp @@ -118,7 +118,8 @@ static cmdinfo_t table[] = { CMD_ITERM(ka8000_idcard_write_raw), CMD_ITERM(ka8000_idcard_erase), CMD_ITERM(ka8000_idcard_earse_unlock), - + CMD_ITERM(kevent_a8000_idcard_online), + CMD_ITERM(kevent_a8000_idcard_offline), CMD_ITERM(kplate_code_scaner_push_card_and_scan), CMD_ITERM(kplate_code_scaner_stop_scan), diff --git a/api/apibasic/cmdid.hpp b/api/apibasic/cmdid.hpp index adf1510..e87ee73 100644 --- a/api/apibasic/cmdid.hpp +++ b/api/apibasic/cmdid.hpp @@ -125,10 +125,12 @@ typedef enum { /*********************************************************************************************************************** * IDCARD_READER * ***********************************************************************************************************************/ - ka8000_idcard_reader_read_raw = CMDID(0x71, 0), // para:{index}, ack:{} - ka8000_idcard_write_raw = CMDID(0x71, 1), // (int32_t add, uint8_t* data, int32_t len) - ka8000_idcard_erase = CMDID(0x71, 2), // - ka8000_idcard_earse_unlock = CMDID(0x71, 3), // + ka8000_idcard_reader_read_raw = CMDID(0x71, 0), // para:{index}, ack:{} + ka8000_idcard_write_raw = CMDID(0x71, 1), // (int32_t add, uint8_t* data, int32_t len) + ka8000_idcard_erase = CMDID(0x71, 2), // + ka8000_idcard_earse_unlock = CMDID(0x71, 3), // + kevent_a8000_idcard_online = CMDID(0x71, 200), // + kevent_a8000_idcard_offline = CMDID(0x71, 201), // /*********************************************************************************************************************** * 移液枪 * diff --git a/api/apibasic/packet_interface.hpp b/api/apibasic/packet_interface.hpp index a0802e8..e6cfcb5 100644 --- a/api/apibasic/packet_interface.hpp +++ b/api/apibasic/packet_interface.hpp @@ -6,10 +6,10 @@ namespace zcr { #pragma pack(push, 1) typedef struct { uint16_t packetindex; - uint16_t cmdMainId; // cmd main id - uint8_t cmdSubId; // cmd sub id - uint8_t packetType; // - uint16_t subModuleid; // module id + uint16_t cmdMainId; // cmd main id + uint8_t cmdSubId; // cmd sub id + uint8_t packetType; // + uint16_t moduleid; // module id uint8_t data[]; } zcr_cmd_header_t; #pragma pack(pop) @@ -24,8 +24,8 @@ typedef enum { } // namespace zcr } // namespace iflytop -#define CMD_SUB_ID(cmdid) (cmdid & 0xff) -#define MODULE_CMDID(cmdid) (cmdid >> 8) +#define CMD_SUB_ID(cmdid) (cmdid & 0xff) +#define MODULE_CMDID(cmdid) (cmdid >> 8) #define STEP_MOTOR_ID_OFF 100 #define XY_MOTOR_ID_OFF 200