Merge branch 'AX25_FM' into M17_AX25_FM

This commit is contained in:
Jonathan Naylor
2020-11-06 15:06:00 +00:00
81 changed files with 3695 additions and 2077 deletions
+5 -6
View File
@@ -188,14 +188,13 @@ void CIO::startInt()
void CIO::interrupt()
{
if ((ADC->ADC_ISR & ADC_ISR_EOC_Chan) == ADC_ISR_EOC_Chan) { // Ensure there was an End-of-Conversion and we read the ISR reg
uint8_t control = MARK_NONE;
uint16_t sample = DC_OFFSET;
TSample sample = {DC_OFFSET, MARK_NONE};
m_txBuffer.get(sample, control);
DACC->DACC_CDR = sample;
m_txBuffer.get(sample);
DACC->DACC_CDR = sample.sample;
sample = ADC->ADC_CDR[ADC_CDR_Chan];
m_rxBuffer.put(sample, control);
sample.sample = ADC->ADC_CDR[ADC_CDR_Chan];
m_rxBuffer.put(sample);
#if defined(SEND_RSSI_DATA)
m_rssiBuffer.put(ADC->ADC_CDR[RSSI_CDR_Chan]);