github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: allow to download ´lf config´ settings to client

Browse source
This commit is contained in:
iceman1001 2020-03-05 11:16:05 +01:00
commit b6dcfbf078
5 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/appmain.c
View file

@ -721,10 +721,17 @@ static void PacketReceived(PacketCommandNG *packet) {
setT55xxConfig(packet->oldarg[0], (t55xx_configurations_t *) packet->data.asBytes); setT55xxConfig(packet->oldarg[0], (t55xx_configurations_t *) packet->data.asBytes);
break; break;
} }
case CMD_LF_SAMPLING_GET_CONFIG: { case CMD_LF_SAMPLING_PRINT_CONFIG: {
printConfig(); printConfig();
break; break;
} }
case CMD_LF_SAMPLING_GET_CONFIG: {
sample_config *c;
c = getSamplingConfig();
Dbprintf("CMD_LF_SAMPLING_GET_CONFIG - before answer");
reply_ng(CMD_LF_SAMPLING_GET_CONFIG, PM3_SUCCESS, (uint8_t *)c, sizeof(sample_config));
break;
}
case CMD_LF_SAMPLING_SET_CONFIG: { case CMD_LF_SAMPLING_SET_CONFIG: {
sample_config c; sample_config c;
memcpy(&c, packet->data.asBytes, sizeof(sample_config)); memcpy(&c, packet->data.asBytes, sizeof(sample_config));

2
armsrc/lfsampling.c
View file

@ -81,7 +81,7 @@ void setSamplingConfig(sample_config *sc) {
printConfig(); printConfig();
} }
sample_config *getSamplingConfig() { sample_config *getSamplingConfig(void) {
return &config; return &config;
} }

21
client/cmdlf.c
View file

@ -457,6 +457,25 @@ int CmdFlexdemod(const char *Cmd) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
int lf_getconfig(sample_config *config) {
if (!session.pm3_present) return PM3_ENOTTY;
if (config == NULL)
return PM3_EINVARG;
clearCommandBuffer();
SendCommandNG(CMD_LF_SAMPLING_GET_CONFIG, NULL, 0);
PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_LF_SAMPLING_GET_CONFIG, &resp, 2000)) {
PrintAndLogEx(WARNING, "command execution time out");
return PM3_ETIMEOUT;
}
config = (sample_config *) resp.data.asBytes;
return PM3_SUCCESS;
}
int lf_config(sample_config *config) { int lf_config(sample_config *config) {
if (!session.pm3_present) return PM3_ENOTTY; if (!session.pm3_present) return PM3_ENOTTY;
@ -464,7 +483,7 @@ int lf_config(sample_config *config) {
if (config != NULL) if (config != NULL)
SendCommandNG(CMD_LF_SAMPLING_SET_CONFIG, (uint8_t *)config, sizeof(sample_config)); SendCommandNG(CMD_LF_SAMPLING_SET_CONFIG, (uint8_t *)config, sizeof(sample_config));
else else
SendCommandNG(CMD_LF_SAMPLING_GET_CONFIG, NULL, 0); SendCommandNG(CMD_LF_SAMPLING_PRINT_CONFIG, NULL, 0);
return PM3_SUCCESS; return PM3_SUCCESS;
} }

1
client/cmdlf.h
View file

@ -34,5 +34,6 @@ int CmdLFfind(const char *Cmd);
int lf_read(bool verbose, uint32_t samples); int lf_read(bool verbose, uint32_t samples);
int lf_config(sample_config *config); int lf_config(sample_config *config);
int lf_getconfig(sample_config *config);
#endif #endif

3
include/pm3_cmd.h
View file

@ -392,7 +392,8 @@ typedef struct {
#define CMD_LF_T55XX_WAKEUP 0x0224 #define CMD_LF_T55XX_WAKEUP 0x0224
#define CMD_LF_COTAG_READ 0x0225 #define CMD_LF_COTAG_READ 0x0225
#define CMD_LF_T55XX_SET_CONFIG 0x0226 #define CMD_LF_T55XX_SET_CONFIG 0x0226
#define CMD_LF_SAMPLING_GET_CONFIG 0x0227 #define CMD_LF_SAMPLING_PRINT_CONFIG 0x0227
#define CMD_LF_SAMPLING_GET_CONFIG 0x0228
#define CMD_LF_T55XX_CHK_PWDS 0x0230 #define CMD_LF_T55XX_CHK_PWDS 0x0230
#define CMD_LF_T55XX_DANGERRAW 0x0231 #define CMD_LF_T55XX_DANGERRAW 0x0231