Merge branch 'master' into raspi-portduino

2023-04-21 16:50:48 +02:00
parent 7d299b06a7 e0bb95ca94
commit 85818b8dfd
57 changed files with 541 additions and 139 deletions
@@ -7,7 +7,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 
  ${nrf52840_base.lib_deps}
-  caveman99/ESP32 Codec2@^1.0.1
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
  zinggjm/GxEPD2@^1.4.9
 debug_tool = jlink
 upload_port = /dev/ttyACM4
@@ -6,5 +6,5 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
  ${nrf52840_base.lib_deps}
-  caveman99/ESP32 Codec2@^1.0.1
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
 debug_tool = jlink
@@ -12,7 +12,6 @@ platform_packages =
  tool-esptoolpy@^1.40500.0
 lib_deps =
  ${esp32_base.lib_deps}
-  caveman99/ESP32 Codec2@^1.0.1
  zinggjm/GxEPD2@^1.5.1
  adafruit/Adafruit NeoPixel@^1.10.7
 build_unflags = -DARDUINO_USB_MODE=1
@@ -12,7 +12,6 @@ platform_packages =
  tool-esptoolpy@^1.40500.0
 lib_deps =
  ${esp32_base.lib_deps}
-  caveman99/ESP32 Codec2@^1.0.1
  adafruit/Adafruit NeoPixel@^1.10.7
 build_unflags = -DARDUINO_USB_MODE=1
 build_flags = 
@@ -2,9 +2,6 @@
 extends = esp32s3_base
 board = tlora-t3s3-v1
 upload_protocol = esp-builtin
-lib_deps =
-  ${esp32_base.lib_deps}
-  caveman99/ESP32 Codec2@^1.0.1

 build_flags = 
  ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/tlora_t3s3_v1
@@ -1,9 +1,6 @@
 [env:tlora-v2-1-1.8]
 extends = esp32_base
 board = ttgo-lora32-v21
-lib_deps =
-  ${esp32_base.lib_deps}
-  caveman99/ESP32 Codec2@^1.0.1

 build_flags = 
  ${esp32_base.build_flags} -D TLORA_V2_1_18 -I variants/tlora_v2_1_18