dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hitagstuff

Browse Source
This commit is contained in:
iceman1001
2020-01-29 17:26:08 +01:00
parent b2f368c2c1
commit 9448ec4052
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
armsrc/lfadc.c
View File

@@ -60,7 +60,6 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
// only every 100th times, in order to save time when collecting samples. // only every 100th times, in order to save time when collecting samples.
if (checked == 1000) { if (checked == 1000) {
if (data_available()) { if (data_available()) {
checked = -1;
break; break;
} else { } else {
checked = 0; checked = 0;
@@ -77,7 +76,7 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
if (logging) logSampleSimple(adc_val); if (logging) logSampleSimple(adc_val);
// Only test field changes if state of adc values matter // Only test field changes if state of adc values matter
if (!wait) { if (wait == false) {
// Test if we are locating a field modulation (100% ASK = complete field drop) // Test if we are locating a field modulation (100% ASK = complete field drop)
if (detect_gap) { if (detect_gap) {
// Only return when the field completely dissapeared // Only return when the field completely dissapeared
@@ -132,6 +131,9 @@ 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() {
return rising_edge;
}
void lf_wait_periods(size_t periods) { void lf_wait_periods(size_t periods) {
lf_count_edge_periods_ex(periods, true, false); lf_count_edge_periods_ex(periods, true, false);
@@ -228,11 +230,11 @@ size_t lf_detect_field_drop(size_t max) {
volatile uint8_t adc_val; volatile uint8_t adc_val;
int16_t checked = 0; int16_t checked = 0;
while (true) { while (!BUTTON_PRESS()) {
// only every 1000th times, in order to save time when collecting samples. // only every 1000th times, in order to save time when collecting samples.
if (checked == 1000) { if (checked == 1000) {
if (BUTTON_PRESS() || data_available()) { if (data_available()) {
checked = -1; checked = -1;
break; break;
} else { } else {

3
armsrc/lfadc.h
View File

@@ -21,7 +21,10 @@ 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);
void lf_reset_counter(); void lf_reset_counter();
bool lf_get_tag_modulation(); bool lf_get_tag_modulation();
bool lf_get_reader_modulation();
void lf_wait_periods(size_t periods); void lf_wait_periods(size_t periods);
//void lf_init(bool reader); //void lf_init(bool reader);
void lf_init(bool reader, bool simulate); void lf_init(bool reader, bool simulate);