Skip to content

Commit 2a20a32

Browse files
iabdalkaderiabdalkader
authored
Merge pull request #65 from arduino-libraries/adc_dual_mode
Add support for dual ADC mode.
2 parents 2309705 + e89b1ed commit 2a20a32

File tree

5 files changed

+164
-12
lines changed

5 files changed

+164
-12
lines changed

‎examples/Advanced/ADC_Dual_Mode/ADC_Dual_Mode.ino

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#include <Arduino_AdvancedAnalog.h>
2+
3+
AdvancedADC adc1(A0, A1);
4+
AdvancedADC adc2(A2, A3);
5+
AdvancedADCDual adc_dual(adc1, adc2);
6+
uint64_t last_millis = 0;
7+
8+
void setup() {
9+
Serial.begin(9600);
10+
while (!Serial) {
11+
}
12+
13+
// Resolution, sample rate, number of samples per channel, queue depth.
14+
if (!adc_dual.begin(AN_RESOLUTION_16, 16000, 32, 32)) {
15+
Serial.println("Failed to start analog acquisition!");
16+
while (1);
17+
}
18+
}
19+
20+
void loop() {
21+
if (adc1.available()) {
22+
SampleBuffer buf1 = adc1.read();
23+
SampleBuffer buf2 = adc2.read();
24+
25+
// Process the buffer.
26+
if (millis() - last_millis > 1) {
27+
Serial.println(buf1.timestamp()); // Print buffer timestamp
28+
Serial.println(buf1[0]); // Print sample from first channel
29+
Serial.println(buf1[1]); // Print sample from second channel
30+
31+
Serial.println(buf2.timestamp()); // Print buffer timestamp
32+
Serial.println(buf2[0]); // Print sample from first channel
33+
Serial.println(buf2[1]); // Print sample from second channel
34+
35+
last_millis = millis();
36+
}
37+
38+
// Release the buffer to return it to the pool.
39+
buf1.release();
40+
buf2.release();
41+
}
42+
}

‎src/AdvancedADC.cpp

Lines changed: 87 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,20 @@ static void dac_descr_deinit(adc_descr_t *descr, bool dealloc_pool) {
9797
}
9898
}
9999

