Skip to content

Commit 3a5dbf2

Browse files
authored
Merge branch 'master' into release/v3.1.x
2 parents e9b3f26 + 1cdd8e8 commit 3a5dbf2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

boards.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -4084,7 +4084,7 @@ um_feathers3neo.build.cdc_on_boot=1
40844084
um_feathers3neo.build.msc_on_boot=0
40854085
um_feathers3neo.build.dfu_on_boot=0
40864086
um_feathers3neo.build.f_cpu=240000000L
4087-
um_feathers3neo.build.flash_size=16MB
4087+
um_feathers3neo.build.flash_size=8MB
40884088
um_feathers3neo.build.flash_freq=80m
40894089
um_feathers3neo.build.flash_mode=dio
40904090
um_feathers3neo.build.boot=qio
@@ -13668,6 +13668,9 @@ adafruit_feather_esp32_v2.menu.PSRAM.disabled.build.defines=
1366813668
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
1366913669
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1367013670
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
13671+
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP / 5.3MB SPIFFS)
13672+
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
13673+
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
1367113674

1367213675
adafruit_feather_esp32_v2.menu.CPUFreq.240=240MHz (WiFi/BT)
1367313676
adafruit_feather_esp32_v2.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -15356,6 +15359,9 @@ adafruit_qtpy_esp32_pico.menu.PSRAM.disabled.build.defines=
1535615359
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
1535715360
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1535815361
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
15362+
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP / 5.3MB SPIFFS)
15363+
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
15364+
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
1535915365

1536015366
adafruit_qtpy_esp32_pico.menu.CPUFreq.240=240MHz (WiFi/BT)
1536115367
adafruit_qtpy_esp32_pico.menu.CPUFreq.240.build.f_cpu=240000000L

variants/m5stack_fire/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static const uint8_t RX = 3;
99
static const uint8_t SDA = 21;
1010
static const uint8_t SCL = 22;
1111

12-
static const uint8_t SS = 5;
12+
static const uint8_t SS = 4;
1313
static const uint8_t MOSI = 23;
1414
static const uint8_t MISO = 19;
1515
static const uint8_t SCK = 18;

0 commit comments

Comments
 (0)