Skip to content

Commit b9455f2

Browse files
theotherjimmytheotherjimmy
authored
Merge pull request #3988 from Ingramz/nucleo_f446re_usb
Enable USB capabilities on NUCLEO_F446RE
2 parents 4980276 + 16a1693 commit b9455f2

File tree

4 files changed

+85
-44
lines changed

4 files changed

+85
-44
lines changed

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F446xE/TARGET_NUCLEO_F446RE/USBHALHost_STM_TARGET.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* Copyright (c) 2016 mbed.org, MIT License
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
4+
* and associated documentation files (the "Software"), to deal in the Software without
5+
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
6+
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
7+
* Software is furnished to do so, subject to the following conditions:
8+
*
9+
* The above copyright notice and this permission notice shall be included in all copies or
10+
* substantial portions of the Software.
11+
*
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
13+
* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
15+
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
*/
18+
#include "USBHALHost_STM_144_64pins.h"

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F446xE/TARGET_NUCLEO_F446RE/USBHAL_STM_TARGET.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* Copyright (c) 2016 mbed.org, MIT License
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
4+
* and associated documentation files (the "Software"), to deal in the Software without
5+
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
6+
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
7+
* Software is furnished to do so, subject to the following conditions:
8+
*
9+
* The above copyright notice and this permission notice shall be included in all copies or
10+
* substantial portions of the Software.
11+
*
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
13+
* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
15+
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
*/
18+
#include "USBHAL_STM_144_64pins.h"

