minor change we device now reports back EMULATOR memory size to the client. Had to bump capability version number to 11.
This commit is contained in:
1 parent
6f4643a637
commit
9caa6d6117
8 files changed
+33
-4
No files matched your search
@@ -49,7 +49,6 @@
|
||||
#define Logic0 Iso15693Logic0
|
||||
#define Logic1 Iso15693Logic1
|
||||
#define FrameEOF Iso15693FrameEOF
|
||||
#define CARD_MEMORY_SIZE 4096
|
||||
|
||||
#ifndef ISO15_ERROR_HANDLING_RESPONSE
|
||||
#define ISO15_ERROR_HANDLING_RESPONSE { \
|
||||
|
||||
@@ -952,6 +952,7 @@ int TestProxmark(pm3_device_t *dev) {
|
||||
g_conn.send_via_fpc_usart = g_pm3_capabilities.via_fpc;
|
||||
g_conn.uart_speed = g_pm3_capabilities.baudrate;
|
||||
g_conn.max_cmd_data_size = MIN(g_pm3_capabilities.max_cmd_data_size, (uint16_t)PM3_CMD_DATA_SIZE);
|
||||
g_conn.em_size = g_pm3_capabilities.em_size;
|
||||
|
||||
bool is_tcp_conn = (g_conn.send_via_ip == PM3_TCPv4 || g_conn.send_via_ip == PM3_TCPv6);
|
||||
bool is_bt_conn = (memcmp(g_conn.serial_port_name, "bt:", 3) == 0);
|
||||
@@ -965,6 +966,9 @@ int TestProxmark(pm3_device_t *dev) {
|
||||
);
|
||||
PrintAndLogEx(SUCCESS, "Max frame size: " _GREEN_("%u") " bytes",
|
||||
g_conn.max_cmd_data_size);
|
||||
PrintAndLogEx(SUCCESS, "Emulator memory: " _GREEN_("%u") " bytes%s",
|
||||
g_conn.em_size,
|
||||
(g_pm3_capabilities.em_allocated) ? " ( in use )" : "");
|
||||
if (g_conn.send_via_fpc_usart) {
|
||||
PrintAndLogEx(SUCCESS, "PM3 UART serial baudrate: " _GREEN_("%u") "\n", g_conn.uart_speed);
|
||||
} else {
|
||||
|
||||
@@ -78,6 +78,7 @@ typedef struct {
|
||||
bool listen_for_incoming;
|
||||
char serial_port_name[FILE_PATH_SIZE];
|
||||
uint16_t max_cmd_data_size;
|
||||
uint16_t em_size; // device side CARD_MEMORY_SIZE
|
||||
} communication_arg_t;
|
||||
|
||||
extern communication_arg_t g_conn;
|
||||
|
||||
Reference in new issue
Block a user