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

hitag, determine adc levels to get better demodulation

Browse source
This commit is contained in:
iceman1001 2020-02-22 13:16:04 +01:00
commit b304adeeca
2 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
armsrc/lfadc.c
View file

@ -10,6 +10,7 @@
#include "lfsampling.h" #include "lfsampling.h"
#include "fpgaloader.h" #include "fpgaloader.h"
#include "ticks.h" #include "ticks.h"
#include "dbprint.h"
// Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK) // Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
// TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz // TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
@ -46,13 +47,28 @@ bool lf_test_periods(size_t expected, size_t count) {
// Low frequency (LF) adc passthrough functionality // Low frequency (LF) adc passthrough functionality
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
uint8_t previous_adc_val = 0; uint8_t previous_adc_val = 0;
uint8_t adc_avg = 0;
void lf_sample_mean(void) {
uint8_t periods = 0;
uint32_t adc_sum = 0;
while (periods < 32) {
if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
adc_sum += AT91C_BASE_SSC->SSC_RHR;
periods++;
}
}
// division by 32
adc_avg = adc_sum >> 5;
if (DBGLEVEL >= DBG_EXTENDED)
Dbprintf("LF ADC average %u", adc_avg);
}
size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) { size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
size_t periods = 0; size_t periods = 0;
volatile uint8_t adc_val; volatile uint8_t adc_val;
//uint8_t avg_peak = 140, avg_through = 96; uint8_t avg_peak = adc_avg + 3, avg_through = adc_avg - 3;
// 140 - 127 - 114
uint8_t avg_peak = 140, avg_through = 106;
int16_t checked = 0; int16_t checked = 0;
while (!BUTTON_PRESS()) { while (!BUTTON_PRESS()) {
@ -98,8 +114,8 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
} }
} }
} }
previous_adc_val = adc_val; previous_adc_val = adc_val;
if (periods >= max) return 0; if (periods >= max) return 0;
} }
} }
@ -131,6 +147,7 @@ void lf_reset_counter() {
bool lf_get_tag_modulation() { bool lf_get_tag_modulation() {
return (rising_edge == false); return (rising_edge == false);
} }
bool lf_get_reader_modulation() { bool lf_get_reader_modulation() {
return rising_edge; return rising_edge;
} }
@ -147,7 +164,7 @@ void lf_init(bool reader, bool simulate) {
FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz FpgaSendCommand(FPGA_CMD_SET_DIVISOR, LF_DIVISOR_134);
if (reader) { if (reader) {
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
} else { } else {
@ -168,8 +185,8 @@ void lf_init(bool reader, bool simulate) {
// When in reader mode, give the field a bit of time to settle. // When in reader mode, give the field a bit of time to settle.
// 313T0 = 313 * 8us = 2504us = 2.5ms Hitag2 tags needs to be fully powered. // 313T0 = 313 * 8us = 2504us = 2.5ms Hitag2 tags needs to be fully powered.
if (reader) { if (reader) {
// 50 ms // 10 ms
SpinDelay(50); SpinDelay(10);
} }
// Steal this pin from the SSP (SPI communication channel with fpga) and use it to control the modulation // Steal this pin from the SSP (SPI communication channel with fpga) and use it to control the modulation
@ -195,7 +212,7 @@ void lf_init(bool reader, bool simulate) {
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
// Prepare data trace // Prepare data trace
uint32_t bufsize = 20000; uint32_t bufsize = 10000;
// use malloc // use malloc
if (logging) initSampleBufferEx(&bufsize, true); if (logging) initSampleBufferEx(&bufsize, true);
@ -203,6 +220,8 @@ void lf_init(bool reader, bool simulate) {
sample_config *sc = getSamplingConfig(); sample_config *sc = getSamplingConfig();
sc->decimation = 1; sc->decimation = 1;
sc->averaging = 0; sc->averaging = 0;
lf_sample_mean();
} }
void lf_finalize() { void lf_finalize() {
@ -275,7 +294,7 @@ static void lf_manchester_send_bit(uint8_t bit) {
lf_modulation(bit != 0); lf_modulation(bit != 0);
lf_wait_periods(16); lf_wait_periods(16);
lf_modulation(bit == 0); lf_modulation(bit == 0);
lf_wait_periods(16); lf_wait_periods(32);
} }
// simulation // simulation

1
armsrc/lfadc.h
View file

@ -17,6 +17,7 @@
extern bool logging; extern bool logging;
void lf_sample_mean(void);
bool lf_test_periods(size_t expected, size_t count); bool lf_test_periods(size_t expected, size_t count);
size_t lf_count_edge_periods(size_t max); size_t lf_count_edge_periods(size_t max);
size_t lf_detect_gap(size_t max); size_t lf_detect_gap(size_t max);