Skip to content

Commit 888232d

Browse files
authored
Update AdvancedADC.cpp
Fixed formatting
1 parent 73b2ac6 commit 888232d

File tree

1 file changed

+15
-26
lines changed

1 file changed

+15
-26
lines changed

src/AdvancedADC.cpp

+15-26
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ DMABuffer<Sample> &AdvancedADC::read() {
115115
return NULLBUF;
116116
}
117117

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) {
119119

120120
ADCName instance = ADC_NP;
121121
// Sanity checks.
@@ -124,8 +124,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
124124
}
125125

126126
//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)) {
129128
descr = nullptr;
130129
return 0;
131130
}
@@ -137,8 +136,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
137136

138137

139138
// 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) {
142140
for (size_t i=0; instance == ADC_NP && i<AN_ARRAY_SIZE(adc_pin_alt); i++) {
143141
// Calculate alternate function pin.
144142
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
162160
}
163161
}
164162
}
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
167164
PinName pin = (PinName) (adc_pins[0] | adc_pin_alt[adcNum-1]);
168165

169166
// Check if pin is mapped.
@@ -192,8 +189,7 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
192189
pinmap_pinout(adc_pins[0], PinMap_ADC);
193190

194191
//If ADC was not specified ensure the remaining channels are mappable to same ADC
195-
if(adcNum==0)
196-
{
192+
if(adcNum==0) {
197193
uint8_t ch_init = 1;
198194
for (size_t i=1; i<n_channels; i++) {
199195
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
273269
hal_dma_enable_dbm(&descr->dma, descr->dmabuf[0]->data(), descr->dmabuf[1]->data());
274270
HAL_NVIC_EnableIRQ(descr->dma_irqn);
275271

276-
if(do_start)
277-
{
272+
if(do_start){
278273
return(start(sample_rate));
279274
}
280275

281276
return 1;
282277
}
283278

284-
int AdvancedADC::start(uint32_t sample_rate)
285-
{
279+
int AdvancedADC::start(uint32_t sample_rate){
286280
// Init, config and start the ADC timer.
287281
hal_tim_config(&descr->tim, sample_rate);
288282

@@ -294,24 +288,22 @@ int AdvancedADC::start(uint32_t sample_rate)
294288
return 1;
295289
}
296290

297-
int AdvancedADC::stop()
298-
{
291+
int AdvancedADC::stop(){
292+
299293
dac_descr_deinit(descr, true);
294+
300295
return 1;
301296
}
302297

303-
void AdvancedADC::clear()
304-
{
298+
void AdvancedADC::clear() {
305299
descr->pool->flush();
306300
}
307301

308-
AdvancedADC::~AdvancedADC()
309-
{
302+
AdvancedADC::~AdvancedADC(){
310303
dac_descr_deinit(descr, true);
311304
}
312305

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){
315307
adcIN1=in1;
316308
adcIN2=in2;
317309

@@ -343,8 +335,7 @@ int AdvancedADCDual::begin(AdvancedADC *in1, AdvancedADC *in2,uint32_t resolutio
343335

344336
}
345337

346-
int AdvancedADCDual:: stop()
347-
{
338+
int AdvancedADCDual:: stop(){
348339
if(adcIN1!=nullptr)
349340
{
350341
adcIN1->stop();
@@ -356,11 +347,9 @@ int AdvancedADCDual:: stop()
356347
//Always disable dual mode when stopped
357348
int result=hal_disable_dual_mode();
358349
return(1);
359-
360350
}
361351

362-
AdvancedADCDual::~AdvancedADCDual()
363-
{
352+
AdvancedADCDual::~AdvancedADCDual(){
364353
int result=stop();
365354
}
366355

0 commit comments

Comments
 (0)