pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-06 05:41:46 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Cherry pick tdeck fixes (#5422)

Browse Source 
* Try-fix (workaround) T-Deck audio crash

* set T-Deck audio to unused 48 (mem mclk)

* swap mclk to gpio 21

* dreamcatcher: assign GPIO44 to audio mclk

---------

Co-authored-by: mverch67 <manuel.verch@gmx.de>
This commit is contained in:
Ben Meadors 2024-11-22 14:25:09 -06:00 committed by GitHub
parent e6fb6b115a
commit fdec95f9c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AudioThread.h
View File

@ -64,7 +64,7 @@ class AudioThread : public concurrency::OSThread
void initOutput() void initOutput()
{ {
audioOut = new AudioOutputI2S(1, AudioOutputI2S::EXTERNAL_I2S); audioOut = new AudioOutputI2S(1, AudioOutputI2S::EXTERNAL_I2S);
audioOut->SetPinout(DAC_I2S_BCK, DAC_I2S_WS, DAC_I2S_DOUT); audioOut->SetPinout(DAC_I2S_BCK, DAC_I2S_WS, DAC_I2S_DOUT, DAC_I2S_MCLK);
audioOut->SetGain(0.2); audioOut->SetGain(0.2);
}; };

2
variants/dreamcatcher/platformio.ini
View File

@ -11,7 +11,7 @@ build_flags =
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = ${esp32s3_base.lib_deps} lib_deps = ${esp32s3_base.lib_deps}
earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266Audio@^1.9.9
earlephilhower/ESP8266SAM@^1.0.1 earlephilhower/ESP8266SAM@^1.0.1
[env:dreamcatcher-2206] [env:dreamcatcher-2206]

1
variants/dreamcatcher/variant.h
View File

@ -60,6 +60,7 @@
#define DAC_I2S_BCK 21 #define DAC_I2S_BCK 21
#define DAC_I2S_WS 9 #define DAC_I2S_WS 9
#define DAC_I2S_DOUT 48 #define DAC_I2S_DOUT 48
#define DAC_I2S_MCLK 44
#define BIAS_T_ENABLE 7 // needs to be low #define BIAS_T_ENABLE 7 // needs to be low
#define BIAS_T_VALUE 0 #define BIAS_T_VALUE 0

2
variants/t-deck/platformio.ini
View File

@ -15,5 +15,5 @@ build_flags = ${esp32_base.build_flags}
lib_deps = ${esp32s3_base.lib_deps} lib_deps = ${esp32s3_base.lib_deps}
lovyan03/LovyanGFX@^1.1.9 lovyan03/LovyanGFX@^1.1.9
earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266Audio@^1.9.9
earlephilhower/ESP8266SAM@^1.0.1 earlephilhower/ESP8266SAM@^1.0.1

1
variants/t-deck/variant.h
View File

@ -73,6 +73,7 @@
#define DAC_I2S_BCK 7 #define DAC_I2S_BCK 7
#define DAC_I2S_WS 5 #define DAC_I2S_WS 5
#define DAC_I2S_DOUT 6 #define DAC_I2S_DOUT 6
#define DAC_I2S_MCLK 21 // GPIO lrck mic
// LoRa // LoRa
#define USE_SX1262 #define USE_SX1262

2
variants/t-watch-s3/platformio.ini
View File

@ -14,5 +14,5 @@ lib_deps = ${esp32s3_base.lib_deps}
lovyan03/LovyanGFX@^1.1.9 lovyan03/LovyanGFX@^1.1.9
lewisxhe/PCF8563_Library@1.0.1 lewisxhe/PCF8563_Library@1.0.1
adafruit/Adafruit DRV2605 Library@^1.2.2 adafruit/Adafruit DRV2605 Library@^1.2.2
earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266Audio@^1.9.9
earlephilhower/ESP8266SAM@^1.0.1 earlephilhower/ESP8266SAM@^1.0.1

1
variants/t-watch-s3/variant.h
View File

@ -34,6 +34,7 @@
#define DAC_I2S_BCK 48 #define DAC_I2S_BCK 48
#define DAC_I2S_WS 15 #define DAC_I2S_WS 15
#define DAC_I2S_DOUT 46 #define DAC_I2S_DOUT 46
#define DAC_I2S_MCLK 0
#define HAS_AXP2101 #define HAS_AXP2101