add analogReadPeriod()

Author: GrumpyOldPizza

cores/stm32l4/STM32.cpp

@@ -67,8 +67,8 @@ float STM32Class::getVBAT()
 	stm32l4_adc_enable(&stm32l4_adc, 0, NULL, NULL, 0);
     }
 
-    vref_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VREFINT);
-    vbat_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VBAT);
+    vref_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VREFINT, ADC_VREFINT_PERIOD);
+    vbat_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VBAT, ADC_VBAT_PERIOD);
 
     stm32l4_adc_disable(&stm32l4_adc);
 
@@ -93,7 +93,7 @@ float STM32Class::getVREF()
 	stm32l4_adc_enable(&stm32l4_adc, 0, NULL, NULL, 0);
     }
 
-    vref_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VREFINT);
+    vref_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VREFINT, ADC_VREFINT_PERIOD);
 
     stm32l4_adc_disable(&stm32l4_adc);
 
@@ -118,8 +118,8 @@ float STM32Class::getTemperature()
 	stm32l4_adc_enable(&stm32l4_adc, 0, NULL, NULL, 0);
     }
 
-    vref_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VREFINT);
-    ts_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_TS);
+    vref_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_VREFINT, ADC_VREFINT_PERIOD);
+    ts_data = stm32l4_adc_convert(&stm32l4_adc, ADC_CHANNEL_ADC1_TS, ADC_TSENSE_PERIOD);
 
     stm32l4_adc_disable(&stm32l4_adc);
 

cores/stm32l4/stm32l4_wiring.h

@@ -84,6 +84,7 @@ typedef enum _eAnalogReference {
 
 extern void analogReference(eAnalogReference reference);
 extern void analogReadResolution(int resolution);
+extern void analogReadPeriod(int period);
 extern uint32_t analogRead(uint32_t pin);
 extern void analogWriteResolution(int resolution);
 extern void analogWriteFrequency(uint32_t pin, uint32_t frequency);

cores/stm32l4/stm32l4_wiring_analog.c

@@ -39,7 +39,9 @@ static stm32l4_dac_t stm32l4_dac;
 static stm32l4_timer_t stm32l4_pwm[PWM_INSTANCE_COUNT];
 
 static uint8_t _channels[PWM_INSTANCE_COUNT];
+
 static int _readResolution = 10;
+static int _readPeriod = 2;
 static int _writeResolution = 8;
 
 static uint32_t _writeFrequency[PWM_INSTANCE_COUNT];
@@ -57,6 +59,11 @@ void analogReadResolution(int resolution)
     _readResolution = resolution;
 }
 
+void analogReadPeriod(int period)
+{
+    _readPeriod = period;
+}
+
 static inline uint32_t mapResolution(uint32_t value, uint32_t from, uint32_t to)
 {
     if (from == to)
@@ -115,7 +122,7 @@ uint32_t analogRead(uint32_t pin)
 
     stm32l4_gpio_pin_configure(g_APinDescription[pin].pin, (GPIO_PUPD_NONE | GPIO_MODE_ANALOG | GPIO_ANALOG_SWITCH));
 
-    input = stm32l4_adc_convert(&stm32l4_adc, g_APinDescription[pin].adc_input);
+    input = stm32l4_adc_convert(&stm32l4_adc, g_APinDescription[pin].adc_input, _readPeriod);
 
     stm32l4_adc_disable(&stm32l4_adc);
 

system/STM32L4xx/Include/stm32l4_adc.h

@@ -71,6 +71,10 @@ enum {
 
 typedef void (*stm32l4_adc_callback_t)(void *context, uint32_t events);
 
+#define ADC_VREFINT_PERIOD                       4
+#define ADC_VBAT_PERIOD                          12
+#define ADC_TSENSE_PERIOD                        5
+
 #define ADC_STATE_NONE                         0
 #define ADC_STATE_INIT                         1
 #define ADC_STATE_BUSY                         2
@@ -93,7 +97,7 @@ extern bool     stm32l4_adc_disable(stm32l4_adc_t *adc);
 extern bool     stm32l4_adc_configure(stm32l4_adc_t *adc, uint32_t option);
 extern bool     stm32l4_adc_calibrate(stm32l4_adc_t *adc);
 extern bool     stm32l4_adc_notify(stm32l4_adc_t *adc, stm32l4_adc_callback_t callback, void *context, uint32_t events);
-extern uint32_t stm32l4_adc_convert(stm32l4_adc_t *adc, unsigned int channel);
+extern uint32_t stm32l4_adc_convert(stm32l4_adc_t *adc, unsigned int channel, unsigned int period);
 
 #ifdef __cplusplus
 }