Skip to content

Commit 810c4eb

Browse files
authored
Merge branch 'master' into release/v3.0.x
2 parents 788326d + 1cdd8e8 commit 810c4eb

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
@@ -3895,7 +3895,7 @@ um_feathers3neo.build.cdc_on_boot=1
38953895
um_feathers3neo.build.msc_on_boot=0
38963896
um_feathers3neo.build.dfu_on_boot=0
38973897
um_feathers3neo.build.f_cpu=240000000L
3898-
um_feathers3neo.build.flash_size=16MB
3898+
um_feathers3neo.build.flash_size=8MB
38993899
um_feathers3neo.build.flash_freq=80m
39003900
um_feathers3neo.build.flash_mode=dio
39013901
um_feathers3neo.build.boot=qio
@@ -13479,6 +13479,9 @@ adafruit_feather_esp32_v2.menu.PSRAM.disabled.build.defines=
1347913479
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
1348013480
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1348113481
adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
13482+
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP / 5.3MB SPIFFS)
13483+
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
13484+
adafruit_feather_esp32_v2.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
1348213485

1348313486
adafruit_feather_esp32_v2.menu.CPUFreq.240=240MHz (WiFi/BT)
1348413487
adafruit_feather_esp32_v2.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -15167,6 +15170,9 @@ adafruit_qtpy_esp32_pico.menu.PSRAM.disabled.build.defines=
1516715170
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
1516815171
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1516915172
adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
15173+
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP / 5.3MB SPIFFS)
15174+
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
15175+
adafruit_qtpy_esp32_pico.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
1517015176

1517115177
adafruit_qtpy_esp32_pico.menu.CPUFreq.240=240MHz (WiFi/BT)
1517215178
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)