Skip to content

Commit 94a2aaf

Browse files
a-sapuppoa-sapuppo
committed
fix boards menu options
1 parent 2b6e4e4 commit 94a2aaf

File tree

4 files changed

+12
-87
lines changed

4 files changed

+12
-87
lines changed

‎boards.txt

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -26010,12 +26010,12 @@ namino_rosso.menu.UploadMode.default=UART0 / Hardware CDC
2601026010
namino_rosso.menu.UploadMode.default.upload.use_1200bps_touch=false
2601126011
namino_rosso.menu.UploadMode.default.upload.wait_for_upload_port=false
2601226012

26013-
namino_rosso.menu.PSRAM.enabled=QSPI PSRAM
26014-
namino_rosso.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
26015-
namino_rosso.menu.PSRAM.enabled.build.psram_type=qspi
2601626013
namino_rosso.menu.PSRAM.disabled=Disabled
2601726014
namino_rosso.menu.PSRAM.disabled.build.defines=
2601826015
namino_rosso.menu.PSRAM.disabled.build.psram_type=qspi
26016+
namino_rosso.menu.PSRAM.enabled=QSPI PSRAM
26017+
namino_rosso.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
26018+
namino_rosso.menu.PSRAM.enabled.build.psram_type=qspi
2601926019
namino_rosso.menu.PSRAM.opi=OPI PSRAM
2602026020
namino_rosso.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
2602126021
namino_rosso.menu.PSRAM.opi.build.psram_type=opi
@@ -26024,9 +26024,6 @@ namino_rosso.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5
2602426024
namino_rosso.menu.PartitionScheme.default.build.partitions=default
2602526025
namino_rosso.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
2602626026
namino_rosso.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
26027-
namino_rosso.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
26028-
namino_rosso.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
26029-
namino_rosso.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
2603026027
namino_rosso.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
2603126028
namino_rosso.menu.PartitionScheme.minimal.build.partitions=minimal
2603226029
namino_rosso.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
@@ -26047,21 +26044,6 @@ namino_rosso.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2604726044
namino_rosso.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
2604826045
namino_rosso.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2604926046
namino_rosso.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
26050-
namino_rosso.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
26051-
namino_rosso.menu.PartitionScheme.fatflash.build.partitions=ffat
26052-
namino_rosso.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
26053-
namino_rosso.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
26054-
namino_rosso.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
26055-
namino_rosso.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
26056-
namino_rosso.menu.PartitionScheme.rainmaker=RainMaker
26057-
namino_rosso.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
26058-
namino_rosso.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
26059-
namino_rosso.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
26060-
namino_rosso.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
26061-
namino_rosso.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
26062-
namino_rosso.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
26063-
namino_rosso.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
26064-
namino_rosso.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
2606526047

2606626048
namino_rosso.menu.CPUFreq.240=240MHz (WiFi)
2606726049
namino_rosso.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -26219,12 +26201,12 @@ namino_arancio.menu.UploadMode.default=UART0 / Hardware CDC
2621926201
namino_arancio.menu.UploadMode.default.upload.use_1200bps_touch=false
2622026202
namino_arancio.menu.UploadMode.default.upload.wait_for_upload_port=false
2622126203

26222-
namino_arancio.menu.PSRAM.enabled=QSPI PSRAM
26223-
namino_arancio.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
26224-
namino_arancio.menu.PSRAM.enabled.build.psram_type=qspi
2622526204
namino_arancio.menu.PSRAM.disabled=Disabled
2622626205
namino_arancio.menu.PSRAM.disabled.build.defines=
2622726206
namino_arancio.menu.PSRAM.disabled.build.psram_type=qspi
26207+
namino_arancio.menu.PSRAM.enabled=QSPI PSRAM
26208+
namino_arancio.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
26209+
namino_arancio.menu.PSRAM.enabled.build.psram_type=qspi
2622826210
namino_arancio.menu.PSRAM.opi=OPI PSRAM
2622926211
namino_arancio.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
2623026212
namino_arancio.menu.PSRAM.opi.build.psram_type=opi
@@ -26233,9 +26215,6 @@ namino_arancio.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1
2623326215
namino_arancio.menu.PartitionScheme.default.build.partitions=default
2623426216
namino_arancio.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
2623526217
namino_arancio.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
26236-
namino_arancio.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
26237-
namino_arancio.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
26238-
namino_arancio.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
2623926218
namino_arancio.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
2624026219
namino_arancio.menu.PartitionScheme.minimal.build.partitions=minimal
2624126220
namino_arancio.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
@@ -26256,21 +26235,6 @@ namino_arancio.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2625626235
namino_arancio.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
2625726236
namino_arancio.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2625826237
namino_arancio.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
26259-
namino_arancio.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
26260-
namino_arancio.menu.PartitionScheme.fatflash.build.partitions=ffat
26261-
namino_arancio.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
26262-
namino_arancio.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
26263-
namino_arancio.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
26264-
namino_arancio.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
26265-
namino_arancio.menu.PartitionScheme.rainmaker=RainMaker
26266-
namino_arancio.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
26267-
namino_arancio.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
26268-
namino_arancio.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
26269-
namino_arancio.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
26270-
namino_arancio.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
26271-
namino_arancio.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
26272-
namino_arancio.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
26273-
namino_arancio.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
2627426238

2627526239
namino_arancio.menu.CPUFreq.240=240MHz (WiFi)
2627626240
namino_arancio.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -26428,12 +26392,12 @@ namino_bianco.menu.UploadMode.default=UART0 / Hardware CDC
2642826392
namino_bianco.menu.UploadMode.default.upload.use_1200bps_touch=false
2642926393
namino_bianco.menu.UploadMode.default.upload.wait_for_upload_port=false
2643026394

26431-
namino_bianco.menu.PSRAM.enabled=QSPI PSRAM
26432-
namino_bianco.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
26433-
namino_bianco.menu.PSRAM.enabled.build.psram_type=qspi
2643426395
namino_bianco.menu.PSRAM.disabled=Disabled
2643526396
namino_bianco.menu.PSRAM.disabled.build.defines=
2643626397
namino_bianco.menu.PSRAM.disabled.build.psram_type=qspi
26398+
namino_bianco.menu.PSRAM.enabled=QSPI PSRAM
26399+
namino_bianco.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
26400+
namino_bianco.menu.PSRAM.enabled.build.psram_type=qspi
2643726401
namino_bianco.menu.PSRAM.opi=OPI PSRAM
2643826402
namino_bianco.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
2643926403
namino_bianco.menu.PSRAM.opi.build.psram_type=opi
@@ -26442,9 +26406,6 @@ namino_bianco.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.
2644226406
namino_bianco.menu.PartitionScheme.default.build.partitions=default
2644326407
namino_bianco.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
2644426408
namino_bianco.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
26445-
namino_bianco.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
26446-
namino_bianco.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
26447-
namino_bianco.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
2644826409
namino_bianco.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
2644926410
namino_bianco.menu.PartitionScheme.minimal.build.partitions=minimal
2645026411
namino_bianco.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
@@ -26465,21 +26426,6 @@ namino_bianco.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2646526426
namino_bianco.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
2646626427
namino_bianco.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2646726428
namino_bianco.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
26468-
namino_bianco.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
26469-
namino_bianco.menu.PartitionScheme.fatflash.build.partitions=ffat
26470-
namino_bianco.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
26471-
namino_bianco.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
26472-
namino_bianco.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
26473-
namino_bianco.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
26474-
namino_bianco.menu.PartitionScheme.rainmaker=RainMaker
26475-
namino_bianco.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
26476-
namino_bianco.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
26477-
namino_bianco.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
26478-
namino_bianco.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
26479-
namino_bianco.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
26480-
namino_bianco.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
26481-
namino_bianco.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
26482-
namino_bianco.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
2648326429

2648426430
namino_bianco.menu.CPUFreq.240=240MHz (WiFi)
2648526431
namino_bianco.menu.CPUFreq.240.build.f_cpu=240000000L

‎variants/namino_arancio/pins_arduino.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2023 Namino Team, version: 1.0.19 @ 2023-07-24
2+
// Copyright (c) 2023 Namino Team, version: 1.0.20 @ 2023-10-06
33
//
44
//
55
#ifndef Pins_Arduino_h
@@ -13,13 +13,6 @@
1313

1414
#define NAMINO_ARANCIO_BOARD
1515

16-
#define NUM_DIGITAL_PINS SOC_GPIO_PIN_COUNT // GPIO 0..48
17-
#define NUM_ANALOG_INPUTS 20 // GPIO 1..20
18-
#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
19-
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
20-
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
21-
#define digitalPinHasPWM(p) (p < NUM_DIGITAL_PINS)
22-
2316
/* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
2417
static const uint8_t GPIO4 = 4;
2518
static const uint8_t GPIO5 = 5;

‎variants/namino_bianco/pins_arduino.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2023 Namino Team, bianco version: 1.0.0 @ 2023-10-04
2+
// Copyright (c) 2023 Namino Team, bianco version: 1.0.1 @ 2023-10-06
33
//
44
//
55
#ifndef Pins_Arduino_h
@@ -13,13 +13,6 @@
1313

1414
#define NAMINO_BIANCO_BOARD
1515

16-
#define NUM_DIGITAL_PINS SOC_GPIO_PIN_COUNT // GPIO 0..48
17-
#define NUM_ANALOG_INPUTS 20 // GPIO 1..20
18-
#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
19-
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
20-
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
21-
#define digitalPinHasPWM(p) (p < NUM_DIGITAL_PINS)
22-
2316
/* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
2417
static const uint8_t GPIO4 = 4;
2518
static const uint8_t GPIO5 = 5;

‎variants/namino_rosso/pins_arduino.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2023 Namino Team, version: 1.0.19 @ 2023-07-24
2+
// Copyright (c) 2023 Namino Team, version: 1.0.20 @ 2023-10-06
33
//
44
//
55
#ifndef Pins_Arduino_h
@@ -13,13 +13,6 @@
1313

1414
#define NAMINO_ROSSO_BOARD
1515

16-
#define NUM_DIGITAL_PINS SOC_GPIO_PIN_COUNT // GPIO 0..48
17-
#define NUM_ANALOG_INPUTS 20 // GPIO 1..20
18-
#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
19-
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
20-
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
21-
#define digitalPinHasPWM(p) (p < NUM_DIGITAL_PINS)
22-
2316
/* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
2417
static const uint8_t GPIO4 = 4;
2518
static const uint8_t GPIO5 = 5;

0 commit comments

Comments
 (0)