mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-07-06 05:01:17 -07:00
Merge pull request #909 from pwpiwi/fix_button_break
Fix "Sending bytes to proxmark failed" with BUTTON_PRESS()
This commit is contained in:
pwpiwi
GitHub
commit
d00a30d56f
1 changed files with 203 additions and 262 deletions
281
armsrc/appmain.c
281
armsrc/appmain.c
|
|
@ -59,27 +59,25 @@ int ToSendMax;
|
|||
static int ToSendBit;
|
||||
struct common_area common_area __attribute__((section(".commonarea")));
|
||||
|
||||
void ToSendReset(void)
|
||||
{
|
||||
void ToSendReset(void) {
|
||||
ToSendMax = -1;
|
||||
ToSendBit = 8;
|
||||
}
|
||||
|
||||
void ToSendStuffBit(int b)
|
||||
{
|
||||
if(ToSendBit >= 8) {
|
||||
void ToSendStuffBit(int b) {
|
||||
if (ToSendBit >= 8) {
|
||||
ToSendMax++;
|
||||
ToSend[ToSendMax] = 0;
|
||||
ToSendBit = 0;
|
||||
}
|
||||
|
||||
if(b) {
|
||||
if (b) {
|
||||
ToSend[ToSendMax] |= (1 << (7 - ToSendBit));
|
||||
}
|
||||
|
||||
ToSendBit++;
|
||||
|
||||
if(ToSendMax >= sizeof(ToSend)) {
|
||||
if (ToSendMax >= sizeof(ToSend)) {
|
||||
ToSendBit = 0;
|
||||
DbpString("ToSendStuffBit overflowed!");
|
||||
}
|
||||
|
|
@ -89,19 +87,11 @@ void ToSendStuffBit(int b)
|
|||
// Debug print functions, to go out over USB, to the usual PC-side client.
|
||||
//=============================================================================
|
||||
|
||||
void DbpString(char *str)
|
||||
{
|
||||
byte_t len = strlen(str);
|
||||
cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
|
||||
void DbpString(char *str) {
|
||||
uint8_t len = strlen(str);
|
||||
cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(uint8_t*)str,len);
|
||||
}
|
||||
|
||||
#if 0
|
||||
void DbpIntegers(int x1, int x2, int x3)
|
||||
{
|
||||
cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
|
||||
}
|
||||
#endif
|
||||
|
||||
void Dbprintf(const char *fmt, ...) {
|
||||
// should probably limit size here; oh well, let's just use a big buffer
|
||||
char output_string[128];
|
||||
|
|
@ -127,17 +117,17 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
|
|||
ascii[l]=0;
|
||||
|
||||
// filter safe ascii
|
||||
for (i=0;i<l;i++)
|
||||
if (ascii[i]<32 || ascii[i]>126) ascii[i]='.';
|
||||
for (i = 0; i < l; i++)
|
||||
if (ascii[i]<32 || ascii[i]>126) ascii[i] = '.';
|
||||
|
||||
if (bAsci) {
|
||||
Dbprintf("%-8s %*D",ascii,l,d," ");
|
||||
Dbprintf("%-8s %*D",ascii, l, d, " ");
|
||||
} else {
|
||||
Dbprintf("%*D",l,d," ");
|
||||
Dbprintf("%*D", l, d, " ");
|
||||
}
|
||||
|
||||
len-=8;
|
||||
d+=8;
|
||||
len -= 8;
|
||||
d += 8;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -146,8 +136,7 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
|
|||
// in ADC units (0 to 1023). Also a routine to average 32 samples and
|
||||
// return that.
|
||||
//-----------------------------------------------------------------------------
|
||||
static int ReadAdc(int ch)
|
||||
{
|
||||
static int ReadAdc(int ch) {
|
||||
// Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
|
||||
// AMPL_HI is a high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
|
||||
// of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged.
|
||||
|
|
@ -171,8 +160,7 @@ static int ReadAdc(int ch)
|
|||
return AT91C_BASE_ADC->ADC_CDR[ch] & 0x3ff;
|
||||
}
|
||||
|
||||
int AvgAdc(int ch) // was static - merlok
|
||||
{
|
||||
int AvgAdc(int ch) { // was static - merlok{
|
||||
int i;
|
||||
int a = 0;
|
||||
|
||||
|
|
@ -183,8 +171,7 @@ int AvgAdc(int ch) // was static - merlok
|
|||
return (a + 15) >> 5;
|
||||
}
|
||||
|
||||
static int AvgAdc_Voltage_HF(void)
|
||||
{
|
||||
static int AvgAdc_Voltage_HF(void) {
|
||||
int AvgAdc_Voltage_Low, AvgAdc_Voltage_High;
|
||||
|
||||
AvgAdc_Voltage_Low= (MAX_ADC_HF_VOLTAGE_LOW * AvgAdc(ADC_CHAN_HF_LOW)) >> 10;
|
||||
|
|
@ -198,13 +185,11 @@ static int AvgAdc_Voltage_HF(void)
|
|||
return AvgAdc_Voltage_Low;
|
||||
}
|
||||
|
||||
static int AvgAdc_Voltage_LF(void)
|
||||
{
|
||||
static int AvgAdc_Voltage_LF(void) {
|
||||
return (MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10;
|
||||
}
|
||||
|
||||
void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv, uint8_t LF_Results[])
|
||||
{
|
||||
void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv, uint8_t LF_Results[]) {
|
||||
int i, adcval = 0, peak = 0;
|
||||
|
||||
/*
|
||||
|
|
@ -220,16 +205,16 @@ void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv
|
|||
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
|
||||
SpinDelay(50);
|
||||
|
||||
for (i=255; i>=19; i--) {
|
||||
for (i = 255; i >= 19; i--) {
|
||||
WDT_HIT();
|
||||
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
|
||||
SpinDelay(20);
|
||||
adcval = AvgAdc_Voltage_LF();
|
||||
if (i==95) *vLf125 = adcval; // voltage at 125Khz
|
||||
if (i==89) *vLf134 = adcval; // voltage at 134Khz
|
||||
if (i == 95) *vLf125 = adcval; // voltage at 125Khz
|
||||
if (i == 89) *vLf134 = adcval; // voltage at 134Khz
|
||||
|
||||
LF_Results[i] = adcval >> 9; // scale int to fit in byte for graphing purposes
|
||||
if(LF_Results[i] > peak) {
|
||||
if (LF_Results[i] > peak) {
|
||||
*peakv = adcval;
|
||||
peak = LF_Results[i];
|
||||
*peakf = i;
|
||||
|
|
@ -237,13 +222,12 @@ void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv
|
|||
}
|
||||
}
|
||||
|
||||
for (i=18; i >= 0; i--) LF_Results[i] = 0;
|
||||
for (i = 18; i >= 0; i--) LF_Results[i] = 0;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void MeasureAntennaTuningHfOnly(int *vHf)
|
||||
{
|
||||
void MeasureAntennaTuningHfOnly(int *vHf) {
|
||||
// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
|
||||
LED_A_ON();
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
|
||||
|
|
@ -254,8 +238,7 @@ void MeasureAntennaTuningHfOnly(int *vHf)
|
|||
return;
|
||||
}
|
||||
|
||||
void MeasureAntennaTuning(int mode)
|
||||
{
|
||||
void MeasureAntennaTuning(int mode) {
|
||||
uint8_t LF_Results[256] = {0};
|
||||
int peakv = 0, peakf = 0;
|
||||
int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV
|
||||
|
|
@ -281,8 +264,7 @@ void MeasureAntennaTuning(int mode)
|
|||
return;
|
||||
}
|
||||
|
||||
void MeasureAntennaTuningHf(void)
|
||||
{
|
||||
void MeasureAntennaTuningHf(void) {
|
||||
int vHf = 0; // in mV
|
||||
|
||||
DbpString("Measuring HF antenna, press button to exit");
|
||||
|
|
@ -305,8 +287,7 @@ void MeasureAntennaTuningHf(void)
|
|||
}
|
||||
|
||||
|
||||
void ReadMem(int addr)
|
||||
{
|
||||
void ReadMem(int addr) {
|
||||
const uint8_t *data = ((uint8_t *)addr);
|
||||
|
||||
Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
|
||||
|
|
@ -319,8 +300,7 @@ extern struct version_information version_information;
|
|||
extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
|
||||
|
||||
|
||||
void set_hw_capabilities(void)
|
||||
{
|
||||
void set_hw_capabilities(void) {
|
||||
if (I2C_is_available()) {
|
||||
hw_capabilities |= HAS_SMARTCARD_SLOT;
|
||||
}
|
||||
|
|
@ -331,8 +311,7 @@ void set_hw_capabilities(void)
|
|||
}
|
||||
|
||||
|
||||
void SendVersion(void)
|
||||
{
|
||||
void SendVersion(void) {
|
||||
set_hw_capabilities();
|
||||
|
||||
char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
|
||||
|
|
@ -343,7 +322,7 @@ void SendVersion(void)
|
|||
* pointer, then use it.
|
||||
*/
|
||||
char *bootrom_version = *(char**)&_bootphase1_version_pointer;
|
||||
if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
|
||||
if (bootrom_version < &_flash_start || bootrom_version >= &_flash_end) {
|
||||
strcat(VersionString, "bootrom version information appears invalid\n");
|
||||
} else {
|
||||
FormatVersionInformation(temp, sizeof(temp), "bootrom: ", bootrom_version);
|
||||
|
|
@ -373,8 +352,7 @@ void SendVersion(void)
|
|||
|
||||
// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
|
||||
// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
|
||||
void printUSBSpeed(void)
|
||||
{
|
||||
void printUSBSpeed(void) {
|
||||
Dbprintf("USB Speed:");
|
||||
Dbprintf(" Sending USB packets to client...");
|
||||
|
||||
|
|
@ -403,8 +381,7 @@ void printUSBSpeed(void)
|
|||
/**
|
||||
* Prints runtime information about the PM3.
|
||||
**/
|
||||
void SendStatus(void)
|
||||
{
|
||||
void SendStatus(void) {
|
||||
BigBuf_print_status();
|
||||
Fpga_print_status();
|
||||
#ifdef WITH_SMARTCARD
|
||||
|
|
@ -424,8 +401,7 @@ void SendStatus(void)
|
|||
|
||||
#define OPTS 2
|
||||
|
||||
void StandAloneMode()
|
||||
{
|
||||
void StandAloneMode() {
|
||||
DbpString("Stand-alone mode! No PC necessary.");
|
||||
// Oooh pretty -- notify user we're in elite samy mode now
|
||||
LED(LED_RED, 200);
|
||||
|
|
@ -437,7 +413,6 @@ void StandAloneMode()
|
|||
LED(LED_GREEN, 200);
|
||||
LED(LED_ORANGE, 200);
|
||||
LED(LED_RED, 200);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -445,8 +420,7 @@ void StandAloneMode()
|
|||
|
||||
|
||||
#ifdef WITH_ISO14443a_StandAlone
|
||||
void StandAloneMode14a()
|
||||
{
|
||||
void StandAloneMode14a() {
|
||||
StandAloneMode();
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
|
||||
|
||||
|
|
@ -462,14 +436,12 @@ void StandAloneMode14a()
|
|||
|
||||
LED(selected + 1, 0);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;) {
|
||||
usb_poll();
|
||||
WDT_HIT();
|
||||
SpinDelay(300);
|
||||
|
||||
if (GotoRecord || !cardRead[selected])
|
||||
{
|
||||
if (GotoRecord || !cardRead[selected]) {
|
||||
GotoRecord = false;
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
|
|
@ -484,48 +456,42 @@ void StandAloneMode14a()
|
|||
uint32_t cuid;
|
||||
iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
|
||||
|
||||
for ( ; ; )
|
||||
{
|
||||
for ( ; ; ) {
|
||||
WDT_HIT();
|
||||
if (BUTTON_PRESS()) {
|
||||
if (cardRead[selected]) {
|
||||
Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
|
||||
break;
|
||||
}
|
||||
else if (cardRead[(selected+1)%OPTS]) {
|
||||
} else if (cardRead[(selected+1)%OPTS]) {
|
||||
Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
|
||||
selected = (selected+1)%OPTS;
|
||||
break;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
|
||||
SpinDelay(300);
|
||||
}
|
||||
}
|
||||
if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid, true, 0, true))
|
||||
continue;
|
||||
else
|
||||
{
|
||||
else {
|
||||
Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
|
||||
memcpy(readUID,uid,10*sizeof(uint8_t));
|
||||
uint8_t *dst = (uint8_t *)&uid_tmp1;
|
||||
// Set UID byte order
|
||||
for (int i=0; i<4; i++)
|
||||
for (int i = 0; i < 4; i++)
|
||||
dst[i] = uid[3-i];
|
||||
dst = (uint8_t *)&uid_tmp2;
|
||||
for (int i=0; i<4; i++)
|
||||
for (int i = 0; i < 4; i++)
|
||||
dst[i] = uid[7-i];
|
||||
if (uid_1st[(selected+1)%OPTS] == uid_tmp1 && uid_2nd[(selected+1)%OPTS] == uid_tmp2) {
|
||||
if (uid_1st[(selected+1) % OPTS] == uid_tmp1 && uid_2nd[(selected+1) % OPTS] == uid_tmp2) {
|
||||
Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (uid_tmp2) {
|
||||
Dbprintf("Bank[%d] received a 7-byte UID",selected);
|
||||
Dbprintf("Bank[%d] received a 7-byte UID", selected);
|
||||
uid_1st[selected] = (uid_tmp1)>>8;
|
||||
uid_2nd[selected] = (uid_tmp1<<24) + (uid_tmp2>>8);
|
||||
}
|
||||
else {
|
||||
Dbprintf("Bank[%d] received a 4-byte UID",selected);
|
||||
} else {
|
||||
Dbprintf("Bank[%d] received a 4-byte UID", selected);
|
||||
uid_1st[selected] = uid_tmp1;
|
||||
uid_2nd[selected] = uid_tmp2;
|
||||
}
|
||||
|
|
@ -533,8 +499,8 @@ void StandAloneMode14a()
|
|||
}
|
||||
}
|
||||
}
|
||||
Dbprintf("ATQA = %02X%02X",hi14a_card[selected].atqa[0],hi14a_card[selected].atqa[1]);
|
||||
Dbprintf("SAK = %02X",hi14a_card[selected].sak);
|
||||
Dbprintf("ATQA = %02X%02X", hi14a_card[selected].atqa[0], hi14a_card[selected].atqa[1]);
|
||||
Dbprintf("SAK = %02X", hi14a_card[selected].sak);
|
||||
LEDsoff();
|
||||
LED(LED_GREEN, 200);
|
||||
LED(LED_ORANGE, 200);
|
||||
|
|
@ -548,10 +514,7 @@ void StandAloneMode14a()
|
|||
playing = true;
|
||||
|
||||
cardRead[selected] = true;
|
||||
}
|
||||
/* MF Classic UID clone */
|
||||
else if (GotoClone)
|
||||
{
|
||||
} else if (GotoClone) { /* MF Classic UID clone */
|
||||
GotoClone=false;
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
|
|
@ -562,8 +525,7 @@ void StandAloneMode14a()
|
|||
Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
|
||||
|
||||
// wait for button to be released
|
||||
while(BUTTON_PRESS())
|
||||
{
|
||||
while(BUTTON_PRESS()) {
|
||||
// Delay cloning until card is in place
|
||||
WDT_HIT();
|
||||
}
|
||||
|
|
@ -604,29 +566,26 @@ void StandAloneMode14a()
|
|||
if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1] && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
|
||||
Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
|
||||
playing = true;
|
||||
}
|
||||
else {
|
||||
Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]);
|
||||
memcpy(newBlock0,oldBlock0,16);
|
||||
} else {
|
||||
Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
|
||||
memcpy(newBlock0, oldBlock0, 16);
|
||||
// Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
|
||||
|
||||
newBlock0[0] = uid_1st[selected]>>24;
|
||||
newBlock0[1] = 0xFF & (uid_1st[selected]>>16);
|
||||
newBlock0[2] = 0xFF & (uid_1st[selected]>>8);
|
||||
newBlock0[0] = uid_1st[selected] >> 24;
|
||||
newBlock0[1] = 0xFF & (uid_1st[selected] >> 16);
|
||||
newBlock0[2] = 0xFF & (uid_1st[selected] >> 8);
|
||||
newBlock0[3] = 0xFF & (uid_1st[selected]);
|
||||
newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
|
||||
newBlock0[4] = newBlock0[0] ^ newBlock0[1] ^ newBlock0[2] ^ newBlock0[3];
|
||||
// arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
|
||||
MifareCSetBlock(0, 0xFF,0, newBlock0);
|
||||
MifareCSetBlock(0, 0xFF, 0, newBlock0);
|
||||
MifareCGetBlock(0x3F, 1, 0, testBlock0);
|
||||
if (memcmp(testBlock0,newBlock0,16)==0)
|
||||
{
|
||||
if (memcmp(testBlock0, newBlock0, 16) == 0) {
|
||||
DbpString("Cloned successfull!");
|
||||
cardRead[selected] = false; // Only if the card was cloned successfully should we clear it
|
||||
playing = false;
|
||||
GotoRecord = true;
|
||||
selected = (selected+1) % OPTS;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
|
||||
playing = true;
|
||||
}
|
||||
|
|
@ -634,10 +593,9 @@ void StandAloneMode14a()
|
|||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
|
||||
}
|
||||
} else if (playing) {
|
||||
// button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
|
||||
// Change where to record (or begin playing)
|
||||
else if (playing) // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
|
||||
{
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
|
||||
|
|
@ -649,31 +607,26 @@ void StandAloneMode14a()
|
|||
int button_action = BUTTON_HELD(1000);
|
||||
if (button_action == 0) { // No button action, proceed with sim
|
||||
uint8_t data[512] = {0}; // in case there is a read command received we shouldn't break
|
||||
Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
|
||||
Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected], uid_2nd[selected], selected);
|
||||
if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) {
|
||||
DbpString("Mifare Classic");
|
||||
SimulateIso14443aTag(1,uid_1st[selected], uid_2nd[selected], data); // Mifare Classic
|
||||
}
|
||||
else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
|
||||
SimulateIso14443aTag(1, uid_1st[selected], uid_2nd[selected], data); // Mifare Classic
|
||||
} else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
|
||||
DbpString("Mifare Ultralight");
|
||||
SimulateIso14443aTag(2,uid_1st[selected],uid_2nd[selected],data); // Mifare Ultralight
|
||||
}
|
||||
else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
|
||||
SimulateIso14443aTag(2, uid_1st[selected], uid_2nd[selected], data); // Mifare Ultralight
|
||||
} else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
|
||||
DbpString("Mifare DESFire");
|
||||
SimulateIso14443aTag(3,uid_1st[selected],uid_2nd[selected],data); // Mifare DESFire
|
||||
}
|
||||
else {
|
||||
SimulateIso14443aTag(3, uid_1st[selected], uid_2nd[selected], data); // Mifare DESFire
|
||||
} else {
|
||||
Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
|
||||
SimulateIso14443aTag(1,uid_1st[selected], uid_2nd[selected], data);
|
||||
SimulateIso14443aTag(1, uid_1st[selected], uid_2nd[selected], data);
|
||||
}
|
||||
}
|
||||
else if (button_action == BUTTON_SINGLE_CLICK) {
|
||||
} else if (button_action == BUTTON_SINGLE_CLICK) {
|
||||
selected = (selected + 1) % OPTS;
|
||||
Dbprintf("Done playing. Switching to record mode on bank %d",selected);
|
||||
GotoRecord = true;
|
||||
break;
|
||||
}
|
||||
else if (button_action == BUTTON_HOLD) {
|
||||
} else if (button_action == BUTTON_HOLD) {
|
||||
Dbprintf("Playtime over. Begin cloning...");
|
||||
GotoClone = true;
|
||||
break;
|
||||
|
|
@ -688,10 +641,11 @@ void StandAloneMode14a()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#elif WITH_LF_StandAlone
|
||||
|
||||
// samy's sniff and repeat routine
|
||||
void SamyRun()
|
||||
{
|
||||
void SamyRun() {
|
||||
StandAloneMode();
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||
|
||||
|
|
@ -703,8 +657,7 @@ void SamyRun()
|
|||
// Turn on selected LED
|
||||
LED(selected + 1, 0);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;) {
|
||||
usb_poll();
|
||||
WDT_HIT();
|
||||
|
||||
|
|
@ -713,8 +666,7 @@ void SamyRun()
|
|||
SpinDelay(300);
|
||||
|
||||
// Button was held for a second, begin recording
|
||||
if (button_pressed > 0 && cardRead == 0)
|
||||
{
|
||||
if (button_pressed > 0 && cardRead == 0) {
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
LED(LED_RED2, 0);
|
||||
|
|
@ -745,10 +697,7 @@ void SamyRun()
|
|||
|
||||
cardRead = 1;
|
||||
|
||||
}
|
||||
|
||||
else if (button_pressed > 0 && cardRead == 1)
|
||||
{
|
||||
} else if (button_pressed > 0 && cardRead == 1) {
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
LED(LED_ORANGE, 0);
|
||||
|
|
@ -782,11 +731,9 @@ void SamyRun()
|
|||
|
||||
cardRead = 0;
|
||||
|
||||
}
|
||||
} else if (button_pressed) {
|
||||
|
||||
// Change where to record (or begin playing)
|
||||
else if (button_pressed)
|
||||
{
|
||||
// Next option if we were previously playing
|
||||
if (playing)
|
||||
selected = (selected + 1) % OPTS;
|
||||
|
|
@ -796,8 +743,7 @@ void SamyRun()
|
|||
LED(selected + 1, 0);
|
||||
|
||||
// Begin transmitting
|
||||
if (playing)
|
||||
{
|
||||
if (playing) {
|
||||
LED(LED_GREEN, 0);
|
||||
DbpString("Playing");
|
||||
// wait for button to be released
|
||||
|
|
@ -810,8 +756,7 @@ void SamyRun()
|
|||
|
||||
CmdHIDsimTAG(tops[selected], high[selected], low[selected], 0);
|
||||
DbpString("Done playing");
|
||||
if (BUTTON_HELD(1000) > 0)
|
||||
{
|
||||
if (BUTTON_HELD(1000) > 0) {
|
||||
DbpString("Exiting");
|
||||
LEDsoff();
|
||||
return;
|
||||
|
|
@ -825,8 +770,7 @@ void SamyRun()
|
|||
playing = !playing;
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
}
|
||||
else
|
||||
} else
|
||||
while(BUTTON_PRESS())
|
||||
WDT_HIT();
|
||||
}
|
||||
|
|
@ -834,6 +778,7 @@ void SamyRun()
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
OBJECTIVE
|
||||
Listen and detect an external reader. Determine the best location
|
||||
|
|
@ -869,10 +814,10 @@ static const char LIGHT_SCHEME[] = {
|
|||
0xE, /* -XXX | 86% of maximum current detected */
|
||||
0xF, /* XXXX | 100% of maximum current detected */
|
||||
};
|
||||
|
||||
static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]);
|
||||
|
||||
void ListenReaderField(int limit)
|
||||
{
|
||||
void ListenReaderField(int limit) {
|
||||
int lf_av, lf_av_new=0, lf_baseline= 0, lf_max;
|
||||
int hf_av, hf_av_new=0, hf_baseline= 0, hf_max;
|
||||
int mode=1, display_val, display_max, i;
|
||||
|
|
@ -892,7 +837,7 @@ void ListenReaderField(int limit)
|
|||
|
||||
lf_av = lf_max = AvgAdc_Voltage_LF();
|
||||
|
||||
if(limit != HF_ONLY) {
|
||||
if (limit != HF_ONLY) {
|
||||
Dbprintf("LF 125/134kHz Baseline: %dmV", lf_av);
|
||||
lf_baseline = lf_av;
|
||||
}
|
||||
|
|
@ -919,7 +864,8 @@ void ListenReaderField(int limit)
|
|||
return;
|
||||
break;
|
||||
}
|
||||
while (BUTTON_PRESS());
|
||||
while (BUTTON_PRESS())
|
||||
/* wait */;
|
||||
}
|
||||
WDT_HIT();
|
||||
|
||||
|
|
@ -933,7 +879,7 @@ void ListenReaderField(int limit)
|
|||
|
||||
lf_av_new = AvgAdc_Voltage_LF();
|
||||
// see if there's a significant change
|
||||
if (ABS((lf_av - lf_av_new)*100/(lf_av?lf_av:1)) > REPORT_CHANGE_PERCENT) {
|
||||
if (ABS((lf_av - lf_av_new) * 100 / (lf_av?lf_av:1)) > REPORT_CHANGE_PERCENT) {
|
||||
Dbprintf("LF 125/134kHz Field Change: %5dmV", lf_av_new);
|
||||
lf_av = lf_av_new;
|
||||
if (lf_av > lf_max)
|
||||
|
|
@ -952,7 +898,7 @@ void ListenReaderField(int limit)
|
|||
hf_av_new = AvgAdc_Voltage_HF();
|
||||
|
||||
// see if there's a significant change
|
||||
if (ABS((hf_av - hf_av_new)*100/(hf_av?hf_av:1)) > REPORT_CHANGE_PERCENT) {
|
||||
if (ABS((hf_av - hf_av_new) * 100 / (hf_av?hf_av:1)) > REPORT_CHANGE_PERCENT) {
|
||||
Dbprintf("HF 13.56MHz Field Change: %5dmV", hf_av_new);
|
||||
hf_av = hf_av_new;
|
||||
if (hf_av > hf_max)
|
||||
|
|
@ -960,7 +906,7 @@ void ListenReaderField(int limit)
|
|||
}
|
||||
}
|
||||
|
||||
if(mode == 2) {
|
||||
if (mode == 2) {
|
||||
if (limit == LF_ONLY) {
|
||||
display_val = lf_av;
|
||||
display_max = lf_max;
|
||||
|
|
@ -976,8 +922,8 @@ void ListenReaderField(int limit)
|
|||
display_max = lf_max;
|
||||
}
|
||||
}
|
||||
for (i=0; i<LIGHT_LEN; i++) {
|
||||
if (display_val >= ((display_max/LIGHT_LEN)*i) && display_val <= ((display_max/LIGHT_LEN)*(i+1))) {
|
||||
for (i = 0; i < LIGHT_LEN; i++) {
|
||||
if (display_val >= (display_max / LIGHT_LEN * i) && display_val <= (display_max / LIGHT_LEN * (i+1))) {
|
||||
if (LIGHT_SCHEME[i] & 0x1) LED_C_ON(); else LED_C_OFF();
|
||||
if (LIGHT_SCHEME[i] & 0x2) LED_A_ON(); else LED_A_OFF();
|
||||
if (LIGHT_SCHEME[i] & 0x4) LED_B_ON(); else LED_B_OFF();
|
||||
|
|
@ -989,8 +935,9 @@ void ListenReaderField(int limit)
|
|||
}
|
||||
}
|
||||
|
||||
void UsbPacketReceived(uint8_t *packet, int len)
|
||||
{
|
||||
|
||||
void UsbPacketReceived(uint8_t *packet, int len) {
|
||||
|
||||
UsbCommand *c = (UsbCommand *)packet;
|
||||
|
||||
// Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
|
||||
|
|
@ -1109,16 +1056,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
|
|||
SnoopHitag(c->arg[0]);
|
||||
break;
|
||||
case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
|
||||
SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
|
||||
SimulateHitagTag((bool)c->arg[0], (uint8_t*)c->d.asBytes);
|
||||
break;
|
||||
case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
|
||||
ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
|
||||
break;
|
||||
case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
|
||||
SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
|
||||
SimulateHitagSTag((bool)c->arg[0],(uint8_t*)c->d.asBytes);
|
||||
break;
|
||||
case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
|
||||
check_challenges_cmd((bool)c->arg[0], (byte_t*)c->d.asBytes, (uint8_t)c->arg[1]);
|
||||
check_challenges_cmd((bool)c->arg[0], (uint8_t*)c->d.asBytes, (uint8_t)c->arg[1]);
|
||||
break;
|
||||
case CMD_READ_HITAG_S://Reader for only Hitag S tags, args = key or challenge
|
||||
ReadHitagSCmd((hitag_function)c->arg[0], (hitag_data*)c->d.asBytes, (uint8_t)c->arg[1], (uint8_t)c->arg[2], false);
|
||||
|
|
@ -1490,8 +1437,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
|
|||
}
|
||||
}
|
||||
|
||||
void __attribute__((noreturn)) AppMain(void)
|
||||
{
|
||||
|
||||
void __attribute__((noreturn)) AppMain(void) {
|
||||
|
||||
SpinDelay(100);
|
||||
clear_trace();
|
||||
if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
|
||||
|
|
@ -1531,29 +1479,22 @@ void __attribute__((noreturn)) AppMain(void)
|
|||
LCDInit();
|
||||
#endif
|
||||
|
||||
byte_t rx[sizeof(UsbCommand)];
|
||||
uint8_t rx[sizeof(UsbCommand)];
|
||||
size_t rx_len;
|
||||
|
||||
for(;;) {
|
||||
if (usb_poll()) {
|
||||
rx_len = usb_read(rx,sizeof(UsbCommand));
|
||||
if (rx_len) {
|
||||
UsbPacketReceived(rx,rx_len);
|
||||
}
|
||||
}
|
||||
WDT_HIT();
|
||||
|
||||
#ifdef WITH_LF_StandAlone
|
||||
#ifndef WITH_ISO14443a_StandAlone
|
||||
if (usb_poll() && (rx_len = usb_read(rx, sizeof(rx)))) {
|
||||
UsbPacketReceived(rx, rx_len);
|
||||
} else {
|
||||
#if defined(WITH_LF_StandAlone) && !defined(WITH_ISO14443a_StandAlone)
|
||||
if (BUTTON_HELD(1000) > 0)
|
||||
SamyRun();
|
||||
#endif
|
||||
#endif
|
||||
#ifdef WITH_ISO14443a
|
||||
#ifdef WITH_ISO14443a_StandAlone
|
||||
#if defined(WITH_ISO14443a) && defined(WITH_ISO14443a_StandAlone)
|
||||
if (BUTTON_HELD(1000) > 0)
|
||||
StandAloneMode14a();
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue