Skip to content

Commit 44c1198

Browse files
UnexpectedMakerUnexpectedMaker
authored
Added UM FeatherS2 Neo to boards.txt and added appropriate variants. (espressif#5615)
1 parent 9eea85f commit 44c1198

File tree

2 files changed

+200
-7
lines changed

2 files changed

+200
-7
lines changed

‎boards.txt‎

Lines changed: 130 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ feathers2.build.variant=um_feathers2
993993
feathers2.build.board=FEATHERS2
994994

995995
feathers2.build.cdc_on_boot=1
996-
feathers2.build.msc_on_boot=1
996+
feathers2.build.msc_on_boot=0
997997
feathers2.build.dfu_on_boot=0
998998
feathers2.build.f_cpu=240000000L
999999
feathers2.build.flash_size=16MB
@@ -1008,10 +1008,10 @@ feathers2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
10081008
feathers2.menu.CDCOnBoot.default=Disabled
10091009
feathers2.menu.CDCOnBoot.default.build.cdc_on_boot=0
10101010

1011-
feathers2.menu.MSCOnBoot.msc=Enabled
1012-
feathers2.menu.MSCOnBoot.msc.build.msc_on_boot=1
10131011
feathers2.menu.MSCOnBoot.default=Disabled
10141012
feathers2.menu.MSCOnBoot.default.build.msc_on_boot=0
1013+
feathers2.menu.MSCOnBoot.msc=Enabled
1014+
feathers2.menu.MSCOnBoot.msc.build.msc_on_boot=1
10151015

10161016
feathers2.menu.DFUOnBoot.default=Disabled
10171017
feathers2.menu.DFUOnBoot.default.build.dfu_on_boot=0
@@ -1108,7 +1108,131 @@ feathers2.menu.DebugLevel.verbose=Verbose
11081108
feathers2.menu.DebugLevel.verbose.build.code_debug=5
11091109

11101110
##############################################################
1111+
feathers2neo.name=UM FeatherS2 Neo
1112+
feathers2neo.vid.0=0x303a
1113+
feathers2neo.pid.0=0x80B4
1114+
1115+
feathers2neo.upload.tool=esptool_py
1116+
feathers2neo.upload.maximum_size=1310720
1117+
feathers2neo.upload.maximum_data_size=327680
1118+
feathers2neo.upload.flags=
1119+
feathers2neo.upload.extra_flags=
1120+
feathers2neo.upload.use_1200bps_touch=true
1121+
feathers2neo.upload.wait_for_upload_port=true
1122+
1123+
feathers2neo.serial.disableDTR=false
1124+
feathers2neo.serial.disableRTS=false
1125+
1126+
feathers2neo.build.tarch=xtensa
1127+
feathers2neo.build.bootloader_addr=0x1000
1128+
feathers2neo.build.target=esp32s2
1129+
feathers2neo.build.mcu=esp32s2
1130+
feathers2neo.build.core=esp32
1131+
feathers2neo.build.variant=um_feathers2neo
1132+
feathers2neo.build.board=FEATHERS2NEO
1133+
1134+
feathers2neo.build.cdc_on_boot=1
1135+
feathers2neo.build.msc_on_boot=0
1136+
feathers2neo.build.dfu_on_boot=0
1137+
feathers2neo.build.f_cpu=240000000L
1138+
feathers2neo.build.flash_size=4MB
1139+
feathers2neo.build.flash_freq=80m
1140+
feathers2neo.build.flash_mode=dio
1141+
feathers2neo.build.boot=qio
1142+
feathers2neo.build.partitions=default
1143+
feathers2neo.build.defines=
1144+
1145+
feathers2neo.menu.CDCOnBoot.cdc=Enabled
1146+
feathers2neo.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
1147+
feathers2neo.menu.CDCOnBoot.default=Disabled
1148+
feathers2neo.menu.CDCOnBoot.default.build.cdc_on_boot=0
1149+
1150+
feathers2neo.menu.MSCOnBoot.default=Disabled
1151+
feathers2neo.menu.MSCOnBoot.default.build.msc_on_boot=0
1152+
feathers2neo.menu.MSCOnBoot.msc=Enabled
1153+
feathers2neo.menu.MSCOnBoot.msc.build.msc_on_boot=1
1154+
1155+
feathers2neo.menu.DFUOnBoot.default=Disabled
1156+
feathers2neo.menu.DFUOnBoot.default.build.dfu_on_boot=0
1157+
feathers2neo.menu.DFUOnBoot.dfu=Enabled
1158+
feathers2neo.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
1159+
1160+
feathers2neo.menu.PSRAM.enabled=Enabled
1161+
feathers2neo.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
1162+
feathers2neo.menu.PSRAM.disabled=Disabled
1163+
feathers2neo.menu.PSRAM.disabled.build.defines=
1164+
1165+
feathers2neo.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
1166+
feathers2neo.menu.PartitionScheme.default.build.partitions=default
1167+
feathers2neo.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
1168+
feathers2neo.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
1169+
feathers2neo.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
1170+
feathers2neo.menu.PartitionScheme.minimal.build.partitions=minimal
1171+
feathers2neo.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
1172+
feathers2neo.menu.PartitionScheme.no_ota.build.partitions=no_ota
1173+
feathers2neo.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
1174+
feathers2neo.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
1175+
feathers2neo.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
1176+
feathers2neo.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
1177+
feathers2neo.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
1178+
feathers2neo.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
1179+
feathers2neo.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
1180+
feathers2neo.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
1181+
feathers2neo.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
1182+
feathers2neo.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
1183+
feathers2neo.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
1184+
feathers2neo.menu.PartitionScheme.huge_app.build.partitions=huge_app
1185+
feathers2neo.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
1186+
feathers2neo.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
1187+
feathers2neo.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
1188+
feathers2neo.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
1189+
1190+
feathers2neo.menu.CPUFreq.240=240MHz (WiFi)
1191+
feathers2neo.menu.CPUFreq.240.build.f_cpu=240000000L
1192+
feathers2neo.menu.CPUFreq.160=160MHz (WiFi)
1193+
feathers2neo.menu.CPUFreq.160.build.f_cpu=160000000L
1194+
feathers2neo.menu.CPUFreq.80=80MHz (WiFi)
1195+
feathers2neo.menu.CPUFreq.80.build.f_cpu=80000000L
1196+
feathers2neo.menu.CPUFreq.40=40MHz
1197+
feathers2neo.menu.CPUFreq.40.build.f_cpu=40000000L
1198+
feathers2neo.menu.CPUFreq.20=20MHz
1199+
feathers2neo.menu.CPUFreq.20.build.f_cpu=20000000L
1200+
feathers2neo.menu.CPUFreq.10=10MHz
1201+
feathers2neo.menu.CPUFreq.10.build.f_cpu=10000000L
1202+
1203+
feathers2neo.menu.FlashSize.4M=4MB (32Mb)
1204+
feathers2neo.menu.FlashSize.4M.build.flash_size=4MB
1205+
feathers2neo.menu.FlashSize.2M=2MB (16Mb)
1206+
feathers2neo.menu.FlashSize.2M.build.flash_size=2MB
1207+
feathers2neo.menu.FlashSize.2M.build.partitions=minimal
1208+
1209+
feathers2neo.menu.UploadSpeed.921600=921600
1210+
feathers2neo.menu.UploadSpeed.921600.upload.speed=921600
1211+
feathers2neo.menu.UploadSpeed.115200=115200
1212+
feathers2neo.menu.UploadSpeed.115200.upload.speed=115200
1213+
feathers2neo.menu.UploadSpeed.256000.windows=256000
1214+
feathers2neo.menu.UploadSpeed.256000.upload.speed=256000
1215+
feathers2neo.menu.UploadSpeed.230400.windows.upload.speed=256000
1216+
feathers2neo.menu.UploadSpeed.230400=230400
1217+
feathers2neo.menu.UploadSpeed.230400.upload.speed=230400
1218+
feathers2neo.menu.UploadSpeed.460800.linux=460800
1219+
feathers2neo.menu.UploadSpeed.460800.macosx=460800
1220+
feathers2neo.menu.UploadSpeed.460800.upload.speed=460800
1221+
1222+
feathers2neo.menu.DebugLevel.none=None
1223+
feathers2neo.menu.DebugLevel.none.build.code_debug=0
1224+
feathers2neo.menu.DebugLevel.error=Error
1225+
feathers2neo.menu.DebugLevel.error.build.code_debug=1
1226+
feathers2neo.menu.DebugLevel.warn=Warn
1227+
feathers2neo.menu.DebugLevel.warn.build.code_debug=2
1228+
feathers2neo.menu.DebugLevel.info=Info
1229+
feathers2neo.menu.DebugLevel.info.build.code_debug=3
1230+
feathers2neo.menu.DebugLevel.debug=Debug
1231+
feathers2neo.menu.DebugLevel.debug.build.code_debug=4
1232+
feathers2neo.menu.DebugLevel.verbose=Verbose
1233+
feathers2neo.menu.DebugLevel.verbose.build.code_debug=5
11111234

1235+
##############################################################
11121236
tinys2.name=UM TinyS2
11131237
tinys2.vid.0=0x303a
11141238
tinys2.pid.0=0x8001
@@ -1133,7 +1257,7 @@ tinys2.build.variant=um_tinys2
11331257
tinys2.build.board=TINYS2
11341258

11351259
tinys2.build.cdc_on_boot=1
1136-
tinys2.build.msc_on_boot=1
1260+
tinys2.build.msc_on_boot=0
11371261
tinys2.build.dfu_on_boot=0
11381262
tinys2.build.f_cpu=240000000L
11391263
tinys2.build.flash_size=4MB
@@ -1148,10 +1272,10 @@ tinys2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
11481272
tinys2.menu.CDCOnBoot.default=Disabled
11491273
tinys2.menu.CDCOnBoot.default.build.cdc_on_boot=0
11501274

1151-
tinys2.menu.MSCOnBoot.msc=Enabled
1152-
tinys2.menu.MSCOnBoot.msc.build.msc_on_boot=1
11531275
tinys2.menu.MSCOnBoot.default=Disabled
11541276
tinys2.menu.MSCOnBoot.default.build.msc_on_boot=0
1277+
tinys2.menu.MSCOnBoot.msc=Enabled
1278+
tinys2.menu.MSCOnBoot.msc.build.msc_on_boot=1
11551279

11561280
tinys2.menu.DFUOnBoot.default=Disabled
11571281
tinys2.menu.DFUOnBoot.default.build.dfu_on_boot=0
@@ -1220,7 +1344,6 @@ tinys2.menu.UploadSpeed.460800.linux=460800
12201344
tinys2.menu.UploadSpeed.460800.macosx=460800
12211345
tinys2.menu.UploadSpeed.460800.upload.speed=460800
12221346

1223-
12241347
tinys2.menu.DebugLevel.none=None
12251348
tinys2.menu.DebugLevel.none.build.code_debug=0
12261349
tinys2.menu.DebugLevel.error=Error

‎variants/um_feathers2neo/pins_arduino.h‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define USB_VID 0x239A
7+
#define USB_PID 0x80B4
8+
#define USB_MANUFACTURER "Unexpected Maker"
9+
#define USB_PRODUCT "FeatherS2 Neo"
10+
#define USB_SERIAL ""
11+
12+
#define EXTERNAL_NUM_INTERRUPTS 46
13+
#define NUM_DIGITAL_PINS 22
14+
#define NUM_ANALOG_INPUTS 11
15+
16+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
17+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
18+
#define digitalPinHasPWM(p) (p < 46)
19+
20+
static const uint8_t TX = 43;
21+
static const uint8_t RX = 44;
22+
23+
static const uint8_t SDA = 8;
24+
static const uint8_t SCL = 9;
25+
26+
static const uint8_t SS = 34;
27+
static const uint8_t MOSI = 35;
28+
static const uint8_t MISO = 37;
29+
static const uint8_t SDO = 35;
30+
static const uint8_t SDI = 37;
31+
static const uint8_t SCK = 36;
32+
33+
static const uint8_t A0 = 17;
34+
static const uint8_t A1 = 18;
35+
static const uint8_t A2 = 14;
36+
static const uint8_t A3 = 12;
37+
static const uint8_t A4 = 6;
38+
static const uint8_t A5 = 5;
39+
static const uint8_t A6 = 1;
40+
static const uint8_t A7 = 3;
41+
static const uint8_t A8 = 7;
42+
static const uint8_t A9 = 10;
43+
static const uint8_t A10 = 11;
44+
45+
46+
static const uint8_t T1 = 1;
47+
static const uint8_t T3 = 3;
48+
static const uint8_t T5 = 5;
49+
static const uint8_t T6 = 6;
50+
static const uint8_t T7 = 7;
51+
static const uint8_t T8 = 8;
52+
static const uint8_t T9 = 9;
53+
static const uint8_t T10 = 10;
54+
static const uint8_t T11 = 11;
55+
static const uint8_t T12 = 12;
56+
static const uint8_t T14 = 14;
57+
58+
static const uint8_t DAC1 = 17;
59+
static const uint8_t DAC2 = 18;
60+
61+
static const uint8_t NEOPIXEL_MATRIX_DATA = 21;
62+
static const uint8_t NEOPIXEL_MATRIX_PWR = 4;
63+
64+
static const uint8_t NEOPIXEL_DATA = 40;
65+
static const uint8_t NEOPIXEL_PWR = 39;
66+
67+
static const uint8_t VBAT_SENSE = 2;
68+
static const uint8_t VBUS_SENSE = 34;
69+
70+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)