RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-21 04:29:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2019-05-08 00:17:52 +02:00
commit 964006fd21
3 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
armsrc/appmain.c
View file

@ -461,11 +461,8 @@ void SendCapabilities(void) {
#endif #endif
#ifdef WITH_FPC_USART_HOST #ifdef WITH_FPC_USART_HOST
capabilities.compiled_with_fpc_usart_host = true; capabilities.compiled_with_fpc_usart_host = true;
// TODO
capabilities.hw_available_fpc_usart_btaddon = true;
#else #else
capabilities.compiled_with_fpc_usart_host = false; capabilities.compiled_with_fpc_usart_host = false;
capabilities.hw_available_fpc_usart_btaddon = false;
#endif #endif
#ifdef WITH_LF #ifdef WITH_LF
capabilities.compiled_with_lf = true; capabilities.compiled_with_lf = true;
@ -1520,6 +1517,7 @@ static void PacketReceived(PacketCommandNG *packet) {
break; break;
case CMD_CAPABILITIES: case CMD_CAPABILITIES:
SendCapabilities(); SendCapabilities();
break;
case CMD_PING: case CMD_PING:
reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length); reply_ng(CMD_PING, PM3_SUCCESS, packet->data.asBytes, packet->length);
break; break;

2
client/comms.c
View file

@ -608,7 +608,7 @@ int TestProxmark(void) {
return PM3_EIO; return PM3_EIO;
SendCommandNG(CMD_CAPABILITIES, NULL, 0); SendCommandNG(CMD_CAPABILITIES, NULL, 0);
if (WaitForResponseTimeoutW(CMD_PING, &resp, 1000, false)) { if (WaitForResponseTimeoutW(CMD_CAPABILITIES, &resp, 1000, false)) {
memcpy(&pm3_capabilities, resp.data.asBytes, resp.length); memcpy(&pm3_capabilities, resp.data.asBytes, resp.length);
conn.send_via_fpc_usart = pm3_capabilities.via_fpc; conn.send_via_fpc_usart = pm3_capabilities.via_fpc;
conn.uart_speed = pm3_capabilities.baudrate; conn.uart_speed = pm3_capabilities.baudrate;

40
include/pm3_cmd.h
View file

@ -137,36 +137,32 @@ typedef struct {
uint16_t read_gap; uint16_t read_gap;
} t55xx_config; } t55xx_config;
// TODO add more fields to report all hw & sw capabilities of pm3
typedef struct { typedef struct {
uint32_t baudrate; uint32_t baudrate;
bool via_fpc; bool via_fpc :1;
// rdv4 // rdv4
bool compiled_with_flash; bool compiled_with_flash :1;
bool compiled_with_smartcard; bool compiled_with_smartcard :1;
bool compiled_with_fpc_usart; bool compiled_with_fpc_usart :1;
bool compiled_with_fpc_usart_dev; bool compiled_with_fpc_usart_dev :1;
bool compiled_with_fpc_usart_host; bool compiled_with_fpc_usart_host :1;
// lf // lf
bool compiled_with_lf; bool compiled_with_lf :1;
bool compiled_with_hitag; bool compiled_with_hitag :1;
// hf // hf
bool compiled_with_hfsniff; bool compiled_with_hfsniff :1;
bool compiled_with_iso14443a; bool compiled_with_iso14443a :1;
bool compiled_with_iso14443b; bool compiled_with_iso14443b :1;
bool compiled_with_iso15693; bool compiled_with_iso15693 :1;
bool compiled_with_felica; bool compiled_with_felica :1;
bool compiled_with_legicrf; bool compiled_with_legicrf :1;
bool compiled_with_iclass; bool compiled_with_iclass :1;
// misc // misc
bool compiled_with_lcd; bool compiled_with_lcd :1;
// Following are not yet implemented:
// rdv4 // rdv4
bool hw_available_flash; bool hw_available_flash :1;
bool hw_available_smartcard; bool hw_available_smartcard :1;
// rdv4 bt addon
bool hw_available_fpc_usart_btaddon;
} PACKED capabilities_t; } PACKED capabilities_t;
extern capabilities_t pm3_capabilities; extern capabilities_t pm3_capabilities;