100+
int AdvancedADC::id() {
101+
if (descr) {
102+
ADC_TypeDef *adc = descr->adc.Instance;
103+
if (adc == ADC1) {
104+
return 1;
105+
} else if (adc == ADC2) {
106+
return 2;
107+
} else if (adc == ADC3) {
108+
return 3;
109+
}
110+
}
111+
return -1;
112+
}
113+
100114
bool AdvancedADC::available() {
101115
if (descr != nullptr) {
102116
return descr->pool->readable();
@@ -115,9 +129,9 @@ DMABuffer<Sample> &AdvancedADC::read() {
115129
return NULLBUF;
116130
}
117131

118-
int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers) {
132+
int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers, bool start) {
133+
119134
ADCName instance = ADC_NP;
120-
121135
// Sanity checks.
122136
if (resolution >= AN_ARRAY_SIZE(ADC_RES_LUT) || (descr && descr->pool)) {
123137
return 0;
@@ -159,6 +173,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
159173

160174
// Configure ADC pins.
161175
pinmap_pinout(adc_pins[0], PinMap_ADC);
176+
162177
uint8_t ch_init = 1;
163178
for (size_t i=1; i<n_channels; i++) {
164179
for (size_t j=0; j<AN_ARRAY_SIZE(adc_pin_alt); j++) {
@@ -188,6 +203,8 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
188203
if (descr->pool == nullptr) {
189204
return 0;
190205
}
206+
207+
// Allocate the two DMA buffers used for double buffering.
191208
descr->dmabuf[0] = descr->pool->allocate();
192209
descr->dmabuf[1] = descr->pool->allocate();
193210

@@ -212,27 +229,89 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
212229
hal_dma_enable_dbm(&descr->dma, descr->dmabuf[0]->data(), descr->dmabuf[1]->data());
213230
HAL_NVIC_EnableIRQ(descr->dma_irqn);
214231

215-
// Init, config and start the ADC timer.
232+
if (start) {
233+
return this->start(sample_rate);
234+
}
235+
236+
return 1;
237+
}
238+
239+
int AdvancedADC::start(uint32_t sample_rate){
240+
// Initialize and configure the ADC timer.
216241
hal_tim_config(&descr->tim, sample_rate);
242+
243+
// Start the ADC timer. Note, if dual ADC mode is enabled,
244+
// this will also start ADC2.
217245
if (HAL_TIM_Base_Start(&descr->tim) != HAL_OK) {
218246
return 0;
219247
}
220-
248+
221249
return 1;
222250
}
223251

224-
int AdvancedADC::stop()
225-
{
252+
int AdvancedADC::stop() {
226253
dac_descr_deinit(descr, true);
227254
return 1;
228255
}
229256

230-
AdvancedADC::~AdvancedADC()
231-
{
257+
void AdvancedADC::clear() {
258+
if (descr && descr->pool) {
259+
descr->pool->flush();
260+
}
261+
}
262+
263+
size_t AdvancedADC::channels() {
264+
return n_channels;
265+
}
266+
267+
AdvancedADC::~AdvancedADC() {
232268
dac_descr_deinit(descr, true);
233269
}
234270

271+
int AdvancedADCDual::begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers) {
272+
// The two ADCs must have the same number of channels.
273+
if (adc1.channels() != adc2.channels()) {
274+
return 0;
275+
}
276+
277+
// Configure the ADCs.
278+
if (!adc1.begin(resolution, sample_rate, n_samples, n_buffers, false)) {
279+
return 0;
280+
}
281+
282+
if (!adc2.begin(resolution, sample_rate, n_samples, n_buffers, false)) {
283+
adc1.stop();
284+
return 0;
285+
}
286+
287+
// Note only ADC1 (master) and ADC2 can be used in dual mode.
288+
if (adc1.id() != 1 || adc2.id() != 2) {
289+
adc1.stop();
290+
adc2.stop();
291+
return 0;
292+
}
293+
294+
// Enable dual ADC mode.
295+
hal_adc_enable_dual_mode(true);
296+
297+
// Start ADC1, note ADC2 is also automatically started.
298+
return adc1.start(sample_rate);
299+
}
300+
301+
int AdvancedADCDual:: stop() {
302+
adc1.stop();
303+
adc2.stop();
304+
// Disable dual mode.
305+
hal_adc_enable_dual_mode(false);
306+
return 1;
307+
}
308+
309+
AdvancedADCDual::~AdvancedADCDual() {
310+
stop();
311+
}
312+
235313
extern "C" {
314+
236315
void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *adc) {
237316
adc_descr_t *descr = adc_descr_get(adc->Instance);
238317
// NOTE: CT bit is inverted, to get the DMA buffer that's Not currently in use.

‎src/AdvancedADC.h

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,41 @@ class AdvancedADC {
4545
AdvancedADC(): n_channels(0), descr(nullptr) {
4646
}
4747
~AdvancedADC();
48+
int id();
4849
bool available();
4950
SampleBuffer read();
50-
int begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers);
51-
int begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers,
52-
size_t n_pins, pin_size_t *pins) {
51+
int begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples,
52+
size_t n_buffers, bool start=true);
53+
int begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples,
54+
size_t n_buffers, size_t n_pins, pin_size_t *pins, bool start=true) {
5355
if (n_pins > AN_MAX_ADC_CHANNELS) {
5456
n_pins = AN_MAX_ADC_CHANNELS;
5557
}
5658
for (size_t i = 0; i < n_pins; ++i) {
5759
adc_pins[i] = analogPinToPinName(pins[i]);
5860
}
61+
5962
n_channels = n_pins;
60-
return begin(resolution, sample_rate, n_samples, n_buffers);
63+
return begin(resolution, sample_rate, n_samples, n_buffers, start);
6164
}
65+
int start(uint32_t sample_rate);
66+
int stop();
67+
void clear();
68+
size_t channels();
69+
};
70+
71+
class AdvancedADCDual {
72+
private:
73+
AdvancedADC &adc1;
74+
AdvancedADC &adc2;
75+
size_t n_channels;
76+
77+
public:
78+
AdvancedADCDual(AdvancedADC &adc1_in, AdvancedADC &adc2_in):
79+
n_channels(0), adc1(adc1_in), adc2(adc2_in) {
80+
}
81+
~AdvancedADCDual();
82+
int begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers);
6283
int stop();
6384
};
6485

‎src/HALConfig.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,15 @@ int hal_adc_config(ADC_HandleTypeDef *adc, uint32_t resolution, uint32_t trigger
223223
return 0;
224224
}
225225

226+
int hal_adc_enable_dual_mode(bool enable) {
227+
if (enable) {
228+
LL_ADC_SetMultimode(__LL_ADC_COMMON_INSTANCE(ADC1), LL_ADC_MULTI_DUAL_REG_SIMULT);
229+
} else {
230+
LL_ADC_SetMultimode(__LL_ADC_COMMON_INSTANCE(ADC1), LL_ADC_MULTI_INDEPENDENT);
231+
}
232+
return 0;
233+
}
234+
226235
int hal_i2s_config(I2S_HandleTypeDef *i2s, uint32_t sample_rate, uint32_t mode, bool mck_enable) {
227236
// Set I2S clock source.
228237
RCC_PeriphCLKInitTypeDef pclk_init = {0};

‎src/HALConfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ void hal_dma_enable_dbm(DMA_HandleTypeDef *dma, void *m0 = nullptr, void *m1 = n
3030
void hal_dma_update_memory(DMA_HandleTypeDef *dma, void *addr);
3131
int hal_dac_config(DAC_HandleTypeDef *dac, uint32_t channel, uint32_t trigger);
3232
int hal_adc_config(ADC_HandleTypeDef *adc, uint32_t resolution, uint32_t trigger, PinName *adc_pins, uint32_t n_channels);
33+
int hal_adc_enable_dual_mode(bool enable);
3334
int hal_i2s_config(I2S_HandleTypeDef *i2s, uint32_t sample_rate, uint32_t mode, bool mck_enable);
3435

3536
#endif // __HAL_CONFIG_H__

0 commit comments

Comments
 (0)