Skip to content

Commit 6b8157a

Browse files
committed
Fix broken AudioDriverLyratMiniClass
1 parent e73ebb1 commit 6b8157a

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

src/Driver.h

+10-8
Original file line numberDiff line numberDiff line change
@@ -1414,26 +1414,28 @@ class AudioDriverLyratMiniClass : public AudioDriver {
14141414
// setup SPI for SD
14151415
// pins.setSPIActiveForSD(codecCfg.sd_active);
14161416

1417-
bool ok = true;
1418-
14191417
// Start ES8311
14201418
AD_LOGI("starting ES8311");
1419+
pins.begin();
14211420
dac.setPins(this->pins());
1422-
ok = dac.setConfig(codecCfg);
1421+
if (!dac.setConfig(codecCfg)) {
1422+
AD_LOGE("setConfig failed");
1423+
return false;
1424+
}
14231425
setPAPower(true);
14241426
setVolume(DRIVER_DEFAULT_VOLUME);
14251427

14261428
// Start ES7243
14271429
if (codecCfg.input_device != ADC_INPUT_NONE) {
14281430
AD_LOGI("starting ES7243");
14291431
adc.setPins(this->pins());
1430-
ok = ok && adc.setConfig(codecCfg);
1432+
if (!adc.setConfig(codecCfg)) {
1433+
AD_LOGE("adc.begin failed");
1434+
return false;
1435+
}
14311436
}
14321437

1433-
if (!ok) {
1434-
AD_LOGI("AudioDriverLyratMiniClass::begin failed");
1435-
}
1436-
return ok;
1438+
return true;
14371439
}
14381440
bool end(void) {
14391441
int rc = 0;

src/DriverPins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ struct PinsI2C : public I2CConfig {
192192
bool pinsAvailable() { return scl != -1 && sda != -1 && frequency != 0; }
193193
operator bool() { return pinsAvailable(); }
194194

195-
bool begin() {
195+
bool begin() {
196196
if (set_active) {
197197
AD_LOGD("PinsI2C::begin for function %d on port %d", (int)function, port);
198198
return i2c_bus_create(this) == RESULT_OK;

src/Platforms/API_I2C_Arduino.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "Platforms/API_I2C.h"
99

1010
error_t i2c_bus_create(struct I2CConfig *config) {
11+
AD_LOGI("i2c_bus_create");
1112
assert(config != nullptr);
1213
I2CConfig &pins = *config;
1314
TwoWire *p_wire = (TwoWire *)pins.p_wire;
@@ -21,7 +22,7 @@ error_t i2c_bus_create(struct I2CConfig *config) {
2122
// begin with defined pins, if supported
2223
#if defined(ESP32)
2324
AD_LOGI("setting up I2C scl: %d, sda: %d", pins.scl, pins.sda);
24-
p_wire->begin(pins.sda, pins.scl);
25+
p_wire->begin(pins.sda,pins.scl);
2526
#elif defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_STM32)
2627
AD_LOGI("setting up I2C scl: %d, sda: %d", pins.scl, pins.sda);
2728
p_wire->setSCL(pins.scl);

0 commit comments

Comments
 (0)