Skip to content

Commit 03b2afb

Browse files
facchinmfacchinm
committed
Cleanup fqbns and user facing names
1 parent 9afc9c2 commit 03b2afb

File tree

5 files changed

+140
-134
lines changed

5 files changed

+140
-134
lines changed

‎boards.txt

Lines changed: 129 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,140 @@
11
##############################################################
22

3-
portenta_h33.name=Arduino Portenta C33
4-
portenta_h33.build.core=arduino
5-
portenta_h33.build.crossprefix=arm-none-eabi-
6-
portenta_h33.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
7-
8-
portenta_h33.build.variant=PORTENTA_H33
9-
portenta_h33.build.mcu=cortex-m33
10-
portenta_h33.build.architecture=cortex-m33
11-
portenta_h33.build.fpu=-mfpu=fpv5-sp-d16
12-
portenta_h33.build.float-abi=-mfloat-abi=hard
13-
14-
portenta_h33.build.board=PORTENTA_H33
15-
portenta_h33.build.defines=-DF_CPU=200000000
16-
portenta_h33.vid.0=0x2341
17-
portenta_h33.pid.0=0x0068
18-
portenta_h33.vid.1=0x2341
19-
portenta_h33.pid.1=0x0368
20-
portenta_h33.upload_port.0.vid=0x2341
21-
portenta_h33.upload_port.0.pid=0x0068
22-
portenta_h33.upload_port.1.vid=0x2341
23-
portenta_h33.upload_port.1.pid=0x0368
24-
25-
portenta_h33.compiler.fsp.defines={build.variant.path}/defines.txt
26-
portenta_h33.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
27-
portenta_h33.compiler.fsp.cflags=-mthumb "@{compiler.fsp.defines}" -DLWIP_DNS=1
28-
portenta_h33.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}" -DLWIP_DNS=1
29-
portenta_h33.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
30-
portenta_h33.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
31-
portenta_h33.compiler.fsp.includes={build.variant.path}/includes.txt
32-
portenta_h33.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
33-
portenta_h33.compiler.fsp="{build.variant.path}/libs/libfsp.a"
34-
35-
portenta_h33.upload.tool=dfu-util
36-
portenta_h33.upload.tool.default=dfu-util
37-
portenta_h33.upload.protocol=
38-
portenta_h33.upload.transport=
39-
portenta_h33.upload.vid=0x2341
40-
portenta_h33.upload.pid=0x0368
41-
portenta_h33.upload.address=0x00010000
42-
portenta_h33.upload.interface=0
43-
portenta_h33.upload.use_1200bps_touch=false
44-
portenta_h33.upload.wait_for_upload_port=false
45-
portenta_h33.upload.native_usb=true
46-
portenta_h33.upload.maximum_size=2097152
47-
portenta_h33.upload.maximum_data_size=523624
3+
portenta_c33.name=Arduino Portenta C33
4+
portenta_c33.build.core=arduino
5+
portenta_c33.build.crossprefix=arm-none-eabi-
6+
portenta_c33.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
7+
8+
portenta_c33.build.variant=PORTENTA_H33
9+
portenta_c33.build.mcu=cortex-m33
10+
portenta_c33.build.architecture=cortex-m33
11+
portenta_c33.build.fpu=-mfpu=fpv5-sp-d16
12+
portenta_c33.build.float-abi=-mfloat-abi=hard
13+
14+
portenta_c33.build.board=PORTENTA_H33
15+
portenta_c33.build.defines=-DF_CPU=200000000
16+
portenta_c33.vid.0=0x2341
17+
portenta_c33.pid.0=0x0068
18+
portenta_c33.vid.1=0x2341
19+
portenta_c33.pid.1=0x0368
20+
portenta_c33.upload_port.0.vid=0x2341
21+
portenta_c33.upload_port.0.pid=0x0068
22+
portenta_c33.upload_port.1.vid=0x2341
23+
portenta_c33.upload_port.1.pid=0x0368
24+
25+
portenta_c33.compiler.fsp.defines={build.variant.path}/defines.txt
26+
portenta_c33.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
27+
portenta_c33.compiler.fsp.cflags=-mthumb "@{compiler.fsp.defines}" -DLWIP_DNS=1
28+
portenta_c33.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}" -DLWIP_DNS=1
29+
portenta_c33.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
30+
portenta_c33.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
31+
portenta_c33.compiler.fsp.includes={build.variant.path}/includes.txt
32+
portenta_c33.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
33+
portenta_c33.compiler.fsp="{build.variant.path}/libs/libfsp.a"
34+
35+
portenta_c33.upload.tool=dfu-util
36+
portenta_c33.upload.tool.default=dfu-util
37+
portenta_c33.upload.protocol=
38+
portenta_c33.upload.transport=
39+
portenta_c33.upload.vid=0x2341
40+
portenta_c33.upload.pid=0x0368
41+
portenta_c33.upload.address=0x00010000
42+
portenta_c33.upload.interface=0
43+
portenta_c33.upload.use_1200bps_touch=false
44+
portenta_c33.upload.wait_for_upload_port=false
45+
portenta_c33.upload.native_usb=true
46+
portenta_c33.upload.maximum_size=2097152
47+
portenta_c33.upload.maximum_data_size=523624
4848

