Merge branch 'master' into release/v3.1.x
This commit is contained in:
commit
3a5dbf241e
2 changed files with 8 additions and 2 deletions
|
|
@ -4084,7 +4084,7 @@ um_feathers3neo.build.cdc_on_boot=1
|
|||
um_feathers3neo.build.msc_on_boot=0
|
||||
um_feathers3neo.build.dfu_on_boot=0
|
||||
um_feathers3neo.build.f_cpu=240000000L
|
||||
um_feathers3neo.build.flash_size=16MB
|
||||
um_feathers3neo.build.flash_size=8MB
|
||||
um_feathers3neo.build.flash_freq=80m
|
||||
um_feathers3neo.build.flash_mode=dio
|
||||
um_feathers3neo.build.boot=qio
|
||||
|
|
@ -13668,6 +13668,9 @@ adafruit_feather_esp32_v2.menu.PSRAM.disabled.build.defines=
|
|||
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
|
||||
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
|
||||
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
|
||||
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP / 5.3MB SPIFFS)
|
||||
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
|
||||
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
|
||||
|
||||
adafruit_feather_esp32_v2.menu.CPUFreq.240=240MHz (WiFi/BT)
|
||||
adafruit_feather_esp32_v2.menu.CPUFreq.240.build.f_cpu=240000000L
|
||||
|
|
@ -15356,6 +15359,9 @@ adafruit_qtpy_esp32_pico.menu.PSRAM.disabled.build.defines=
|
|||
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
|
||||
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
|
||||
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
|
||||
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP / 5.3MB SPIFFS)
|
||||
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
|
||||
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
|
||||
|
||||
adafruit_qtpy_esp32_pico.menu.CPUFreq.240=240MHz (WiFi/BT)
|
||||
adafruit_qtpy_esp32_pico.menu.CPUFreq.240.build.f_cpu=240000000L
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ static const uint8_t RX = 3;
|
|||
static const uint8_t SDA = 21;
|
||||
static const uint8_t SCL = 22;
|
||||
|
||||
static const uint8_t SS = 5;
|
||||
static const uint8_t SS = 4;
|
||||
static const uint8_t MOSI = 23;
|
||||
static const uint8_t MISO = 19;
|
||||
static const uint8_t SCK = 18;
|
||||
|
|
|
|||
Loading…
Reference in a new issue