@@ -115,7 +115,7 @@ DMABuffer<Sample> &AdvancedADC::read() {
115
115
return NULLBUF;
116
116
}
117
117
118
- int AdvancedADC::begin (uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers,bool do_start,uint8_t adcNum) {
118
+ int AdvancedADC::begin (uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers, bool do_start, uint8_t adcNum) {
119
119
120
120
ADCName instance = ADC_NP;
121
121
// Sanity checks.
@@ -124,8 +124,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
124
124
}
125
125
126
126
// if ADC specified is more than the number of available ADC bail out
127
- if (adcNum>AN_ARRAY_SIZE (adc_pin_alt))
128
- {
127
+ if (adcNum>AN_ARRAY_SIZE (adc_pin_alt)) {
129
128
descr = nullptr ;
130
129
return 0 ;
131
130
}
@@ -137,8 +136,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
137
136
138
137
139
138
// If ADC not specified find an ADC that can be used with these set of pins/channels.
140
- if (adcNum==0 )
141
- {
139
+ if (adcNum==0 ) {
142
140
for (size_t i=0 ; instance == ADC_NP && i<AN_ARRAY_SIZE (adc_pin_alt); i++) {
143
141
// Calculate alternate function pin.
144
142
PinName pin = (PinName) (adc_pins[0 ] | adc_pin_alt[i]); // First pin decides the ADC.
@@ -162,8 +160,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
162
160
}
163
161
}
164
162
}
165
- else if (adcNum>0 ) // if ADC specified use that ADC to try to map first channel
166
- {
163
+ else if (adcNum>0 ) { // if ADC specified use that ADC to try to map first channel
167
164
PinName pin = (PinName) (adc_pins[0 ] | adc_pin_alt[adcNum-1 ]);
168
165
169
166
// Check if pin is mapped.
@@ -192,8 +189,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
192
189
pinmap_pinout (adc_pins[0 ], PinMap_ADC);
193
190
194
191
// If ADC was not specified ensure the remaining channels are mappable to same ADC
195
- if (adcNum==0 )
196
- {
192
+ if (adcNum==0 ) {
197
193
uint8_t ch_init = 1 ;
198
194
for (size_t i=1 ; i<n_channels; i++) {
199
195
for (size_t j=0 ; j<AN_ARRAY_SIZE (adc_pin_alt); j++) {
@@ -273,16 +269,14 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
273
269
hal_dma_enable_dbm (&descr->dma , descr->dmabuf [0 ]->data (), descr->dmabuf [1 ]->data ());
274
270
HAL_NVIC_EnableIRQ (descr->dma_irqn );
275
271
276
- if (do_start)
277
- {
272
+ if (do_start){
278
273
return (start (sample_rate));
279
274
}
280
275
281
276
return 1 ;
282
277
}
283
278
284
- int AdvancedADC::start (uint32_t sample_rate)
285
- {
279
+ int AdvancedADC::start (uint32_t sample_rate){
286
280
// Init, config and start the ADC timer.
287
281
hal_tim_config (&descr->tim , sample_rate);
288
282
@@ -294,24 +288,22 @@ int AdvancedADC::start(uint32_t sample_rate)
294
288
return 1 ;
295
289
}
296
290
297
- int AdvancedADC::stop ()
298
- {
291
+ int AdvancedADC::stop (){
292
+
299
293
dac_descr_deinit (descr, true );
294
+
300
295
return 1 ;
301
296
}
302
297
303
- void AdvancedADC::clear ()
304
- {
298
+ void AdvancedADC::clear () {
305
299
descr->pool ->flush ();
306
300
}
307
301
308
- AdvancedADC::~AdvancedADC ()
309
- {
302
+ AdvancedADC::~AdvancedADC (){
310
303
dac_descr_deinit (descr, true );
311
304
}
312
305
313
- int AdvancedADCDual::begin (AdvancedADC *in1, AdvancedADC *in2,uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers)
314
- {
306
+ int AdvancedADCDual::begin (AdvancedADC *in1, AdvancedADC *in2, uint32_t resolution, uint32_t sample_rate, size_t n_samples, size_t n_buffers){
315
307
adcIN1=in1;
316
308
adcIN2=in2;
317
309
@@ -343,8 +335,7 @@ int AdvancedADCDual::begin(AdvancedADC *in1, AdvancedADC *in2,uint32_t resolutio
343
335
344
336
}
345
337
346
- int AdvancedADCDual:: stop()
347
- {
338
+ int AdvancedADCDual:: stop(){
348
339
if (adcIN1!=nullptr )
349
340
{
350
341
adcIN1->stop ();
@@ -356,11 +347,9 @@ int AdvancedADCDual:: stop()
356
347
// Always disable dual mode when stopped
357
348
int result=hal_disable_dual_mode ();
358
349
return (1 );
359
-
360
350
}
361
351
362
- AdvancedADCDual::~AdvancedADCDual ()
363
- {
352
+ AdvancedADCDual::~AdvancedADCDual (){
364
353
int result=stop ();
365
354
}
366
355
0 commit comments