mirror of
https://github.com/meshtastic/firmware.git
synced 2025-12-24 03:31:14 +00:00
Merge branch 'master' into usbhost
This commit is contained in:
@@ -9,10 +9,10 @@ upload_protocol = esptool
|
||||
;upload_port = /dev/ttyACM1
|
||||
upload_speed = 921600
|
||||
platform_packages =
|
||||
tool-esptoolpy@^1.40500.0
|
||||
tool-esptoolpy@^1.40801.0
|
||||
lib_deps =
|
||||
${esp32s3_base.lib_deps}
|
||||
zinggjm/GxEPD2@^1.5.1
|
||||
zinggjm/GxEPD2@^1.6.2
|
||||
adafruit/Adafruit NeoPixel @ ^1.12.0
|
||||
build_unflags =
|
||||
${esp32s3_base.build_unflags}
|
||||
@@ -26,4 +26,4 @@ build_flags =
|
||||
-DEINK_HEIGHT=128
|
||||
-DBOARD_HAS_PSRAM
|
||||
-mfix-esp32-psram-cache-issue
|
||||
-DARDUINO_USB_MODE=0
|
||||
-DARDUINO_USB_MODE=0
|
||||
|
||||
Reference in New Issue
Block a user