diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp index a555acf41..0e0d51e76 100644 --- a/radio/src/cli.cpp +++ b/radio/src/cli.cpp @@ -260,7 +260,7 @@ int cliDisplay(const char ** argv) } else if (!strcmp(argv[1], "adc")) { for (int i=0; iCR = DMA_SxCR_PL | DMA_SxCR_CHSEL_1 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC; DMA2_Stream1->PAR = (uint32_t) &ADC3->DR; - DMA2_Stream1->M0AR = (uint32_t) &Analog_values[MOUSE1]; + DMA2_Stream1->M0AR = (uint32_t) &adcValues[MOUSE1]; DMA2_Stream1->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0; } @@ -184,7 +184,7 @@ void adcRead() DMA2_Stream1->CR &= ~DMA_SxCR_EN; // Disable DMA ADC3->SR &= ~(uint32_t) ( ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR ); DMA2->LIFCR = DMA_LIFCR_CTCIF1 | DMA_LIFCR_CHTIF1 |DMA_LIFCR_CTEIF1 | DMA_LIFCR_CDMEIF1 | DMA_LIFCR_CFEIF1; // Write ones to clear bits - DMA2_Stream1->M0AR = (uint32_t) &Analog_values[MOUSE1]; + DMA2_Stream1->M0AR = (uint32_t) &adcValues[MOUSE1]; DMA2_Stream1->NDTR = 2; DMA2_Stream1->CR |= DMA_SxCR_EN; // Enable DMA ADC3->CR2 |= (uint32_t)ADC_CR2_SWSTART; @@ -204,7 +204,7 @@ void adcRead() for (uint32_t adcIndex=0; adcIndexADC_LCDR; // Clear DRSY flag } // Next bit may be done using the PDC - Analog_values[0] = ADC->ADC_CDR1; - Analog_values[1] = ADC->ADC_CDR2; - Analog_values[2] = ADC->ADC_CDR3; - Analog_values[3] = ADC->ADC_CDR4; - Analog_values[4] = ADC->ADC_CDR5; - Analog_values[5] = ADC->ADC_CDR9; - Analog_values[6] = ADC->ADC_CDR13; - Analog_values[7] = ADC->ADC_CDR14; + adcValues[0] = ADC->ADC_CDR1; + adcValues[1] = ADC->ADC_CDR2; + adcValues[2] = ADC->ADC_CDR3; + adcValues[3] = ADC->ADC_CDR4; + adcValues[4] = ADC->ADC_CDR5; + adcValues[5] = ADC->ADC_CDR9; + adcValues[6] = ADC->ADC_CDR13; + adcValues[7] = ADC->ADC_CDR14; #if !defined(REVA) - Analog_values[8] = ADC->ADC_CDR8 ; + adcValues[8] = ADC->ADC_CDR8 ; #endif temperature = (((int32_t)temperature * 7) + ((((int32_t)ADC->ADC_CDR15 - 838) * 621) >> 11)) >> 3; // Filter it @@ -122,7 +122,7 @@ void adcRead() uint32_t i ; for (i=0; iCR = DMA_SxCR_PL | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC; DMA2_Stream0->PAR = CONVERT_PTR_UINT(&ADC1->DR); - DMA2_Stream0->M0AR = CONVERT_PTR_UINT(Analog_values); + DMA2_Stream0->M0AR = CONVERT_PTR_UINT(adcValues); DMA2_Stream0->NDTR = NUMBER_ANALOG_ADC1; DMA2_Stream0->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0 ; @@ -118,7 +118,7 @@ void adcInit() // Enable the DMA channel here, DMA2 stream 1, channel 2 DMA2_Stream1->CR = DMA_SxCR_PL | DMA_SxCR_CHSEL_1 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC; DMA2_Stream1->PAR = CONVERT_PTR_UINT(&ADC3->DR); - DMA2_Stream1->M0AR = CONVERT_PTR_UINT(Analog_values + NUMBER_ANALOG_ADC1); + DMA2_Stream1->M0AR = CONVERT_PTR_UINT(adcValues + NUMBER_ANALOG_ADC1); DMA2_Stream1->NDTR = NUMBER_ANALOG_ADC3; DMA2_Stream1->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0 ; #endif @@ -175,7 +175,7 @@ uint16_t getAnalogValue(uint32_t index) index = ana_mapping[index]; #endif if (ana_direction[index] < 0) - return 4096 - Analog_values[index]; + return 4096 - adcValues[index]; else - return Analog_values[index]; + return adcValues[index]; }