From 0bfecf72a9e0b8c9022cac7eaa3c85e60cb88d5d Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 11 Aug 2016 10:59:49 +0100 Subject: [PATCH] Re-add the RSSI code with a different RSSI pin number. --- IO.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/IO.cpp b/IO.cpp index 0851918..f64178c 100644 --- a/IO.cpp +++ b/IO.cpp @@ -61,6 +61,7 @@ const uint16_t DC_OFFSET = 2048U; #define PIN_DSTAR 9 #define PIN_DMR 8 #define PIN_YSF 7 +#define PIN_RSSI 60 // ADC on Due pin A6 - Due AD1 #define ADC_CHER_Chan (1<<13) // ADC on Due pin A11 - Due AD13 - (1 << 13) (PB20) #define ADC_ISR_EOC_Chan ADC_ISR_EOC13 #define ADC_CDR_Chan 13 @@ -160,6 +161,11 @@ m_lockout(false) pinMode(PIN_DMR, OUTPUT); pinMode(PIN_YSF, OUTPUT); #endif + +#if defined(SEND_RSSI_DATA) + pinMode(PIN_RSSI, INPUT); + analogReadResolution(12); +#endif #endif } @@ -213,7 +219,7 @@ void CIO::start() t->TC_RA = 880; // Roughly square wave #endif t->TC_CMR = (t->TC_CMR & 0xFFF0FFFF) | TC_CMR_ACPA_CLEAR | TC_CMR_ACPC_SET; // Set clear and set from RA and RC compares - t->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG ; // re-enable local clocking and switch to hardware trigger source. + t->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG; // re-enable local clocking and switch to hardware trigger source. // Set up the DAC pmc_enable_periph_clk(DACC_INTERFACE_ID); // Start clocking DAC @@ -567,7 +573,6 @@ bool CIO::hasLockout() const #if defined(SEND_RSSI_DATA) uint16_t CIO::getRSSIValue() { - return 0U; + return analogRead(PIN_RSSI); } #endif -