mirror of
https://github.com/meshtastic/firmware.git
synced 2025-12-21 02:02:23 +00:00
Merge branch 'master' into arduino-esp32-v3.2
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
extends = esp32s3_base
|
||||
board = bpi_picow_esp32_s3
|
||||
board_check = true
|
||||
board_build.partitions = default_8MB.csv
|
||||
board_build.partitions = partition-table-8MB.csv
|
||||
;OpenOCD flash method
|
||||
;upload_protocol = esp-builtin
|
||||
;Normal method
|
||||
|
||||
@@ -10,7 +10,7 @@ platform_packages =
|
||||
|
||||
board = seeed-sensecap-indicator
|
||||
board_check = true
|
||||
board_build.partitions = 8MB_no_ota.csv
|
||||
board_build.partitions = partition-table-8MB.csv
|
||||
upload_protocol = esptool
|
||||
|
||||
build_unflags =
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
[env:unphone]
|
||||
extends = esp32s3_base
|
||||
board = unphone
|
||||
board_build.partitions = default_8MB.csv
|
||||
board_build.partitions = partition-table-8MB.csv
|
||||
upload_speed = 921600
|
||||
monitor_speed = 115200
|
||||
monitor_filters = esp32_exception_decoder
|
||||
@@ -20,6 +20,7 @@ build_flags =
|
||||
-D UNPHONE_LORA=0
|
||||
-D UNPHONE_FACTORY_MODE=0
|
||||
-D USE_SX127x
|
||||
-D SDCARD_CS=43
|
||||
|
||||
build_src_filter =
|
||||
${esp32s3_base.build_src_filter}
|
||||
@@ -41,6 +42,7 @@ build_flags =
|
||||
-D HAS_SCREEN=1
|
||||
-D HAS_TFT=1
|
||||
-D HAS_SDCARD
|
||||
-D SDCARD_CS=43
|
||||
-D DISPLAY_SET_RESOLUTION
|
||||
-D RAM_SIZE=6144
|
||||
-D LV_CACHE_DEF_SIZE=2097152
|
||||
|
||||
@@ -52,7 +52,6 @@
|
||||
#undef GPS_TX_PIN
|
||||
|
||||
#define SD_SPI_FREQUENCY 25000000
|
||||
#define SDCARD_CS 43
|
||||
|
||||
#define LED_PIN 13 // the red part of the RGB LED
|
||||
#define LED_STATE_ON 0 // State when LED is lit
|
||||
|
||||
Reference in New Issue
Block a user