Skip to content

Commit 08ad219

Browse files
committed
reformat code
1 parent eff1244 commit 08ad219

File tree

1 file changed

+47
-56
lines changed

1 file changed

+47
-56
lines changed

src/DriverPins.h

Lines changed: 47 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ enum class PinLogic {
3535
enum class PinFunction {
3636
HEADPHONE_DETECT,
3737
AUXIN_DETECT,
38-
PA, // Power Amplifier
38+
PA, // Power Amplifier
3939
POWER,
4040
LED,
4141
KEY,
@@ -68,7 +68,7 @@ struct PinsI2S {
6868
GpioPin ws;
6969
GpioPin data_out;
7070
GpioPin data_in;
71-
int port; // port number
71+
int port; // port number
7272
};
7373

7474
/**
@@ -177,7 +177,7 @@ struct PinsI2C {
177177
p_wire->begin();
178178
} else {
179179
// begin with defined pins, if supported
180-
#if defined(ESP32)
180+
#if defined(ESP32)
181181
AD_LOGI("setting up I2C scl: %d, sda: %d", scl, sda);
182182
p_wire->begin(sda, scl);
183183
#elif defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_STM32)
@@ -218,7 +218,7 @@ struct PinsFunction {
218218
int pin = -1;
219219
int index = 0;
220220
PinLogic pin_logic;
221-
bool active = true; // false if pin conflict
221+
bool active = true; // false if pin conflict
222222
};
223223

224224
/**
@@ -228,7 +228,7 @@ struct PinsFunction {
228228
* @copyright GPLv3
229229
*/
230230
class DriverPins {
231-
public:
231+
public:
232232
void addI2S(PinsI2S pin) { i2s.push_back(pin); }
233233
void addI2S(PinFunction function, GpioPin mclk, GpioPin bck, GpioPin ws,
234234
GpioPin data_out, GpioPin data_in = -1, int port = 0) {
@@ -259,58 +259,51 @@ class DriverPins {
259259
/// Get pin information by function
260260
Optional<PinsFunction> getPin(PinFunction function, int pos = 0) {
261261
for (PinsFunction &pin : pins) {
262-
if (pin.function == function && pin.index == pos)
263-
return pin;
262+
if (pin.function == function && pin.index == pos) return pin;
264263
}
265264
return {};
266265
}
267266

268267
/// Get pin information by pin ID
269268
Optional<PinsFunction> getPin(GpioPin pinId) {
270269
for (PinsFunction &pin : pins) {
271-
if (pin.pin == pinId)
272-
return pin;
270+
if (pin.pin == pinId) return pin;
273271
}
274272
return {};
275273
}
276274

277275
GpioPin getPinID(PinFunction function, int pos = 0) {
278276
auto pin = getPin(function, pos);
279-
if (pin)
280-
return pin.value().pin;
277+
if (pin) return pin.value().pin;
281278
return -1;
282279
}
283280

284281
Optional<PinsI2C> getI2CPins(PinFunction function) {
285282
for (PinsI2C &pin : i2c) {
286-
if (pin.function == function)
287-
return pin;
283+
if (pin.function == function) return pin;
288284
}
289285
return {};
290286
}
291287

292288
Optional<PinsSPI> getSPIPins(PinFunction function) {
293289
for (PinsSPI &pins : spi) {
294-
if (pins.function == function)
295-
return pins;
290+
if (pins.function == function) return pins;
296291
}
297292
return {};
298293
}
299294

300295
/// Finds the I2S pins with the help of the port
301296
Optional<PinsI2S> getI2SPins(int port) {
302297
for (PinsI2S &pins : i2s) {
303-
if (pins.port == port)
304-
return pins;
298+
if (pins.port == port) return pins;
305299
}
306300
return {};
307301
}
308302

309303
/// Finds the I2S pins with the help of the function
310304
Optional<PinsI2S> getI2SPins(PinFunction function = PinFunction::CODEC) {
311305
for (PinsI2S &pins : i2s) {
312-
if (pins.function == function)
313-
return pins;
306+
if (pins.function == function) return pins;
314307
}
315308
return {};
316309
}
@@ -327,12 +320,11 @@ class DriverPins {
327320
bool result = true;
328321
for (auto &tmp : spi) {
329322
AD_LOGD("DriverPins::begin::SPI::begin");
330-
if (tmp.function == PinFunction::SD)
331-
{
323+
if (tmp.function == PinFunction::SD) {
332324
if (sd_active)
333325
result &= tmp.begin();
334-
else
335-
result &= tmp.begin();
326+
else
327+
result &= tmp.begin();
336328
}
337329
}
338330

@@ -367,7 +359,7 @@ class DriverPins {
367359
/// Returns true if some function pins have been defined
368360
bool hasPins() { return !pins.empty(); }
369361

370-
protected:
362+
protected:
371363
Vector<PinsI2S> i2s{0};
372364
Vector<PinsSPI> spi{0};
373365
Vector<PinsI2C> i2c{0};
@@ -381,21 +373,21 @@ class DriverPins {
381373
if (!hasConflict(tmp.pin)) {
382374
AD_LOGD("pinMode %d", tmp.pin);
383375
switch (tmp.pin_logic) {
384-
case PinLogic::InputActiveHigh:
385-
pinMode(tmp.pin, INPUT);
386-
break;
387-
case PinLogic::InputActiveLow:
388-
pinMode(tmp.pin, INPUT_PULLUP);
389-
break;
390-
case PinLogic::Input:
391-
pinMode(tmp.pin, INPUT);
392-
break;
393-
case PinLogic::Output:
394-
pinMode(tmp.pin, OUTPUT);
395-
break;
396-
default:
397-
// do nothing
398-
break;
376+
case PinLogic::InputActiveHigh:
377+
pinMode(tmp.pin, INPUT);
378+
break;
379+
case PinLogic::InputActiveLow:
380+
pinMode(tmp.pin, INPUT_PULLUP);
381+
break;
382+
case PinLogic::Input:
383+
pinMode(tmp.pin, INPUT);
384+
break;
385+
case PinLogic::Output:
386+
pinMode(tmp.pin, OUTPUT);
387+
break;
388+
default:
389+
// do nothing
390+
break;
399391
}
400392
} else {
401393
AD_LOGW("Pin '%d' not set up because of conflict", tmp.pin);
@@ -415,8 +407,7 @@ class DriverPins {
415407
bool hasSPIConflict(int pin) {
416408
if (sd_active) {
417409
auto sd = getSPIPins(PinFunction::SD);
418-
if (!sd)
419-
return false;
410+
if (!sd) return false;
420411
PinsSPI spi = sd.value();
421412
return spi.cs == pin || spi.clk == pin || spi.miso == pin ||
422413
spi.mosi == pin;
@@ -440,7 +431,7 @@ class DriverPins {
440431
* @copyright GPLv3
441432
*/
442433
class PinsLyrat43Class : public DriverPins {
443-
public:
434+
public:
444435
PinsLyrat43Class() {
445436
// sd pins
446437
addSPI(ESP32PinsSD);
@@ -469,7 +460,7 @@ class PinsLyrat43Class : public DriverPins {
469460
* @copyright GPLv3
470461
*/
471462
class PinsLyrat42Class : public DriverPins {
472-
public:
463+
public:
473464
PinsLyrat42Class() {
474465
// sd pins
475466
addSPI(ESP32PinsSD);
@@ -498,7 +489,7 @@ class PinsLyrat42Class : public DriverPins {
498489
* @copyright GPLv3
499490
*/
500491
class PinsLyratMiniClass : public DriverPins {
501-
public:
492+
public:
502493
PinsLyratMiniClass() {
503494
// sd pins
504495
addSPI(ESP32PinsSD);
@@ -529,7 +520,7 @@ class PinsLyratMiniClass : public DriverPins {
529520
* @copyright GPLv3
530521
*/
531522
class PinsAudioKitEs8388v1Class : public DriverPins {
532-
public:
523+
public:
533524
PinsAudioKitEs8388v1Class() {
534525
// sd pins
535526
addSPI(ESP32PinsSD);
@@ -558,7 +549,7 @@ class PinsAudioKitEs8388v1Class : public DriverPins {
558549
* @copyright GPLv3
559550
*/
560551
class PinsAudioKitEs8388v2Class : public DriverPins {
561-
public:
552+
public:
562553
PinsAudioKitEs8388v2Class() {
563554
// sd pins
564555
addSPI(ESP32PinsSD);
@@ -587,7 +578,7 @@ class PinsAudioKitEs8388v2Class : public DriverPins {
587578
* @copyright GPLv3
588579
*/
589580
class PinsAudioKitAC101Class : public DriverPins {
590-
public:
581+
public:
591582
PinsAudioKitAC101Class() {
592583
// sd pins
593584
addSPI(ESP32PinsSD);
@@ -618,21 +609,21 @@ class PinsAudioKitAC101Class : public DriverPins {
618609
* @copyright GPLv3
619610
*/
620611
class PinsSTM32F411DiscoClass : public DriverPins {
621-
public:
612+
public:
622613
PinsSTM32F411DiscoClass() {
623614
// add i2c codec pins: scl, sda, port, frequency
624615
addI2C(PinFunction::CODEC, PB6, PB9);
625616
// add i2s pins: mclk, bck, ws,data_out, data_in ,(port)
626617
addI2S(PinFunction::CODEC, PC7, PC10, PA4, PC3, PC12);
627618

628619
// add other pins
629-
addPin(PinFunction::KEY, PA0, PinLogic::Output); // user button
630-
addPin(PinFunction::LED, PD12, PinLogic::Output, 0); // green
631-
addPin(PinFunction::LED, PD5, PinLogic::Output, 1); // red
632-
addPin(PinFunction::LED, PD13, PinLogic::Output, 2); // orange
633-
addPin(PinFunction::LED, PD14, PinLogic::Output, 3); // red
634-
addPin(PinFunction::LED, PD15, PinLogic::Output, 4); // blue
635-
addPin(PinFunction::PA, PD4, PinLogic::Output); // reset pin (active high)
620+
addPin(PinFunction::KEY, PA0, PinLogic::Output); // user button
621+
addPin(PinFunction::LED, PD12, PinLogic::Output, 0); // green
622+
addPin(PinFunction::LED, PD5, PinLogic::Output, 1); // red
623+
addPin(PinFunction::LED, PD13, PinLogic::Output, 2); // orange
624+
addPin(PinFunction::LED, PD14, PinLogic::Output, 3); // red
625+
addPin(PinFunction::LED, PD15, PinLogic::Output, 4); // blue
626+
addPin(PinFunction::PA, PD4, PinLogic::Output); // reset pin (active high)
636627
// addPin(PinFunction::CODEC_ADC, PC3, PinLogic::Input); // Microphone
637628
}
638629
};
@@ -660,4 +651,4 @@ static PinsAudioKitEs8388v2Class PinsAudioKitEs8388v2;
660651
/// @ingroup audio_driver
661652
static PinsAudioKitAC101Class PinsAudioKitAC101;
662653

663-
} // namespace audio_driver
654+
} // namespace audio_driver

0 commit comments

Comments
 (0)