F1: fixed STM32ADC example MultiChannelSingleConversion

Author: stevstrong

STM32F1/libraries/STM32ADC/examples/MultiChannelSingleConversion/MultiChannelSingleConversion.ino

@@ -1,16 +1,13 @@
 /*
-  This example shows how to use the ADC library to sample several
-  channels/pins in one go. 
+  This example shows how to use the ADC library to sample several channels/pins in one go. 
   This example attaches an interrupt to the DMA completion to notify the user. 
-  The DMA must be set together with the start conversion, so both setDMA and startConversion
-  Must be called. 
 
 */
 #include <STM32ADC.h>
 
-#define BOARD_LED D33 //PB0
+#define BOARD_LED PC13
 
-uint8 pins[] = {11,10,9,8,7,6,5,4};
+uint8 pins[] = {PA0,PA1,PA2,PA3,PA4,PA5,PA6,PA7};
 
 const int maxSamples = 8; // 8 channels 
 
@@ -21,46 +18,55 @@ volatile static bool dma1_ch1_Active; //flag for interrupt
 
 STM32ADC myADC(ADC1);
 
-void setup() {
-//start Serial
-  Serial.begin(19200);
-//Start up blink from Pig-O-Scope
-  pinMode(BOARD_LED, OUTPUT);
-  pinMode(D32, INPUT);
-  digitalWrite(BOARD_LED, HIGH);
-  delay(1000);
-  digitalWrite(BOARD_LED, LOW);
-  delay(1000);
-//calibrate ADC.
-  myADC.calibrate(); 
-  
-  myADC.setSampleRate(ADC_SMPR_1_5); //sample ratio
-  myADC.setPins(pins, maxSamples);   //pins to be converted
-  myADC.setScanMode();               //Set the ADC in Scan Mode
+//-----------------------------------------------------------------------------
+//  Interrupt handler.
+//-----------------------------------------------------------------------------
+static void DMA1_CH1_Event()
+{
+	dma1_ch1_Active = 0;
 }
+//-----------------------------------------------------------------------------
+void setup()
+{
+	//start Serial
+	Serial.begin(19200);
+	pinMode(BOARD_LED, OUTPUT);
+	digitalWrite(BOARD_LED, HIGH);
 
-void loop(){
-//start acquisition on button push. 
-    if(digitalRead(D32) == 1 ) {
-        Serial.println("begin");
-        dma1_ch1_Active = 1;
-        myADC.setDMA(dataPoints, 8, (DMA_MINC_MODE | DMA_TRNS_CMPLT), DMA1_CH1_Event); 
-        myADC.startConversion();
-        while (dma1_ch1_Active == 1); //wait for DMA to complete.  
-        
-        for(unsigned int i = 0; i < maxSamples; i ++) {
-            Serial.print("sample[");
-            Serial.print(i);
-            Serial.print("] = ");
-            Serial.println(dataPoints[i]);
-        }
-      while(digitalRead(D32) == 1); //stay here. Another button push is required. 
-      }
-}; //end loop
+	while(!Serial); delay(10);
 
-/*
-    Interrupt handler. eh eh 
-*/
-static void DMA1_CH1_Event() {
-  dma1_ch1_Active = 0;
+	Serial.println("MultiChannelSingleConversion demo started\n");
+	// calibrate ADC.
+	myADC.calibrate(); 
+	// setup ADC
+	myADC.setSampleRate(ADC_SMPR_1_5); //sample ratio
+	myADC.setPins(pins, maxSamples);   //pins to be converted
+	myADC.setScanMode();               //Set the ADC in Scan Mode
+	myADC.setDMA(dataPoints, (DMA_MINC_MODE | DMA_TRNS_CMPLT), DMA1_CH1_Event);
+}
+//-----------------------------------------------------------------------------
+void loop()
+{
+// blink
+	digitalWrite(BOARD_LED, HIGH); // turn LED off
+	delay(1000);
+	digitalWrite(BOARD_LED, LOW); // turn LED on
+
+// start acquisition
+	Serial.println("begin");
+	dma1_ch1_Active = 1;
+
+	myADC.startDMA(maxSamples);
+	myADC.startConversion();
+
+	while (dma1_ch1_Active == 1); //wait for DMA to complete.  
+	// print out the sampled values
+	for(unsigned int i = 0; i < maxSamples; i ++) {
+		Serial.print("sample[");
+		Serial.print(i);
+		Serial.print("] = ");
+		Serial.println(dataPoints[i]);
+	}
+
+	delay(1000);
 }

STM32F1/libraries/STM32ADC/src/STM32ADC.cpp

@@ -52,11 +52,8 @@
     Polling is being used.
 */
     float STM32ADC::readVcc(){
-        unsigned int result = 0;
-        float vcc = 0.0;
-        result = adc_read(_dev, 17);
-
-        vcc = (float)result * 1.1; //to be done later...
+        uint16_t result = adc_read(_dev, 17);
+        float vcc = (float)result * 1.1; //to be done later...
         return vcc;
     }
 
@@ -65,10 +62,9 @@
     Polling is being used.
 */
     float STM32ADC::readTemp(){
-        unsigned int result = 0;
-        float temperature = 0.0;
-        result = adc_read(_dev, 16);
-        temperature = (float)((_V25-result)/_AverageSlope)+ 25.0; 
+        uint16_t result = adc_read(_dev, 16);
+        float Vsense = (3300.0*result)/4096;
+        float temperature = ((_V25-Vsense)/_AverageSlope) + 25.0; 
         return temperature;
     }
 
@@ -80,9 +76,8 @@
         //convert pins to channels.
         uint8 channels[length];
         unsigned int records[3] = {0,0,0};
-        unsigned char i = 0, j = 0;
 
-        for (unsigned char i = 0; i < length; i++) { //convert the channels from pins to ch.
+        for (uint8_t i = 0; i < length; i++) { //convert the channels from pins to ch.
             channels[i] = PIN_MAP[pins[i]].adc_channel;
         }
 
@@ -93,7 +88,7 @@
         records[2] |= (length - 1) << 20;
 
         //i goes through records, j goes through variables.
-        for (i = 0, j = 0; i < length; i++) {//go through the channel list.
+        for (uint8_t i = 0, j = 0; i < length; i++) {//go through the channel list.
             if (i!=0 && i%6 == 0) j++;//next variable, please!!
             records[j] |= (channels[i] << ((i%6)*5));
         }
@@ -162,23 +157,27 @@
     The reason why this is a uint16 is that I am not ready for dual mode. 
 */
 
-    void STM32ADC::setDMA(uint16 * Buf, uint16 BufLen, uint32 dmaFlags, voidFuncPtr func) {
+    void STM32ADC::setDMA(uint16 * Buf, uint32 dmaFlags, voidFuncPtr func)
+	{
 //initialize DMA
         dma_init(DMA1);
+        dma_disable(DMA1, DMA_CH1);
 //if there is an int handler to be called... 
         if (func != NULL)
             dma_attach_interrupt(DMA1, DMA_CH1, func);
 //enable ADC DMA transfer
-        //adc_dma_enable(ADC1);
-        _dev->regs->CR2 |= ADC_CR2_DMA;
+        adc_dma_enable(ADC1);
+        //_dev->regs->CR2 |= ADC_CR2_DMA;
 //set it up... 
         dma_setup_transfer(DMA1, DMA_CH1, &ADC1->regs->DR, DMA_SIZE_16BITS, Buf, DMA_SIZE_16BITS, dmaFlags);// Receive buffer DMA
-//how many are we making?? 
-        dma_set_num_transfers(DMA1, DMA_CH1, BufLen);
-//enable dma.
-        dma_enable(DMA1, DMA_CH1); // Enable the channel and start the transfer.
     }
 
+    void STM32ADC::startDMA(uint16 BufLen)
+	{
+        dma_disable(DMA1, DMA_CH1);
+        dma_set_num_transfers(DMA1, DMA_CH1, BufLen);
+        dma_enable(DMA1, DMA_CH1); // Enable the channel
+	}
 /*
     This function is used to setup DMA with the ADC. 
     It will be independent of the mode used. It will either be used in continuous or scan mode

STM32F1/libraries/STM32ADC/src/STM32ADC.h

@@ -32,8 +32,9 @@ class STM32ADC{
     
     The reason why this is a uint16 is that I am not ready for dual mode. 
 */
-    void setDMA(uint16 * Buf, uint16 BufLen, uint32 dmaFlags, voidFuncPtr func);
-
+	void setDMA(uint16 * Buf, uint32 dmaFlags, voidFuncPtr func);
+	void startDMA(uint16 BufLen);
+	
 /*
     This function is used to setup DMA with the ADC. 
     It will be independent of the mode used. It will either be used in continuous or scan mode

STM32F1/libraries/STM32ADC/src/utility/util_adc.c

@@ -7,14 +7,13 @@
     Interrupt function.
     This handles Analog watchdog and ADC1 and 2.
 */
-extern volatile unsigned int adc_result;
+//extern volatile unsigned int adc_result = 0;
 
 /*
     Starts a single conversion in one channel previously defined.
     Results must be read through interrupt or polled outside this function.
 */
 void start_single_convert(adc_dev* dev, uint8 channel) {
-//  int pinMapADCin = PIN_MAP[analogInPin].adc_channel;
   adc_set_reg_seqlen(dev, 1);
   dev->regs->SQR3 = channel;//use channels next time.
   dev->regs->CR2 |= ADC_CR2_SWSTART;
@@ -25,7 +24,6 @@ void start_single_convert(adc_dev* dev, uint8 channel) {
     Results must be read through interrupt or polled outside this function.
 */
 void start_continuous_convert(adc_dev* dev, uint8 channel){
-//  int pinMapADCin = PIN_MAP[analogInPin].adc_channel;
   adc_set_reg_seqlen(dev, 1);
   dev->regs->SQR3 = channel;
   dev->regs->CR2 |= ADC_CR2_CONT;

STM32F1/libraries/STM32ADC/src/utility/util_adc.h

@@ -1,3 +1,6 @@
+#ifndef UTIL_ADC_H
+#define UTIL_ADC_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -34,5 +37,7 @@ uint8 poll_adc_convert(adc_dev *dev);
 void adc_dma_enable(adc_dev * dev);
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
+
+#endif // UTIL_ADC_H