Skip to content

Commit 5fa0c20

Browse files
UnexpectedMakerUnexpectedMaker
authored
Added Unexpected Maker Reflow Master Pro (UM RMP) board (espressif#6630)
Fixed wrong SCK and MISO pins for TinyS2
1 parent adfaaec commit 5fa0c20

File tree

3 files changed

+205
-3
lines changed

3 files changed

+205
-3
lines changed

Diff for: ‎boards.txt

+124
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,131 @@ tinys2.menu.DebugLevel.verbose=Verbose
21282128
tinys2.menu.DebugLevel.verbose.build.code_debug=5
21292129

21302130
##############################################################
2131+
rmp.name=UM RMP
2132+
rmp.vid.0=0x303a
2133+
rmp.pid.0=0x80F6
2134+
2135+
rmp.upload.tool=esptool_py
2136+
rmp.upload.maximum_size=1310720
2137+
rmp.upload.maximum_data_size=327680
2138+
rmp.upload.flags=
2139+
rmp.upload.extra_flags=
2140+
rmp.upload.use_1200bps_touch=true
2141+
rmp.upload.wait_for_upload_port=true
2142+
2143+
rmp.serial.disableDTR=false
2144+
rmp.serial.disableRTS=false
2145+
2146+
rmp.build.tarch=xtensa
2147+
rmp.build.bootloader_addr=0x1000
2148+
rmp.build.target=esp32s2
2149+
rmp.build.mcu=esp32s2
2150+
rmp.build.core=esp32
2151+
rmp.build.variant=um_rmp
2152+
rmp.build.board=RMP
2153+
2154+
rmp.build.cdc_on_boot=1
2155+
rmp.build.msc_on_boot=0
2156+
rmp.build.dfu_on_boot=0
2157+
rmp.build.f_cpu=240000000L
2158+
rmp.build.flash_size=4MB
2159+
rmp.build.flash_freq=80m
2160+
rmp.build.flash_mode=dio
2161+
rmp.build.boot=qio
2162+
rmp.build.partitions=default
2163+
rmp.build.defines=
2164+
2165+
rmp.menu.CDCOnBoot.cdc=Enabled
2166+
rmp.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
2167+
rmp.menu.CDCOnBoot.default=Disabled
2168+
rmp.menu.CDCOnBoot.default.build.cdc_on_boot=0
2169+
2170+
rmp.menu.MSCOnBoot.default=Disabled
2171+
rmp.menu.MSCOnBoot.default.build.msc_on_boot=0
2172+
rmp.menu.MSCOnBoot.msc=Enabled
2173+
rmp.menu.MSCOnBoot.msc.build.msc_on_boot=1
2174+
2175+
rmp.menu.DFUOnBoot.default=Disabled
2176+
rmp.menu.DFUOnBoot.default.build.dfu_on_boot=0
2177+
rmp.menu.DFUOnBoot.dfu=Enabled
2178+
rmp.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
2179+
2180+
rmp.menu.PSRAM.enabled=Enabled
2181+
rmp.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
2182+
rmp.menu.PSRAM.disabled=Disabled
2183+
rmp.menu.PSRAM.disabled.build.defines=
2184+
2185+
rmp.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
2186+
rmp.menu.PartitionScheme.default.build.partitions=default
2187+
rmp.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
2188+
rmp.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
2189+
rmp.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
2190+
rmp.menu.PartitionScheme.minimal.build.partitions=minimal
2191+
rmp.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
2192+
rmp.menu.PartitionScheme.no_ota.build.partitions=no_ota
2193+
rmp.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
2194+
rmp.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
2195+
rmp.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
2196+
rmp.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
2197+
rmp.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
2198+
rmp.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
2199+
rmp.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
2200+
rmp.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
2201+
rmp.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
2202+
rmp.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
2203+
rmp.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
2204+
rmp.menu.PartitionScheme.huge_app.build.partitions=huge_app
2205+
rmp.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2206+
rmp.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
2207+
rmp.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2208+
rmp.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
2209+
2210+
rmp.menu.CPUFreq.240=240MHz (WiFi)
2211+
rmp.menu.CPUFreq.240.build.f_cpu=240000000L
2212+
rmp.menu.CPUFreq.160=160MHz (WiFi)
2213+
rmp.menu.CPUFreq.160.build.f_cpu=160000000L
2214+
rmp.menu.CPUFreq.80=80MHz (WiFi)
2215+
rmp.menu.CPUFreq.80.build.f_cpu=80000000L
2216+
rmp.menu.CPUFreq.40=40MHz
2217+
rmp.menu.CPUFreq.40.build.f_cpu=40000000L
2218+
rmp.menu.CPUFreq.20=20MHz
2219+
rmp.menu.CPUFreq.20.build.f_cpu=20000000L
2220+
rmp.menu.CPUFreq.10=10MHz
2221+
rmp.menu.CPUFreq.10.build.f_cpu=10000000L
2222+
2223+
rmp.menu.FlashSize.4M=4MB (32Mb)
2224+
rmp.menu.FlashSize.4M.build.flash_size=4MB
2225+
rmp.menu.FlashSize.2M=2MB (16Mb)
2226+
rmp.menu.FlashSize.2M.build.flash_size=2MB
2227+
rmp.menu.FlashSize.2M.build.partitions=minimal
2228+
2229+
rmp.menu.UploadSpeed.921600=921600
2230+
rmp.menu.UploadSpeed.921600.upload.speed=921600
2231+
rmp.menu.UploadSpeed.115200=115200
2232+
rmp.menu.UploadSpeed.115200.upload.speed=115200
2233+
rmp.menu.UploadSpeed.256000.windows=256000
2234+
rmp.menu.UploadSpeed.256000.upload.speed=256000
2235+
rmp.menu.UploadSpeed.230400.windows.upload.speed=256000
2236+
rmp.menu.UploadSpeed.230400=230400
2237+
rmp.menu.UploadSpeed.230400.upload.speed=230400
2238+
rmp.menu.UploadSpeed.460800.linux=460800
2239+
rmp.menu.UploadSpeed.460800.macosx=460800
2240+
rmp.menu.UploadSpeed.460800.upload.speed=460800
2241+
2242+
rmp.menu.DebugLevel.none=None
2243+
rmp.menu.DebugLevel.none.build.code_debug=0
2244+
rmp.menu.DebugLevel.error=Error
2245+
rmp.menu.DebugLevel.error.build.code_debug=1
2246+
rmp.menu.DebugLevel.warn=Warn
2247+
rmp.menu.DebugLevel.warn.build.code_debug=2
2248+
rmp.menu.DebugLevel.info=Info
2249+
rmp.menu.DebugLevel.info.build.code_debug=3
2250+
rmp.menu.DebugLevel.debug=Debug
2251+
rmp.menu.DebugLevel.debug.build.code_debug=4
2252+
rmp.menu.DebugLevel.verbose=Verbose
2253+
rmp.menu.DebugLevel.verbose.build.code_debug=5
21312254

2255+
##############################################################
21322256
tinys3.name=UM TinyS3
21332257
tinys3.vid.0=0x303a
21342258
tinys3.pid.0=0x80D0

Diff for: ‎variants/um_rmp/pins_arduino.h

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define USB_VID 0x303A
7+
#define USB_PID 0x8001
8+
#define USB_MANUFACTURER "Unexpected Maker"
9+
#define USB_PRODUCT "RM Pro"
10+
#define USB_SERIAL ""
11+
12+
#define EXTERNAL_NUM_INTERRUPTS 46
13+
#define NUM_DIGITAL_PINS 48
14+
#define NUM_ANALOG_INPUTS 20
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 = 14;
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 = 1;
34+
static const uint8_t A1 = 2;
35+
static const uint8_t A2 = 3;
36+
static const uint8_t A3 = 4;
37+
static const uint8_t A4 = 5;
38+
static const uint8_t A5 = 6;
39+
static const uint8_t A6 = 7;
40+
static const uint8_t A7 = 8;
41+
static const uint8_t A8 = 9;
42+
static const uint8_t A9 = 10;
43+
static const uint8_t A10 = 11;
44+
static const uint8_t A11 = 12;
45+
static const uint8_t A12 = 13;
46+
static const uint8_t A13 = 14;
47+
static const uint8_t A14 = 15;
48+
static const uint8_t A15 = 16;
49+
static const uint8_t A16 = 17;
50+
static const uint8_t A17 = 18;
51+
static const uint8_t A18 = 19;
52+
static const uint8_t A19 = 20;
53+
54+
static const uint8_t T1 = 1;
55+
static const uint8_t T2 = 2;
56+
static const uint8_t T3 = 3;
57+
static const uint8_t T4 = 4;
58+
static const uint8_t T5 = 5;
59+
static const uint8_t T6 = 6;
60+
static const uint8_t T7 = 7;
61+
static const uint8_t T8 = 8;
62+
static const uint8_t T9 = 9;
63+
static const uint8_t T10 = 10;
64+
static const uint8_t T11 = 11;
65+
static const uint8_t T12 = 12;
66+
static const uint8_t T13 = 13;
67+
static const uint8_t T14 = 14;
68+
69+
static const uint8_t DAC1 = 17;
70+
static const uint8_t DAC2 = 18;
71+
72+
static const uint8_t VBAT_SENSE = 3;
73+
static const uint8_t VBUS_SENSE = 21;
74+
75+
static const uint8_t RGB_DATA = 1;
76+
static const uint8_t RGB_PWR = 2;
77+
78+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/um_tinys2/pins_arduino.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ static const uint8_t SCL = 9;
2525

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

3333
static const uint8_t A0 = 1;
3434
static const uint8_t A1 = 2;

0 commit comments

Comments
 (0)