4949
##############################################################
5050

51-
santiago.name=Arduino Uno R4 Minima
52-
santiago.build.core=arduino
53-
santiago.build.crossprefix=arm-none-eabi-
54-
santiago.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
55-
56-
santiago.build.variant=SANTIAGO
57-
santiago.build.mcu=cortex-m4
58-
santiago.build.architecture=cortex-m4
59-
santiago.build.fpu=-mfpu=fpv5-sp-d16
60-
santiago.build.float-abi=-mfloat-abi=hard
61-
62-
santiago.build.board=SANTIAGO
63-
santiago.build.defines=-DF_CPU=48000000
64-
santiago.vid.0=0x2341
65-
santiago.pid.0=0x0069
66-
santiago.vid.1=0x2341
67-
santiago.pid.1=0x0369
68-
santiago.upload_port.0.vid=0x2341
69-
santiago.upload_port.0.pid=0x0069
70-
santiago.upload_port.1.vid=0x2341
71-
santiago.upload_port.1.pid=0x0369
72-
73-
santiago.compiler.fsp.defines={build.variant.path}/defines.txt
74-
santiago.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
75-
santiago.compiler.fsp.cflags=-mthumb "@{compiler.fsp.defines}"
76-
santiago.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
77-
santiago.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
78-
santiago.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
79-
santiago.compiler.fsp.includes={build.variant.path}/includes.txt
80-
santiago.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
81-
santiago.compiler.fsp="{build.variant.path}/libs/libfsp.a"
82-
83-
santiago.upload.tool=dfu-util
84-
santiago.upload.tool.default=dfu-util
85-
santiago.upload.protocol=
86-
santiago.upload.transport=
87-
santiago.upload.vid=0x2341
88-
santiago.upload.pid=0x0369
89-
santiago.upload.address=0x00010000
90-
santiago.upload.interface=0
91-
santiago.upload.use_1200bps_touch=false
92-
santiago.upload.wait_for_upload_port=false
93-
santiago.upload.native_usb=true
94-
santiago.upload.maximum_size=262144
95-
santiago.upload.maximum_data_size=32768
51+
minima.name=Arduino Uno R4 Minima
52+
minima.build.core=arduino
53+
minima.build.crossprefix=arm-none-eabi-
54+
minima.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
55+
56+
minima.build.variant=SANTIAGO
57+
minima.build.mcu=cortex-m4
58+
minima.build.architecture=cortex-m4
59+
minima.build.fpu=-mfpu=fpv5-sp-d16
60+
minima.build.float-abi=-mfloat-abi=hard
61+
62+
minima.build.board=SANTIAGO
63+
minima.build.defines=-DF_CPU=48000000
64+
minima.vid.0=0x2341
65+
minima.pid.0=0x0069
66+
minima.vid.1=0x2341
67+
minima.pid.1=0x0369
68+
minima.upload_port.0.vid=0x2341
69+
minima.upload_port.0.pid=0x0069
70+
minima.upload_port.1.vid=0x2341
71+
minima.upload_port.1.pid=0x0369
72+
73+
minima.compiler.fsp.defines={build.variant.path}/defines.txt
74+
minima.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
75+
minima.compiler.fsp.cflags=-mthumb "@{compiler.fsp.defines}"
76+
minima.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
77+
minima.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
78+
minima.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
79+
minima.compiler.fsp.includes={build.variant.path}/includes.txt
80+
minima.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
81+
minima.compiler.fsp="{build.variant.path}/libs/libfsp.a"
82+
83+
minima.upload.tool=dfu-util
84+
minima.upload.tool.default=dfu-util
85+
minima.upload.protocol=
86+
minima.upload.transport=
87+
minima.upload.vid=0x2341
88+
minima.upload.pid=0x0369
89+
minima.upload.address=0x00010000
90+
minima.upload.interface=0
91+
minima.upload.use_1200bps_touch=false
92+
minima.upload.wait_for_upload_port=false
93+
minima.upload.native_usb=true
94+
minima.upload.maximum_size=262144
95+
minima.upload.maximum_data_size=32768
9696

9797
##############################################################
9898

