From c3ba3f306f41d95cd403056289fa1ec88545f406 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 15 Mar 2018 09:25:22 +0100 Subject: [PATCH] chg: 'hw detectreader' - RDV40 adjustment --- armsrc/appmain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 59f542634..b6c3b7e66 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -245,7 +245,7 @@ void MeasureAntennaTuning(void) { SpinDelay(50); v_hf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10; - // hitting the roof, try other ADC channel + // RDV40 will hit the roof, try other ADC channel used in that hardware revision. if ( v_hf > MAX_ADC_HF_VOLTAGE-300 ) { v_hf = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10; } @@ -489,7 +489,9 @@ void ListenReaderField(int limit) { } hf_av = hf_max = AvgAdc(ADC_CHAN_HF); - bool use_high = ( hf_max > MAX_ADC_HF_VOLTAGE-300 ); + + // RDV40 will hit the roof, try other ADC channel used in that hardware revision. + bool use_high = ( ((MAX_ADC_HF_VOLTAGE * hf_max) >> 10) > MAX_ADC_HF_VOLTAGE-300 ); if ( use_high ) { hf_av = hf_max = AvgAdc(ADC_CHAN_HF_RDV40); }