Skip to content

Commit eeb2556

Browse files
UnexpectedMakerUnexpectedMaker
committed
Removed ProS2 and added TinyS2 to boards.txt
1 parent 371f382 commit eeb2556

File tree

2 files changed

+119
-132
lines changed

2 files changed

+119
-132
lines changed

‎boards.txt

Lines changed: 108 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -801,128 +801,114 @@ feathers2.menu.DebugLevel.verbose=Verbose
801801
feathers2.menu.DebugLevel.verbose.build.code_debug=5
802802

803803
##############################################################
804-
pros2.name=UM ProS2
805-
pros2.vid.0=0x239A
806-
pros2.pid.0=0x80A9
807-
808-
pros2.upload.tool=esptool_py
809-
pros2.upload.maximum_size=1310720
810-
pros2.upload.maximum_data_size=327680
811-
pros2.upload.flags=
812-
pros2.upload.use_1200bps_touch=true
813-
pros2.upload.wait_for_upload_port=true
814-
815-
pros2.serial.disableDTR=false
816-
pros2.serial.disableRTS=false
817-
818-
pros2.build.mcu=esp32s2
819-
pros2.build.core=esp32
820-
pros2.build.variant=um_pros2
821-
pros2.build.board=PROS2
822-
823-
pros2.build.serial=1
824-
pros2.build.f_cpu=240000000L
825-
pros2.build.flash_size=16MB
826-
pros2.build.flash_freq=80m
827-
pros2.build.flash_mode=dio
828-
pros2.build.boot=qio
829-
pros2.build.partitions=fatflash
830-
pros2.build.defines=
831-
832-
pros2.menu.SerialMode.cdc=USB CDC
833-
pros2.menu.SerialMode.cdc.build.serial=1
834-
pros2.menu.SerialMode.default=UART0
835-
pros2.menu.SerialMode.default.build.serial=0
836-
837-
pros2.menu.PSRAM.enabled=Enabled
838-
pros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
839-
pros2.menu.PSRAM.disabled=Disabled
840-
pros2.menu.PSRAM.disabled.build.defines=
841-
842-
pros2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
843-
pros2.menu.PartitionScheme.fatflash.build.partitions=ffat
844-
pros2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
845-
pros2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
846-
pros2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
847-
pros2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
848-
pros2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
849-
pros2.menu.PartitionScheme.default.build.partitions=default
850-
pros2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
851-
pros2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
852-
pros2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
853-
pros2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
854-
pros2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
855-
pros2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
856-
pros2.menu.PartitionScheme.minimal.build.partitions=minimal
857-
pros2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
858-
pros2.menu.PartitionScheme.no_ota.build.partitions=no_ota
859-
pros2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
860-
pros2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
861-
pros2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
862-
pros2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
863-
pros2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
864-
pros2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
865-
pros2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
866-
pros2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
867-
pros2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
868-
pros2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
869-
pros2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
870-
pros2.menu.PartitionScheme.huge_app.build.partitions=huge_app
871-
pros2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
872-
pros2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
873-
pros2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
874-
pros2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
875-
876-
pros2.menu.CPUFreq.240=240MHz (WiFi)
877-
pros2.menu.CPUFreq.240.build.f_cpu=240000000L
878-
pros2.menu.CPUFreq.160=160MHz (WiFi)
879-
pros2.menu.CPUFreq.160.build.f_cpu=160000000L
880-
pros2.menu.CPUFreq.80=80MHz (WiFi)
881-
pros2.menu.CPUFreq.80.build.f_cpu=80000000L
882-
pros2.menu.CPUFreq.40=40MHz
883-
pros2.menu.CPUFreq.40.build.f_cpu=40000000L
884-
pros2.menu.CPUFreq.20=20MHz
885-
pros2.menu.CPUFreq.20.build.f_cpu=20000000L
886-
pros2.menu.CPUFreq.10=10MHz
887-
pros2.menu.CPUFreq.10.build.f_cpu=10000000L
888-
889-
pros2.menu.FlashSize.16M=16MB (128Mb)
890-
pros2.menu.FlashSize.16M.build.flash_size=16MB
891-
pros2.menu.FlashSize.4M=4MB (32Mb)
892-
pros2.menu.FlashSize.4M.build.flash_size=4MB
893-
pros2.menu.FlashSize.8M=8MB (64Mb)
894-
pros2.menu.FlashSize.8M.build.flash_size=8MB
895-
pros2.menu.FlashSize.8M.build.partitions=default_8MB
896-
pros2.menu.FlashSize.2M=2MB (16Mb)
897-
pros2.menu.FlashSize.2M.build.flash_size=2MB
898-
pros2.menu.FlashSize.2M.build.partitions=minimal
899-
900-
pros2.menu.UploadSpeed.921600=921600
901-
pros2.menu.UploadSpeed.921600.upload.speed=921600
902-
pros2.menu.UploadSpeed.115200=115200
903-
pros2.menu.UploadSpeed.115200.upload.speed=115200
904-
pros2.menu.UploadSpeed.256000.windows=256000
905-
pros2.menu.UploadSpeed.256000.upload.speed=256000
906-
pros2.menu.UploadSpeed.230400.windows.upload.speed=256000
907-
pros2.menu.UploadSpeed.230400=230400
908-
pros2.menu.UploadSpeed.230400.upload.speed=230400
909-
pros2.menu.UploadSpeed.460800.linux=460800
910-
pros2.menu.UploadSpeed.460800.macosx=460800
911-
pros2.menu.UploadSpeed.460800.upload.speed=460800
912-
913-
914-
pros2.menu.DebugLevel.none=None
915-
pros2.menu.DebugLevel.none.build.code_debug=0
916-
pros2.menu.DebugLevel.error=Error
917-
pros2.menu.DebugLevel.error.build.code_debug=1
918-
pros2.menu.DebugLevel.warn=Warn
919-
pros2.menu.DebugLevel.warn.build.code_debug=2
920-
pros2.menu.DebugLevel.info=Info
921-
pros2.menu.DebugLevel.info.build.code_debug=3
922-
pros2.menu.DebugLevel.debug=Debug
923-
pros2.menu.DebugLevel.debug.build.code_debug=4
924-
pros2.menu.DebugLevel.verbose=Verbose
925-
pros2.menu.DebugLevel.verbose.build.code_debug=5
804+
tinys2.name=UM TinyS2
805+
tinys2.vid.0=0x303a
806+
tinys2.pid.0=0x8001
807+
808+
tinys2.upload.tool=esptool_py
809+
tinys2.upload.maximum_size=1310720
810+
tinys2.upload.maximum_data_size=327680
811+
tinys2.upload.flags=
812+
tinys2.upload.use_1200bps_touch=true
813+
tinys2.upload.wait_for_upload_port=true
814+
815+
tinys2.serial.disableDTR=false
816+
tinys2.serial.disableRTS=false
817+
818+
tinys2.build.mcu=esp32s2
819+
tinys2.build.core=esp32
820+
tinys2.build.variant=um_tinys2
821+
tinys2.build.board=TINYS2
822+
823+
tinys2.build.serial=1
824+
tinys2.build.f_cpu=240000000L
825+
tinys2.build.flash_size=4MB
826+
tinys2.build.flash_freq=80m
827+
tinys2.build.flash_mode=dio
828+
tinys2.build.boot=qio
829+
tinys2.build.partitions=default
830+
tinys2.build.defines=
831+
832+
tinys2.menu.SerialMode.cdc=USB CDC
833+
tinys2.menu.SerialMode.cdc.build.serial=1
834+
tinys2.menu.SerialMode.default=UART0
835+
tinys2.menu.SerialMode.default.build.serial=0
836+
837+
tinys2.menu.PSRAM.enabled=Enabled
838+
tinys2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
839+
tinys2.menu.PSRAM.disabled=Disabled
840+
tinys2.menu.PSRAM.disabled.build.defines=
841+
842+
tinys2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
843+
tinys2.menu.PartitionScheme.default.build.partitions=default
844+
tinys2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
845+
tinys2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
846+
tinys2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
847+
tinys2.menu.PartitionScheme.minimal.build.partitions=minimal
848+
tinys2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
849+
tinys2.menu.PartitionScheme.no_ota.build.partitions=no_ota
850+
tinys2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
851+
tinys2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
852+
tinys2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
853+
tinys2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
854+
tinys2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
855+
tinys2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
856+
tinys2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
857+
tinys2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
858+
tinys2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
859+
tinys2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
860+
tinys2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
861+
tinys2.menu.PartitionScheme.huge_app.build.partitions=huge_app
862+
tinys2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
863+
tinys2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
864+
tinys2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
865+
tinys2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
866+
867+
tinys2.menu.CPUFreq.240=240MHz (WiFi)
868+
tinys2.menu.CPUFreq.240.build.f_cpu=240000000L
869+
tinys2.menu.CPUFreq.160=160MHz (WiFi)
870+
tinys2.menu.CPUFreq.160.build.f_cpu=160000000L
871+
tinys2.menu.CPUFreq.80=80MHz (WiFi)
872+
tinys2.menu.CPUFreq.80.build.f_cpu=80000000L
873+
tinys2.menu.CPUFreq.40=40MHz
874+
tinys2.menu.CPUFreq.40.build.f_cpu=40000000L
875+
tinys2.menu.CPUFreq.20=20MHz
876+
tinys2.menu.CPUFreq.20.build.f_cpu=20000000L
877+
tinys2.menu.CPUFreq.10=10MHz
878+
tinys2.menu.CPUFreq.10.build.f_cpu=10000000L
879+
880+
tinys2.menu.FlashSize.4M=4MB (32Mb)
881+
tinys2.menu.FlashSize.4M.build.flash_size=4MB
882+
tinys2.menu.FlashSize.2M=2MB (16Mb)
883+
tinys2.menu.FlashSize.2M.build.flash_size=2MB
884+
tinys2.menu.FlashSize.2M.build.partitions=minimal
885+
886+
tinys2.menu.UploadSpeed.921600=921600
887+
tinys2.menu.UploadSpeed.921600.upload.speed=921600
888+
tinys2.menu.UploadSpeed.115200=115200
889+
tinys2.menu.UploadSpeed.115200.upload.speed=115200
890+
tinys2.menu.UploadSpeed.256000.windows=256000
891+
tinys2.menu.UploadSpeed.256000.upload.speed=256000
892+
tinys2.menu.UploadSpeed.230400.windows.upload.speed=256000
893+
tinys2.menu.UploadSpeed.230400=230400
894+
tinys2.menu.UploadSpeed.230400.upload.speed=230400
895+
tinys2.menu.UploadSpeed.460800.linux=460800
896+
tinys2.menu.UploadSpeed.460800.macosx=460800
897+
tinys2.menu.UploadSpeed.460800.upload.speed=460800
898+
899+
900+
tinys2.menu.DebugLevel.none=None
901+
tinys2.menu.DebugLevel.none.build.code_debug=0
902+
tinys2.menu.DebugLevel.error=Error
903+
tinys2.menu.DebugLevel.error.build.code_debug=1
904+
tinys2.menu.DebugLevel.warn=Warn
905+
tinys2.menu.DebugLevel.warn.build.code_debug=2
906+
tinys2.menu.DebugLevel.info=Info
907+
tinys2.menu.DebugLevel.info.build.code_debug=3
908+
tinys2.menu.DebugLevel.debug=Debug
909+
tinys2.menu.DebugLevel.debug.build.code_debug=4
910+
tinys2.menu.DebugLevel.verbose=Verbose
911+
tinys2.menu.DebugLevel.verbose.build.code_debug=5
926912

