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

adapt to fpga changes. And bug hunting COTAG functionality that doesnt work

Browse source
This commit is contained in:
iceman1001 2020-07-02 12:35:54 +02:00
commit 4043832c62
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
armsrc/lfops.c
View file

@ -678,7 +678,7 @@ void AcquireTiType(void) {
AT91C_BASE_SSC->SSC_TCMR = 0; AT91C_BASE_SSC->SSC_TCMR = 0;
// Transmit Frame Mode Register // Transmit Frame Mode Register
AT91C_BASE_SSC->SSC_TFMR = 0; AT91C_BASE_SSC->SSC_TFMR = 0;
// iceman, FpgaSetupSsc() ?? the code above? can it be replaced? // iceman, FpgaSetupSsc(FPGA_MAJOR_MODE_LF_READER) ?? the code above? can it be replaced?
LED_D_ON(); LED_D_ON();
// modulate antenna // modulate antenna
@ -721,7 +721,7 @@ void AcquireTiType(void) {
} }
// reset SSC // reset SSC
FpgaSetupSsc(); FpgaSetupSsc(FPGA_MAJOR_MODE_LF_READER);
} }
// arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc // arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc
@ -2597,24 +2597,35 @@ void Cotag(uint32_t arg0) {
LFSetupFPGAForADC(LF_FREQ2DIV(132), true); LFSetupFPGAForADC(LF_FREQ2DIV(132), true);
//clear buffer now so it does not interfere with timing later //clear buffer now so it does not interfere with timing later
BigBuf_free();
BigBuf_Clear_ext(false); BigBuf_Clear_ext(false);
//send COTAG start pulse //send COTAG start pulse
/*
ON(740) OFF(2035) ON(740) OFF(2035)
ON(3330) OFF(2035) ON(3330) OFF(2035)
ON(740) OFF(2035) ON(740) OFF(2035)
ON(1000) ON(1000)
*/
ON(800) OFF(2200)
ON(3600) OFF(2200)
ON(800) OFF(2200)
ON(3400)
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, LF_FREQ2DIV(125));
switch (rawsignal) { switch (rawsignal) {
case 0: case 0:
doCotagAcquisition(40000); doCotagAcquisition();
break; break;
case 1: case 1:
doCotagAcquisitionManchester(); doCotagAcquisitionManchester();
break; break;
case 2: case 2: {
DoAcquisition_config(false, 0); DoAcquisition_config(false, 0);
break; break;
}
} }
// Turn the field off // Turn the field off