kopia lustrzana https://github.com/meshtastic/firmware
				
				
				
			Cherry pick tdeck fixes (#5422)
* 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>pull/5426/head
							rodzic
							
								
									e6fb6b115a
								
							
						
					
					
						commit
						fdec95f9c1
					
				| 
						 | 
				
			
			@ -64,7 +64,7 @@ class AudioThread : public concurrency::OSThread
 | 
			
		|||
    void initOutput()
 | 
			
		||||
    {
 | 
			
		||||
        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);
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@ build_flags =
 | 
			
		|||
  -DARDUINO_USB_CDC_ON_BOOT=1
 | 
			
		||||
 | 
			
		||||
lib_deps = ${esp32s3_base.lib_deps}
 | 
			
		||||
  earlephilhower/ESP8266Audio@^1.9.7
 | 
			
		||||
  earlephilhower/ESP8266Audio@^1.9.9
 | 
			
		||||
  earlephilhower/ESP8266SAM@^1.0.1
 | 
			
		||||
 | 
			
		||||
[env:dreamcatcher-2206] 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -60,6 +60,7 @@
 | 
			
		|||
#define DAC_I2S_BCK 21
 | 
			
		||||
#define DAC_I2S_WS 9
 | 
			
		||||
#define DAC_I2S_DOUT 48
 | 
			
		||||
#define DAC_I2S_MCLK 44
 | 
			
		||||
 | 
			
		||||
#define BIAS_T_ENABLE 7 // needs to be low
 | 
			
		||||
#define BIAS_T_VALUE 0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,5 +15,5 @@ build_flags = ${esp32_base.build_flags}
 | 
			
		|||
 | 
			
		||||
lib_deps = ${esp32s3_base.lib_deps}
 | 
			
		||||
	lovyan03/LovyanGFX@^1.1.9
 | 
			
		||||
  earlephilhower/ESP8266Audio@^1.9.7
 | 
			
		||||
  earlephilhower/ESP8266Audio@^1.9.9
 | 
			
		||||
  earlephilhower/ESP8266SAM@^1.0.1
 | 
			
		||||
| 
						 | 
				
			
			@ -73,6 +73,7 @@
 | 
			
		|||
#define DAC_I2S_BCK 7
 | 
			
		||||
#define DAC_I2S_WS 5
 | 
			
		||||
#define DAC_I2S_DOUT 6
 | 
			
		||||
#define DAC_I2S_MCLK 21 // GPIO lrck mic
 | 
			
		||||
 | 
			
		||||
// LoRa
 | 
			
		||||
#define USE_SX1262
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,5 +14,5 @@ lib_deps = ${esp32s3_base.lib_deps}
 | 
			
		|||
	lovyan03/LovyanGFX@^1.1.9
 | 
			
		||||
  lewisxhe/PCF8563_Library@1.0.1
 | 
			
		||||
  adafruit/Adafruit DRV2605 Library@^1.2.2
 | 
			
		||||
  earlephilhower/ESP8266Audio@^1.9.7
 | 
			
		||||
  earlephilhower/ESP8266Audio@^1.9.9
 | 
			
		||||
  earlephilhower/ESP8266SAM@^1.0.1
 | 
			
		||||
| 
						 | 
				
			
			@ -34,6 +34,7 @@
 | 
			
		|||
#define DAC_I2S_BCK 48
 | 
			
		||||
#define DAC_I2S_WS 15
 | 
			
		||||
#define DAC_I2S_DOUT 46
 | 
			
		||||
#define DAC_I2S_MCLK 0
 | 
			
		||||
 | 
			
		||||
#define HAS_AXP2101
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue