fix boards menu options

espressif · Oct 6, 2023 · 94a2aaf · 94a2aaf
1 parent 2b6e4e4
commit 94a2aaf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 87 deletions.
diff --git a/boards.txt b/boards.txt
@@ -26010,12 +26010,12 @@ namino_rosso.menu.UploadMode.default=UART0 / Hardware CDC
 namino_rosso.menu.UploadMode.default.upload.use_1200bps_touch=false
 namino_rosso.menu.UploadMode.default.upload.wait_for_upload_port=false
 
-namino_rosso.menu.PSRAM.enabled=QSPI PSRAM
-namino_rosso.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-namino_rosso.menu.PSRAM.enabled.build.psram_type=qspi
 namino_rosso.menu.PSRAM.disabled=Disabled
 namino_rosso.menu.PSRAM.disabled.build.defines=
 namino_rosso.menu.PSRAM.disabled.build.psram_type=qspi
+namino_rosso.menu.PSRAM.enabled=QSPI PSRAM
+namino_rosso.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+namino_rosso.menu.PSRAM.enabled.build.psram_type=qspi
 namino_rosso.menu.PSRAM.opi=OPI PSRAM
 namino_rosso.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
 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
 namino_rosso.menu.PartitionScheme.default.build.partitions=default
 namino_rosso.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
 namino_rosso.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-namino_rosso.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
-namino_rosso.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
-namino_rosso.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
 namino_rosso.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
 namino_rosso.menu.PartitionScheme.minimal.build.partitions=minimal
 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
 namino_rosso.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
 namino_rosso.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
 namino_rosso.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-namino_rosso.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-namino_rosso.menu.PartitionScheme.fatflash.build.partitions=ffat
-namino_rosso.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
-namino_rosso.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
-namino_rosso.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-namino_rosso.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
-namino_rosso.menu.PartitionScheme.rainmaker=RainMaker
-namino_rosso.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
-namino_rosso.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
-namino_rosso.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
-namino_rosso.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
-namino_rosso.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
-namino_rosso.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
-namino_rosso.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
-namino_rosso.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
 
 namino_rosso.menu.CPUFreq.240=240MHz (WiFi)
 namino_rosso.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -26219,12 +26201,12 @@ namino_arancio.menu.UploadMode.default=UART0 / Hardware CDC
 namino_arancio.menu.UploadMode.default.upload.use_1200bps_touch=false
 namino_arancio.menu.UploadMode.default.upload.wait_for_upload_port=false
 
-namino_arancio.menu.PSRAM.enabled=QSPI PSRAM
-namino_arancio.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-namino_arancio.menu.PSRAM.enabled.build.psram_type=qspi
 namino_arancio.menu.PSRAM.disabled=Disabled
 namino_arancio.menu.PSRAM.disabled.build.defines=
 namino_arancio.menu.PSRAM.disabled.build.psram_type=qspi
+namino_arancio.menu.PSRAM.enabled=QSPI PSRAM
+namino_arancio.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+namino_arancio.menu.PSRAM.enabled.build.psram_type=qspi
 namino_arancio.menu.PSRAM.opi=OPI PSRAM
 namino_arancio.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
 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
 namino_arancio.menu.PartitionScheme.default.build.partitions=default
 namino_arancio.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
 namino_arancio.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-namino_arancio.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
-namino_arancio.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
-namino_arancio.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
 namino_arancio.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
 namino_arancio.menu.PartitionScheme.minimal.build.partitions=minimal
 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
 namino_arancio.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
 namino_arancio.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
 namino_arancio.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-namino_arancio.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-namino_arancio.menu.PartitionScheme.fatflash.build.partitions=ffat
-namino_arancio.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
-namino_arancio.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
-namino_arancio.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-namino_arancio.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
-namino_arancio.menu.PartitionScheme.rainmaker=RainMaker
-namino_arancio.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
-namino_arancio.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
-namino_arancio.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
-namino_arancio.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
-namino_arancio.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
-namino_arancio.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
-namino_arancio.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
-namino_arancio.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
 
 namino_arancio.menu.CPUFreq.240=240MHz (WiFi)
 namino_arancio.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -26428,12 +26392,12 @@ namino_bianco.menu.UploadMode.default=UART0 / Hardware CDC
 namino_bianco.menu.UploadMode.default.upload.use_1200bps_touch=false
 namino_bianco.menu.UploadMode.default.upload.wait_for_upload_port=false
 
-namino_bianco.menu.PSRAM.enabled=QSPI PSRAM
-namino_bianco.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-namino_bianco.menu.PSRAM.enabled.build.psram_type=qspi
 namino_bianco.menu.PSRAM.disabled=Disabled
 namino_bianco.menu.PSRAM.disabled.build.defines=
 namino_bianco.menu.PSRAM.disabled.build.psram_type=qspi
+namino_bianco.menu.PSRAM.enabled=QSPI PSRAM
+namino_bianco.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+namino_bianco.menu.PSRAM.enabled.build.psram_type=qspi
 namino_bianco.menu.PSRAM.opi=OPI PSRAM
 namino_bianco.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
 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.
 namino_bianco.menu.PartitionScheme.default.build.partitions=default
 namino_bianco.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
 namino_bianco.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-namino_bianco.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
-namino_bianco.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
-namino_bianco.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
 namino_bianco.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
 namino_bianco.menu.PartitionScheme.minimal.build.partitions=minimal
 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
 namino_bianco.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
 namino_bianco.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
 namino_bianco.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-namino_bianco.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-namino_bianco.menu.PartitionScheme.fatflash.build.partitions=ffat
-namino_bianco.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
-namino_bianco.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
-namino_bianco.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-namino_bianco.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
-namino_bianco.menu.PartitionScheme.rainmaker=RainMaker
-namino_bianco.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
-namino_bianco.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
-namino_bianco.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
-namino_bianco.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
-namino_bianco.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
-namino_bianco.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
-namino_bianco.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
-namino_bianco.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
 
 namino_bianco.menu.CPUFreq.240=240MHz (WiFi)
 namino_bianco.menu.CPUFreq.240.build.f_cpu=240000000L

diff --git a/variants/namino_arancio/pins_arduino.h b/variants/namino_arancio/pins_arduino.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2023 Namino Team, version: 1.0.19 @ 2023-07-24
+// Copyright (c) 2023 Namino Team, version: 1.0.20 @ 2023-10-06
 //
 //
 #ifndef Pins_Arduino_h
@@ -13,13 +13,6 @@
 
 #define NAMINO_ARANCIO_BOARD
 
-#define NUM_DIGITAL_PINS            SOC_GPIO_PIN_COUNT    // GPIO 0..48
-#define NUM_ANALOG_INPUTS           20                    // GPIO 1..20
-#define EXTERNAL_NUM_INTERRUPTS     NUM_DIGITAL_PINS      // All GPIOs
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
-#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
-
 /* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
 static const uint8_t GPIO4       = 4;
 static const uint8_t GPIO5       = 5;

diff --git a/variants/namino_bianco/pins_arduino.h b/variants/namino_bianco/pins_arduino.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2023 Namino Team, bianco version: 1.0.0 @ 2023-10-04
+// Copyright (c) 2023 Namino Team, bianco version: 1.0.1 @ 2023-10-06
 //
 //
 #ifndef Pins_Arduino_h
@@ -13,13 +13,6 @@
 
 #define NAMINO_BIANCO_BOARD
 
-#define NUM_DIGITAL_PINS            SOC_GPIO_PIN_COUNT    // GPIO 0..48
-#define NUM_ANALOG_INPUTS           20                    // GPIO 1..20
-#define EXTERNAL_NUM_INTERRUPTS     NUM_DIGITAL_PINS      // All GPIOs
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
-#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
-
 /* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
 static const uint8_t GPIO4       = 4;
 static const uint8_t GPIO5       = 5;

diff --git a/variants/namino_rosso/pins_arduino.h b/variants/namino_rosso/pins_arduino.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2023 Namino Team, version: 1.0.19 @ 2023-07-24
+// Copyright (c) 2023 Namino Team, version: 1.0.20 @ 2023-10-06
 //
 //
 #ifndef Pins_Arduino_h
@@ -13,13 +13,6 @@
 
 #define NAMINO_ROSSO_BOARD
 
-#define NUM_DIGITAL_PINS            SOC_GPIO_PIN_COUNT    // GPIO 0..48
-#define NUM_ANALOG_INPUTS           20                    // GPIO 1..20
-#define EXTERNAL_NUM_INTERRUPTS     NUM_DIGITAL_PINS      // All GPIOs
-#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
-#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):NOT_AN_INTERRUPT)
-#define digitalPinHasPWM(p)         (p < NUM_DIGITAL_PINS)
-
 /* Begin Pins on ESP32-S3-WROOM-1U-N4R8 */
 static const uint8_t GPIO4       = 4;
 static const uint8_t GPIO5       = 5;