Commit 3a5dbf2

authored

Merge branch 'master' into release/v3.1.x

2 parents e9b3f26 + 1cdd8e8 commit 3a5dbf2Copy full SHA for 3a5dbf2

File tree

2 files changed

-2

lines changed

boards.txt
variants/m5stack_fire
- pins_arduino.h

2 files changed

-2

lines changed

`‎boards.txt‎`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4084,7 +4084,7 @@ um_feathers3neo.build.cdc_on_boot=1`
`4084`	`4084`	`um_feathers3neo.build.msc_on_boot=0`
`4085`	`4085`	`um_feathers3neo.build.dfu_on_boot=0`
`4086`	`4086`	`um_feathers3neo.build.f_cpu=240000000L`
`4087`		`-um_feathers3neo.build.flash_size=16MB`
	`4087`	`+um_feathers3neo.build.flash_size=8MB`
`4088`	`4088`	`um_feathers3neo.build.flash_freq=80m`
`4089`	`4089`	`um_feathers3neo.build.flash_mode=dio`
`4090`	`4090`	`um_feathers3neo.build.boot=qio`
`@@ -13668,6 +13668,9 @@ adafruit_feather_esp32_v2.menu.PSRAM.disabled.build.defines=`
`13668`	`13668`	`adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)`
`13669`	`13669`	`adafruit_feather_esp32_v2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB`
`13670`	`13670`	`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`
`13671`	`13674`
`13672`	`13675`	`adafruit_feather_esp32_v2.menu.CPUFreq.240=240MHz (WiFi/BT)`
`13673`	`13676`	`adafruit_feather_esp32_v2.menu.CPUFreq.240.build.f_cpu=240000000L`
`@@ -15356,6 +15359,9 @@ adafruit_qtpy_esp32_pico.menu.PSRAM.disabled.build.defines=`
`15356`	`15359`	`adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)`
`15357`	`15360`	`adafruit_qtpy_esp32_pico.menu.PartitionScheme.default_8MB.build.partitions=default_8MB`
`15358`	`15361`	`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`
`15359`	`15365`
`15360`	`15366`	`adafruit_qtpy_esp32_pico.menu.CPUFreq.240=240MHz (WiFi/BT)`
`15361`	`15367`	`adafruit_qtpy_esp32_pico.menu.CPUFreq.240.build.f_cpu=240000000L`

`‎variants/m5stack_fire/pins_arduino.h‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ static const uint8_t RX = 3;`
`9`	`9`	`static const uint8_t SDA = 21;`
`10`	`10`	`static const uint8_t SCL = 22;`
`11`	`11`
`12`		`-static const uint8_t SS = 5;`
	`12`	`+static const uint8_t SS = 4;`
`13`	`13`	`static const uint8_t MOSI = 23;`
`14`	`14`	`static const uint8_t MISO = 19;`
`15`	`15`	`static const uint8_t SCK = 18;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3a5dbf2

File tree

2 files changed

2 files changed

`‎boards.txt‎`

`‎variants/m5stack_fire/pins_arduino.h‎`

0 commit comments