From 19afb529bcb4092aa57a34a9441bc563d1bdc3ed Mon Sep 17 00:00:00 2001 From: Tinyu Date: Fri, 23 Aug 2024 11:09:31 +0800 Subject: [PATCH] Compatible with Arduino 2.x --- src/utility/Speaker.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/utility/Speaker.cpp b/src/utility/Speaker.cpp index d608a92..215b7c6 100644 --- a/src/utility/Speaker.cpp +++ b/src/utility/Speaker.cpp @@ -7,13 +7,22 @@ SPEAKER::SPEAKER(void) { void SPEAKER::begin() { _begun = true; - ledcAttach(TONE_PIN_CHANNEL, 0, 13); +#if ESP_IDF_VERSION_MAJOR <= 4 + ledcSetup(TONE_PIN_CHANNEL, 0, 13); + ledcAttachPin(SPEAKER_PIN, TONE_PIN_CHANNEL); +#elif ESP_IDF_VERSION_MAJOR > 4 + ledcAttach(SPEAKER_PIN, 0, 13); +#endif setBeep(4000, 100); } void SPEAKER::end() { mute(); +#if ESP_IDF_VERSION_MAJOR <= 4 + ledcDetachPin(SPEAKER_PIN); +#elif ESP_IDF_VERSION_MAJOR > 4 ledcDetach(SPEAKER_PIN); +#endif _begun = false; } @@ -74,5 +83,9 @@ void SPEAKER::playMusic(const uint8_t* music_data, uint16_t sample_rate) { delay(2); } } - ledcAttach(TONE_PIN_CHANNEL, 0, 13); +#if ESP_IDF_VERSION_MAJOR <= 4 + ledcAttachPin(SPEAKER_PIN, TONE_PIN_CHANNEL); +#elif ESP_IDF_VERSION_MAJOR > 4 + ledcAttach(SPEAKER_PIN, 0, 13); +#endif }