github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fpga merge hell, all compiles

Browse source
This commit is contained in:
iceman1001 2020-07-08 09:45:49 +02:00
parent b775b68e4e
commit ce24e6acbb
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/appmain.c
View file

@ -1031,8 +1031,13 @@ static void PacketReceived(PacketCommandNG *packet) {
AcquireRawAdcSamplesIso15693(); AcquireRawAdcSamplesIso15693();
break; break;
} }
case CMD_HF_ISO15693_RAWADC: { case CMD_HF_ISO15693_SNIFF: {
RecordRawAdcSamplesIso15693(); struct p {
uint8_t jam_search_len;
uint8_t jam_search_string[];
} PACKED;
struct p *payload = (struct p *) packet->data.asBytes;
SniffIso15693(payload->jam_search_len, payload->jam_search_string);
break; break;
} }
case CMD_HF_ISO15693_COMMAND: { case CMD_HF_ISO15693_COMMAND: {

2
armsrc/iso15693.h
View file

@ -33,7 +33,7 @@ int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eo
void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time); void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time);
int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time); int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time);
void RecordRawAdcSamplesIso15693(void); //void RecordRawAdcSamplesIso15693(void);
void AcquireRawAdcSamplesIso15693(void); void AcquireRawAdcSamplesIso15693(void);
void ReaderIso15693(uint32_t parameter); // Simulate an ISO15693 reader - greg void ReaderIso15693(uint32_t parameter); // Simulate an ISO15693 reader - greg
void SimTagIso15693(uint8_t *uid); // simulate an ISO15693 tag - greg void SimTagIso15693(uint8_t *uid); // simulate an ISO15693 tag - greg

7
client/src/cmdhf15.c
View file

@ -973,12 +973,12 @@ static int CmdHF15Info(const char *Cmd) {
// Record Activity without enabling carrier // Record Activity without enabling carrier
//helptext //helptext
static int CmdHF15Record(const char *Cmd) { static int CmdHF15Sniff(const char *Cmd) {
char cmdp = tolower(param_getchar(Cmd, 0)); char cmdp = tolower(param_getchar(Cmd, 0));
if (cmdp == 'h') return usage_15_record(); if (cmdp == 'h') return usage_15_record();
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_HF_ISO15693_RAWADC, NULL, 0); SendCommandNG(CMD_HF_ISO15693_SNIFF, NULL, 0);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -1841,9 +1841,8 @@ static command_t CommandTable[] = {
{"demod", CmdHF15Demod, AlwaysAvailable, "Demodulate ISO15693 from tag"}, {"demod", CmdHF15Demod, AlwaysAvailable, "Demodulate ISO15693 from tag"},
{"dump", CmdHF15Dump, IfPm3Iso15693, "Read all memory pages of an ISO15693 tag, save to file"}, {"dump", CmdHF15Dump, IfPm3Iso15693, "Read all memory pages of an ISO15693 tag, save to file"},
{"info", CmdHF15Info, IfPm3Iso15693, "Tag information"}, {"info", CmdHF15Info, IfPm3Iso15693, "Tag information"},
// {"sniff", CmdHF15Sniff, IfPm3Iso15693, "Sniff ISO15693 traffic"}, {"sniff", CmdHF15Sniff, IfPm3Iso15693, "Sniff ISO15693 traffic"},
{"raw", CmdHF15Raw, IfPm3Iso15693, "Send raw hex data to tag"}, {"raw", CmdHF15Raw, IfPm3Iso15693, "Send raw hex data to tag"},
{"record", CmdHF15Record, IfPm3Iso15693, "Record Samples (ISO15693)"},
{"read", CmdHF15Read, IfPm3Iso15693, "Read a block"}, {"read", CmdHF15Read, IfPm3Iso15693, "Read a block"},
{"reader", CmdHF15Reader, IfPm3Iso15693, "Act like an ISO15693 reader"}, {"reader", CmdHF15Reader, IfPm3Iso15693, "Act like an ISO15693 reader"},
{"readmulti", CmdHF15Readmulti, IfPm3Iso15693, "Reads multiple Blocks"}, {"readmulti", CmdHF15Readmulti, IfPm3Iso15693, "Reads multiple Blocks"},

2
include/pm3_cmd.h
View file

@ -431,7 +431,7 @@ typedef struct {
#define CMD_HF_ISO14443B_COMMAND 0x0305 #define CMD_HF_ISO14443B_COMMAND 0x0305
#define CMD_HF_ISO15693_READER 0x0310 #define CMD_HF_ISO15693_READER 0x0310
#define CMD_HF_ISO15693_SIMULATE 0x0311 #define CMD_HF_ISO15693_SIMULATE 0x0311
#define CMD_HF_ISO15693_RAWADC 0x0312 #define CMD_HF_ISO15693_SNIFF 0x0312
#define CMD_HF_ISO15693_COMMAND 0x0313 #define CMD_HF_ISO15693_COMMAND 0x0313
#define CMD_HF_ISO15693_FINDAFI 0x0315 #define CMD_HF_ISO15693_FINDAFI 0x0315
#define CMD_LF_SNIFF_RAW_ADC 0x0317 #define CMD_LF_SNIFF_RAW_ADC 0x0317