927913
##############################################################
928914
S_ODI_Ultra.name=S.ODI Ultra v1

‎variants/um_pros2/pins_arduino.h renamed to ‎variants/um_tinys2/pins_arduino.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
#include <stdint.h>
55

6-
#define USB_VID 0x239A
7-
#define USB_PID 0x80A9
6+
#define USB_VID 0x303A
7+
#define USB_PID 0x8001
88
#define USB_MANUFACTURER "Unexpected Maker"
9-
#define USB_PRODUCT "ProS2"
9+
#define USB_PRODUCT "TinyS2"
1010
#define USB_SERIAL ""
1111

1212
#define EXTERNAL_NUM_INTERRUPTS 46
@@ -23,12 +23,12 @@ static const uint8_t RX = 44;
2323
static const uint8_t SDA = 8;
2424
static const uint8_t SCL = 9;
2525

26-
static const uint8_t SS = 34;
26+
static const uint8_t SS = 14;
2727
static const uint8_t MOSI = 35;
28-
static const uint8_t MISO = 37;
28+
static const uint8_t MISO = 36;
2929
static const uint8_t SDO = 35;
30-
static const uint8_t SDI = 37;
31-
static const uint8_t SCK = 36;
30+
static const uint8_t SDI = 36;
31+
static const uint8_t SCK = 37;
3232

3333
static const uint8_t A0 = 1;
3434
static const uint8_t A1 = 2;
@@ -69,9 +69,10 @@ static const uint8_t T14 = 14;
6969
static const uint8_t DAC1 = 17;
7070
static const uint8_t DAC2 = 18;
7171

72-
static const uint8_t LDO_2_POWER = 21;
72+
static const uint8_t VBAT_SENSE = 3;
73+
static const uint8_t VBUS_SENSE = 21;
7374

74-
static const uint8_t APA_DATA = 40;
75-
static const uint8_t APA_CLK = 45;
75+
static const uint8_t RGB_DATA = 1;
76+
static const uint8_t RGB_PWR = 2;
7677

7778
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)