andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into CCRX_Port

Browse Source 
# Conflicts:
#	src/portable/renesas/usba/dcd_usba.c
#	src/tusb_option.h
This commit is contained in:
Wini-Buh
2021-06-29 00:19:30 +02:00
parent 970da35fb3 6e939de9d6
commit cb0f1d98db
50 changed files with 1196 additions and 885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tusb_option.h
View File

@@ -113,7 +113,11 @@
// Renesas RX
#define OPT_MCU_RX63X 1400 ///< Renesas RX63N/631
<<<<<<< HEAD
#define OPT_MCU_RX72N 1401 ///< Renesas RX72N
=======
#define OPT_MCU_RX65X 1401 ///< Renesas RX65N/RX651
>>>>>>> origin/master
// Mind Motion
#define OPT_MCU_MM32F327X 1500 ///< Mind Motion MM32F327