mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-01-02 21:54:10 +08:00
CHG: TI code did have the tickstimer started.
This commit is contained in:
parent
c3fc86d9af
commit
29ff374e5d
1 changed files with 8 additions and 3 deletions
|
@ -91,6 +91,7 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint32_t periods, uint3
|
||||||
*/
|
*/
|
||||||
void ReadTItag(void)
|
void ReadTItag(void)
|
||||||
{
|
{
|
||||||
|
StartTicks();
|
||||||
// some hardcoded initial params
|
// some hardcoded initial params
|
||||||
// when we read a TI tag we sample the zerocross line at 2Mhz
|
// when we read a TI tag we sample the zerocross line at 2Mhz
|
||||||
// TI tags modulate a 1 as 16 cycles of 123.2Khz
|
// TI tags modulate a 1 as 16 cycles of 123.2Khz
|
||||||
|
@ -216,6 +217,7 @@ void ReadTItag(void)
|
||||||
DbpString("Info: CRC is good");
|
DbpString("Info: CRC is good");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
StopTicks();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WriteTIbyte(uint8_t b)
|
void WriteTIbyte(uint8_t b)
|
||||||
|
@ -282,7 +284,7 @@ void AcquireTiType(void)
|
||||||
HIGH(GPIO_SSC_DOUT);
|
HIGH(GPIO_SSC_DOUT);
|
||||||
|
|
||||||
// Charge TI tag for 50ms.
|
// Charge TI tag for 50ms.
|
||||||
SpinDelay(50);
|
WaitMS(50);
|
||||||
|
|
||||||
// stop modulating antenna and listen
|
// stop modulating antenna and listen
|
||||||
LOW(GPIO_SSC_DOUT);
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
@ -322,6 +324,7 @@ void AcquireTiType(void)
|
||||||
// if not provided a valid crc will be computed from the data and written.
|
// if not provided a valid crc will be computed from the data and written.
|
||||||
void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
|
void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
|
||||||
{
|
{
|
||||||
|
StartTicks();
|
||||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||||
if(crc == 0) {
|
if(crc == 0) {
|
||||||
crc = update_crc16(crc, (idlo)&0xff);
|
crc = update_crc16(crc, (idlo)&0xff);
|
||||||
|
@ -360,7 +363,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
|
||||||
|
|
||||||
// modulate antenna
|
// modulate antenna
|
||||||
HIGH(GPIO_SSC_DOUT);
|
HIGH(GPIO_SSC_DOUT);
|
||||||
SpinDelay(50); // charge time
|
WaitMS(50); // charge time
|
||||||
|
|
||||||
WriteTIbyte(0xbb); // keyword
|
WriteTIbyte(0xbb); // keyword
|
||||||
WriteTIbyte(0xeb); // password
|
WriteTIbyte(0xeb); // password
|
||||||
|
@ -377,7 +380,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
|
||||||
WriteTIbyte(0x00); // write frame lo
|
WriteTIbyte(0x00); // write frame lo
|
||||||
WriteTIbyte(0x03); // write frame hi
|
WriteTIbyte(0x03); // write frame hi
|
||||||
HIGH(GPIO_SSC_DOUT);
|
HIGH(GPIO_SSC_DOUT);
|
||||||
SpinDelay(50); // programming time
|
WaitMS(50); // programming time
|
||||||
|
|
||||||
LED_A_OFF();
|
LED_A_OFF();
|
||||||
|
|
||||||
|
@ -386,6 +389,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
|
||||||
|
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
||||||
DbpString("Now use `lf ti read` to check");
|
DbpString("Now use `lf ti read` to check");
|
||||||
|
StopTicks();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
|
void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
|
||||||
|
@ -443,6 +447,7 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
StopTicks();
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEBUG_FRAME_CONTENTS 1
|
#define DEBUG_FRAME_CONTENTS 1
|
||||||
|
|
Loading…
Reference in a new issue