Skip to content

Commit

Permalink
Bump ESP8266Audio to 1.9.8 and remove no longer needed quirks
Browse files Browse the repository at this point in the history
  • Loading branch information
mskvortsov committed Jun 19, 2024
1 parent dfb9778 commit 25926fc
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 39 deletions.
8 changes: 0 additions & 8 deletions bin/platformio-custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,6 @@ def esp32_create_combined_bin(source, target, env):
for lb in env.GetLibBuilders():
if lb.name == "NonBlockingRTTTL":
lb.env.Append(CPPDEFINES=[("QUIRK_RTTTL", 1)])
elif lb.name == "LovyanGFX":
lb.env.Append(CPPDEFINES=[("QUIRK_LOVYAN", 1)])
elif lb.name == "ESP8266Audio":
lb.env.Append(CPPDEFINES=[("QUIRK_ESP8266_AUDIO", 1)])
framework_path = env.PioPlatform().get_package_dir(
"framework-arduinoespressif32"
)
lb.env.Append(CXXFLAGS=["-I" + framework_path + "/libraries/WiFi/src"])

Import("projenv")

Expand Down
30 changes: 1 addition & 29 deletions src/platform/esp32/quirks.h
Original file line number Diff line number Diff line change
@@ -1,36 +1,8 @@
#if QUIRK_RTTTL || QUIRK_LOVYAN
#if QUIRK_RTTTL
#define ledcSetup(ch, freq, res) \
uint32_t __freq = freq; \
uint8_t __res = res; \
do { \
} while (0)
#define ledcAttachPin(pin, ch) ledcAttachChannel(pin, __freq, __res, ch)
#endif

#if QUIRK_LOVYAN
#include <stdbool.h>

#include "esp_heap_caps.h"
#include "multi_heap.h"

#include "rom/ets_sys.h"
#include "rom/gpio.h"
#include "soc/gpio_struct.h"
#include "soc/spi_periph.h"
#include "soc/spi_reg.h"

#undef bool
#undef true
#undef false
#endif

#if QUIRK_ESP8266_AUDIO
#ifdef __cplusplus
#include "WiFi.h"
#endif
#include "esp_chip_info.h"
#include "soc/rtc_cntl_reg.h"
#include "soc/rtc_io_reg.h"
#define rtc_clk_apll_enable(...)
#define I2S_MCLK_MULTIPLE_DEFAULT I2S_MCLK_MULTIPLE_128
#endif
2 changes: 1 addition & 1 deletion variants/t-deck/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ build_flags = ${esp32s3_base.build_flags}

lib_deps = ${esp32s3_base.lib_deps}
lovyan03/LovyanGFX@^1.1.9
earlephilhower/ESP8266Audio@^1.9.7
https://github.com/earlephilhower/ESP8266Audio#c93201483fa2a15a36ccb6296b2b9382ddfa3000
earlephilhower/ESP8266SAM@^1.0.1
2 changes: 1 addition & 1 deletion variants/t-watch-s3/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ lib_deps = ${esp32s3_base.lib_deps}
lovyan03/LovyanGFX@^1.1.9
lewisxhe/[email protected]
adafruit/Adafruit DRV2605 Library@^1.2.2
earlephilhower/ESP8266Audio@^1.9.7
https://github.com/earlephilhower/ESP8266Audio#c93201483fa2a15a36ccb6296b2b9382ddfa3000
earlephilhower/ESP8266SAM@^1.0.1

0 comments on commit 25926fc

Please sign in to comment.