Skip to content

Commit b3d9621

Browse files
committed
fix wrong signature of SPH0654::initialize()
* debug messages added to different initializers * SPH0654::initialize() was having a wrong signature: uint8 instead of int8. C++ can be a real bastard ;-)
1 parent 89c3360 commit b3d9621

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

usermods/audioreactive/audio_source.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ class I2SSource : public AudioSource {
206206
}
207207

208208
virtual void initialize(int8_t i2swsPin = I2S_PIN_NO_CHANGE, int8_t i2ssdPin = I2S_PIN_NO_CHANGE, int8_t i2sckPin = I2S_PIN_NO_CHANGE, int8_t mclkPin = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
209+
DEBUGSR_PRINTLN("I2SSource:: initialize().");
209210
if (i2swsPin != I2S_PIN_NO_CHANGE && i2ssdPin != I2S_PIN_NO_CHANGE) {
210211
if (!pinManager.allocatePin(i2swsPin, true, PinOwner::UM_Audioreactive) ||
211212
!pinManager.allocatePin(i2ssdPin, false, PinOwner::UM_Audioreactive)) { // #206
@@ -462,6 +463,7 @@ class ES7243 : public I2SSource {
462463
};
463464

464465
void initialize(int8_t sdaPin, int8_t sclPin, int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t mclkPin) {
466+
DEBUGSR_PRINTLN("ES7243:: initialize();");
465467
// check that pins are valid
466468
if ((sdaPin < 0) || (sclPin < 0)) {
467469
ERRORSR_PRINTF("\nAR: invalid ES7243 I2C pins: SDA=%d, SCL=%d\n", sdaPin, sclPin);
@@ -618,6 +620,7 @@ class ES8388Source : public I2SSource {
618620
};
619621

620622
void initialize(int8_t sdaPin, int8_t sclPin, int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t mclkPin) {
623+
DEBUGSR_PRINTLN("ES8388Source:: initialize();");
621624

622625
// BUG: "use global I2C pins" are valid as -1, and -1 is seen as invalid here.
623626
// Workaround: Set I2C pins here, which will also set them globally.
@@ -712,6 +715,7 @@ class I2SAdcSource : public I2SSource {
712715
AudioSourceType getType(void) {return(Type_I2SAdc);}
713716

714717
void initialize(int8_t audioPin, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
718+
DEBUGSR_PRINTLN("I2SAdcSource:: initialize().");
715719
_myADCchannel = 0x0F;
716720
if(!pinManager.allocatePin(audioPin, false, PinOwner::UM_Audioreactive)) {
717721
ERRORSR_PRINTF("failed to allocate GPIO for audio analog input: %d\n", audioPin);
@@ -882,7 +886,8 @@ class SPH0654 : public I2SSource {
882886
I2SSource(sampleRate, blockSize, sampleScale, i2sMaster)
883887
{}
884888

885-
void initialize(uint8_t i2swsPin, uint8_t i2ssdPin, uint8_t i2sckPin, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
889+
void initialize(int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE, int8_t = I2S_PIN_NO_CHANGE) {
890+
DEBUGSR_PRINTLN("SPH0654:: initialize();");
886891
I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin);
887892
#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
888893
// these registers are only existing in "classic" ESP32

0 commit comments

Comments
 (0)