‎targets/targets.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@
622622
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG"],
623623
"features": ["LWIP"],
624624
"release_versions": ["2", "5"],
625-
"device_name" : "MK66FN2M0xxx18"
625+
"device_name": "MK66FN2M0xxx18"
626626
},
627627
"K82F": {
628628
"supported_form_factors": ["ARDUINO"],
@@ -635,7 +635,7 @@
635635
"detect_code": ["0217"],
636636
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
637637
"release_versions": ["2", "5"],
638-
"device_name" : "MK82FN256xxx15"
638+
"device_name": "MK82FN256xxx15"
639639
},
640640
"NUCLEO_F030R8": {
641641
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -743,7 +743,7 @@
743743
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
744744
"features": ["LWIP"],
745745
"release_versions": ["2", "5"],
746-
"device_name" : "STM32F207ZG"
746+
"device_name": "STM32F207ZG"
747747
},
748748
"NUCLEO_F302R8": {
749749
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -892,7 +892,7 @@
892892
"detect_code": ["0796"],
893893
"features": ["LWIP"],
894894
"release_versions": ["2", "5"],
895-
"device_name" : "STM32F429ZI",
895+
"device_name": "STM32F429ZI",
896896
"bootloader_supported": true
897897
},
898898
"NUCLEO_F439ZI": {
@@ -908,7 +908,7 @@
908908
"detect_code": ["0797"],
909909
"features": ["LWIP"],
910910
"release_versions": ["2", "5"],
911-
"device_name" : "STM32F439ZI"
911+
"device_name": "STM32F439ZI"
912912
},
913913
"NUCLEO_F446RE": {
914914
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -918,7 +918,7 @@
918918
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
919919
"inherits": ["Target"],
920920
"detect_code": ["0777"],
921-
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2"],
921+
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2", "USB_STM_HAL", "USBHOST_OTHER"],
922922
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
923923
"release_versions": ["2", "5"],
924924
"device_name": "STM32F446RE"
@@ -931,10 +931,10 @@
931931
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
932932
"inherits": ["Target"],
933933
"detect_code": ["0778"],
934-
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2", "USB_STM_HAL", "USBHOST_OTHER"],
934+
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2", "USB_STM_HAL", "USBHOST_OTHER"],
935935
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
936936
"release_versions": ["2", "5"],
937-
"device_name" : "STM32F446ZE"
937+
"device_name": "STM32F446ZE"
938938
},
939939
"B96B_F446VE": {
940940
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -988,7 +988,7 @@
988988
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"],
989989
"features": ["LWIP"],
990990
"release_versions": ["2", "5"],
991-
"device_name" : "STM32F767ZI"
991+
"device_name": "STM32F767ZI"
992992
},
993993
"NUCLEO_L011K4": {
994994
"inherits": ["Target"],
@@ -1064,7 +1064,7 @@
10641064
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2"],
10651065
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "CAN", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"],
10661066
"release_versions": ["2", "5"],
1067-
"device_name" : "STM32L432KC"
1067+
"device_name": "STM32L432KC"
10681068
},
10691069
"NUCLEO_L476RG": {
10701070
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -1111,7 +1111,6 @@
11111111
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
11121112
"program_cycle_s": 2,
11131113
"extra_labels": ["STM", "STM32F4", "STM32F407", "STM32F407xG", "STM32F407VG"],
1114-
"macros": ["LSI_VALUE=32000"],
11151114
"inherits": ["Target"],
11161115
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2"],
11171116
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
@@ -2498,7 +2497,7 @@
24982497
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
24992498
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH"],
25002499
"release_versions": ["2"],
2501-
"device_name" : "ATSAMD21J18A"
2500+
"device_name": "ATSAMD21J18A"
25022501
},
25032502
"SAMD21G18A": {
25042503
"inherits": ["Target"],

‎tools/build_travis.py

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
{ "target": "NUCLEO_L031K6", "toolchains": "GCC_ARM", "libs": ["dsp"] },
6262
{ "target": "NUCLEO_L073RZ", "toolchains": "GCC_ARM", "libs": ["dsp"] },
6363
{ "target": "NUCLEO_F429ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
64-
{ "target": "NUCLEO_F446RE", "toolchains": "GCC_ARM", "libs": ["dsp"] },
64+
{ "target": "NUCLEO_F446RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
6565
{ "target": "NUCLEO_F446ZE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
66-
{ "target": "NUCLEO_F746ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb" ] },
66+
{ "target": "NUCLEO_F746ZG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
6767
{ "target": "NUCLEO_F767ZI", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
6868

6969
{ "target": "MOTE_L152RC", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
@@ -127,7 +127,7 @@
127127
{ "target": "SAMD21G18A", "toolchains": "GCC_ARM", "libs": ["dsp"] },
128128
{ "target": "SAML21J18A", "toolchains": "GCC_ARM", "libs": ["dsp"] },
129129
{ "target": "DISCO_L476VG", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
130-
130+
131131
{ "target": "NUMAKER_PFM_NUC472", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
132132
{ "target": "NUMAKER_PFM_M453", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
133133
)
@@ -165,109 +165,115 @@
165165
"usb" : ["USB_1", "USB_2" ,"USB_3"],
166166
}
167167
},
168+
{"target": "NUCLEO_F446RE",
169+
"toolchains": "GCC_ARM",
170+
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
171+
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
172+
"usb" : ["USB_1", "USB_2" ,"USB_3"],
173+
}
174+
},
168175
{"target": "NUCLEO_F446ZE",
169176
"toolchains": "GCC_ARM",
170177
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
171178
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
172179
"usb" : ["USB_1", "USB_2" ,"USB_3"],
173-
}
174-
},
180+
}
181+
},
175182
{"target": "NUCLEO_F401RE",
176183
"toolchains": "GCC_ARM",
177184
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
178185
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
179-
"usb" : ["USB_1", "USB_2" ,"USB_3"],
180-
}
181-
},
186+
"usb" : ["USB_1", "USB_2" ,"USB_3"],
187+
}
188+
},
182189
{"target": "NUCLEO_F411RE",
183190
"toolchains": "GCC_ARM",
184191
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
185192
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
186193
"usb" : ["USB_1", "USB_2" ,"USB_3"],
187-
}
188-
},
194+
}
195+
},
189196
{"target": "NUCLEO_F412ZG",
190197
"toolchains": "GCC_ARM",
191198
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
192199
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
193-
}
194-
},
200+
}
201+
},
195202
{"target": "NUCLEO_F429ZI",
196203
"toolchains": "GCC_ARM",
197204
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
198205
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
199206
"usb" : ["USB_1", "USB_2" ,"USB_3"],
200-
}
201-
},
207+
}
208+
},
202209
{"target": "NUCLEO_F207ZG",
203210
"toolchains": "GCC_ARM",
204211
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
205212
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
206213
"usb" : ["USB_1", "USB_2" ,"USB_3"],
207-
}
208-
},
214+
}
215+
},
209216
{"target": "NUCLEO_F746ZG",
210217
"toolchains": "GCC_ARM",
211218
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
212219
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
213220
"usb" : ["USB_1", "USB_2" ,"USB_3"],
214-
}
215-
},
221+
}
222+
},
216223
{"target": "NUCLEO_F767ZI",
217224
"toolchains": "GCC_ARM",
218225
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
219226
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
220227
"usb" : ["USB_1", "USB_2" ,"USB_3"],
221-
}
222-
},
228+
}
229+
},
223230
{"target": "NUCLEO_L476RG",
224231
"toolchains": "GCC_ARM",
225232
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
226233
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
227-
}
228-
},
234+
}
235+
},
229236
{"target": "DISCO_F429ZI",
230237
"toolchains": "GCC_ARM",
231238
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
232239
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
233-
}
234-
},
240+
}
241+
},
235242
{"target": "DISCO_F407VG",
236243
"toolchains": "GCC_ARM",
237244
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
238245
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
239246
"usb" : ["USB_1", "USB_2" ,"USB_3"],
240-
}
241-
},
247+
}
248+
},
242249
{"target": "NUCLEO_F303ZE",
243250
"toolchains": "GCC_ARM",
244251
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
245252
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
246253
"usb" : ["USB_1", "USB_2" ,"USB_3"],
247-
}
248-
},
254+
}
255+
},
249256
{"target": "DISCO_L476VG",
250257
"toolchains": "GCC_ARM",
251258
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
252259
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
253260
"usb" : ["USB_1", "USB_2" ,"USB_3"],
254-
}
255-
},
261+
}
262+
},
256263
{"target": "NUMAKER_PFM_NUC472",
257264
"toolchains": "GCC_ARM",
258265
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
259266
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
260267
"usb" : ["USB_1", "USB_2" ,"USB_3"],
261268
}
262269
},
263-
{"target": "NUMAKER_PFM_M453",
270+
{"target": "NUMAKER_PFM_M453",
264271
"toolchains": "GCC_ARM",
265272
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
266273
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
267274
"usb" : ["USB_1", "USB_2" ,"USB_3"],
268275
}
269276
}
270-
271277
]
272278

273279
################################################################################

0 commit comments

Comments
 (0)