99-
composta.name=Arduino Uno R4 WiFi
100-
composta.build.core=arduino
101-
composta.build.crossprefix=arm-none-eabi-
102-
composta.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
103-
104-
composta.build.variant=SANTIAGO_COMPOSTA
105-
composta.build.mcu=cortex-m4
106-
composta.build.architecture=cortex-m4
107-
composta.build.fpu=-mfpu=fpv5-sp-d16
108-
composta.build.float-abi=-mfloat-abi=hard
109-
110-
composta.build.board=SANTIAGO_COMPOSTA
111-
composta.build.defines=-DF_CPU=48000000 -DNO_USB -DBACKTRACE_SUPPORT
112-
composta.vid.0=0x2341
113-
composta.pid.0=0x1002
114-
composta.upload_port.0.vid=0x2341
115-
composta.upload_port.0.pid=0x1002
116-
117-
composta.compiler.fsp.defines={build.variant.path}/defines.txt
118-
composta.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
119-
composta.compiler.fsp.cflags=-mthumb "@{compiler.fsp.defines}"
120-
composta.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
121-
composta.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
122-
composta.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
123-
composta.compiler.fsp.includes={build.variant.path}/includes.txt
124-
composta.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
125-
composta.compiler.fsp="{build.variant.path}/libs/libfsp.a"
126-
127-
composta.upload.tool=bossac
128-
composta.upload.tool.default=bossac
129-
composta.upload.protocol=sam-ba
130-
composta.upload.transport=
131-
composta.upload.vid=0x2341
132-
composta.upload.pid=0x1002
133-
composta.upload.use_1200bps_touch=true
134-
composta.upload.wait_for_upload_port=false
135-
composta.upload.native_usb=true
136-
composta.upload.maximum_size=262144
137-
composta.upload.maximum_data_size=32768
99+
unor4wifi.name=Arduino Uno R4 WiFi
100+
unor4wifi.build.core=arduino
101+
unor4wifi.build.crossprefix=arm-none-eabi-
102+
unor4wifi.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
103+
104+
unor4wifi.build.variant=SANTIAGO_COMPOSTA
105+
unor4wifi.build.mcu=cortex-m4
106+
unor4wifi.build.architecture=cortex-m4
107+
unor4wifi.build.fpu=-mfpu=fpv5-sp-d16
108+
unor4wifi.build.float-abi=-mfloat-abi=hard
109+
110+
unor4wifi.build.board=SANTIAGO_COMPOSTA
111+
unor4wifi.build.defines=-DF_CPU=48000000 -DNO_USB -DBACKTRACE_SUPPORT
112+
unor4wifi.vid.0=0x2341
113+
unor4wifi.pid.0=0x1002
114+
unor4wifi.upload_port.0.vid=0x2341
115+
unor4wifi.upload_port.0.pid=0x1002
116+
117+
unor4wifi.compiler.fsp.defines={build.variant.path}/defines.txt
118+
unor4wifi.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
119+
unor4wifi.compiler.fsp.cflags=-mthumb "@{compiler.fsp.defines}"
120+
unor4wifi.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
121+
unor4wifi.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
122+
unor4wifi.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
123+
unor4wifi.compiler.fsp.includes={build.variant.path}/includes.txt
124+
unor4wifi.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
125+
unor4wifi.compiler.fsp="{build.variant.path}/libs/libfsp.a"
126+
127+
unor4wifi.upload.tool=bossac
128+
unor4wifi.upload.tool.default=bossac
129+
unor4wifi.upload.protocol=sam-ba
130+
unor4wifi.upload.transport=
131+
unor4wifi.upload.vid=0x2341
132+
unor4wifi.upload.pid=0x1002
133+
unor4wifi.upload.use_1200bps_touch=true
134+
unor4wifi.upload.wait_for_upload_port=false
135+
unor4wifi.upload.native_usb=true
136+
unor4wifi.upload.maximum_size=262144
137+
unor4wifi.upload.maximum_data_size=32768
138138

139139
##############################################################
140140

‎extras/package_index.json.template

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,16 @@
2323
},
2424
"boards": [
2525
{
26-
"name": "Arduino Santiago"
26+
"name": "Arduino UNO R4 Minima"
2727
},
2828
{
29-
"name": "Arduino Portenta H33"
29+
"name": "Arduino UNO R4 WiFi"
30+
},
31+
{
32+
"name": "Arduino Portenta C33"
33+
},
34+
{
35+
"name": "Arduino Science Kit R3 Audio Module"
3036
}
3137
],
3238
"toolsDependencies": [

‎variants/PORTENTA_H33/pins_arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static const uint8_t SS = PIN_SPI_CS;
154154

155155
#define USB_VID (0x2341)
156156
#define USB_PID (0x0068)
157-
#define USB_NAME "Portenta H33"
157+
#define USB_NAME "Portenta C33"
158158

159159
#define ARDUINO_FLASH_TYPE HP_FLASH
160160
#define FLASH_BASE_ADDRESS 0x08000000

‎variants/SANTIAGO/pins_arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static const uint8_t SS = PIN_SPI_CS;
146146

147147
#define USB_VID (0x2341)
148148
#define USB_PID (0x0069)
149-
#define USB_NAME "Santiago"
149+
#define USB_NAME "UNO R4 Minima"
150150

151151
/* EEPROM DEFINES */
152152

‎variants/SANTIAGO_COMPOSTA/pins_arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static const uint8_t SS = PIN_SPI_CS;
137137

138138
#define USB_VID (0x2341)
139139
#define USB_PID (0x0069)
140-
#define USB_NAME "Santiago"
140+
#define USB_NAME "UNO R4 WiFi"
141141

142142
/* EEPROM DEFINES */
143143

0 commit comments

Comments
 (0)