Skip to content

Commit b14f4cc

Browse files
fpistmfpistm
authored
Merge branch 'master' into master
2 parents 448bc77 + b83969b commit b14f4cc

File tree

202 files changed

+12000
-9619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+12000
-9619
lines changed

‎License.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Note: most license information is available on top of each source file
1313
* system/Drivers/ subfolders include the STMicroelectronics HAL Drivers and CMSIS
1414
ST device.
1515

16-
[MCD-ST Liberty SW License](#mcd-st-liberty-sw-license) is used for:
16+
[Ultimate Liberty License](#Ultimate-Liberty-License) is used for:
1717
* system/Middlewares/STM32_USB_*_Library/ folders
1818

1919
[Apache License](#apache-license) is used for:
@@ -558,18 +558,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
558558
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
559559

560560
-------------------------------------------------------------------------------
561-
## MCD-ST Liberty SW License
561+
## Ultimate Liberty License
562562

563-
Licensed under MCD-ST Liberty SW License Agreement V2, (the "License"); You may
564-
not use this package except in compliance with the License. You may obtain a
565-
copy of the License at:
566-
567-
http://www.st.com/software_license_agreement_liberty_v2
568-
569-
Unless required by applicable law or agreed to in writing, software distributed
570-
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
571-
CONDITIONS OF ANY KIND, either express or implied. See the License for the
572-
specific language governing permissions and limitations under the License.
563+
This software component is licensed by ST under Ultimate Liberty license
564+
SLA0044, the "License"; You may not use this file except in compliance with
565+
the License. You may obtain a copy of the License at:
566+
http://www.st.com/SLA0044
573567

574568
-------------------------------------------------------------------------------
575569
## Apache License

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
102102

103103
* STM32F4
104104
* [ARMED V1](https://github.com/ktand/Armed)
105+
* DIYMROE STM32F407VGT
105106

106107
* STM32H7
107108
* [Nucleo H743ZI](https://www.st.com/en/evaluation-tools/nucleo-h743zi.html)

‎boards.txt

Lines changed: 87 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
menu.pnum=Board part number
44

55
menu.xserial=Serial interface
6-
menu.usb=USB interface
6+
menu.usb=USB interface (if available)
77

88
menu.opt=Optimize
99
menu.rtlib=C Runtime Library
@@ -17,10 +17,6 @@ menu.ram=RAM Size
1717
Nucleo_144.name=Nucleo-144
1818

1919
Nucleo_144.build.vid=0x0483
20-
Nucleo_144.build.pid=0x5711
21-
Nucleo_144.vid.0=0x0483
22-
Nucleo_144.pid.0=0x5711
23-
2420
Nucleo_144.build.core=arduino
2521
Nucleo_144.build.board=Nucleo_144
2622
Nucleo_144.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -138,10 +134,6 @@ Nucleo_144.menu.upload_method.STLink.upload.tool=stlink_upload
138134
Nucleo_64.name=Nucleo-64
139135

140136
Nucleo_64.build.vid=0x0483
141-
Nucleo_64.build.pid=0x5711
142-
Nucleo_64.vid.0=0x0483
143-
Nucleo_64.pid.0=0x5711
144-
145137
Nucleo_64.build.core=arduino
146138
Nucleo_64.build.board=Nucleo_64
147139
Nucleo_64.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -317,10 +309,6 @@ Nucleo_64.menu.upload_method.STLink.upload.tool=stlink_upload
317309
Nucleo_32.name=Nucleo-32
318310

319311
Nucleo_32.build.vid=0x0483
320-
Nucleo_32.build.pid=0x5711
321-
Nucleo_32.vid.0=0x0483
322-
Nucleo_32.pid.0=0x5711
323-
324312
Nucleo_32.build.core=arduino
325313
Nucleo_32.build.board=Nucleo_32
326314
Nucleo_32.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -391,10 +379,6 @@ Nucleo_32.menu.upload_method.STLink.upload.tool=stlink_upload
391379
Disco.name=Discovery
392380

393381
Disco.build.vid=0x0483
394-
Disco.build.pid=0x5711
395-
Disco.vid.0=0x0483
396-
Disco.pid.0=0x5711
397-
398382
Disco.build.core=arduino
399383
Disco.build.board=Disco
400384
Disco.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -523,11 +507,7 @@ GenF0.menu.upload_method.serialMethod.upload.tool=serial_upload
523507
# Generic F103
524508
GenF103.name=Generic STM32F103 series
525509

526-
GenF103.build.vid=0x1EAF
527-
GenF103.build.pid=0x0004
528-
GenF103.vid.0=0x1EAF
529-
GenF103.pid.0=0x0004
530-
510+
GenF103.build.vid=0x0483
531511
GenF103.build.core=arduino
532512
GenF103.build.board=GenF103
533513
GenF103.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -568,11 +548,7 @@ GenF103.menu.upload_method.bmpMethod.upload.tool=bmp_upload
568548

569549
GenF4.name=Generic STM32F4 series
570550

571-
GenF4.build.vid=0x1EAF
572-
GenF4.build.pid=0x0004
573-
GenF4.vid.0=0x1EAF
574-
GenF4.pid.0=0x0004
575-
551+
GenF4.build.vid=0x0483
576552
GenF4.build.core=arduino
577553
GenF4.build.board=GenF4
578554
GenF4.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -622,6 +598,19 @@ GenF4.menu.pnum.BLUE_F407VE_Mini.build.product_line=STM32F407xx
622598
GenF4.menu.pnum.BLUE_F407VE_Mini.build.variant=BLUE_F407VE_Mini
623599
GenF4.menu.pnum.BLUE_F407VE_Mini.build.cmsis_lib_gcc=arm_cortexM4l_math
624600

601+
# DIYMROE STM32F407VGT board
602+
# Support: Serial1 (USART1 on PA10, PA9)
603+
# Default SPI: SPI (SPI1 on PB3,PB4,PB5)
604+
GenF4.menu.pnum.DIYMROE_F407VGT=DIYMROE STM32F407VGT
605+
GenF4.menu.pnum.DIYMROE_F407VGT.upload.maximum_size=1048576
606+
GenF4.menu.pnum.DIYMROE_F407VGT.upload.maximum_data_size=131072
607+
GenF4.menu.pnum.DIYMROE_F407VGT.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
608+
GenF4.menu.pnum.DIYMROE_F407VGT.build.board=DIYMROE_F407VGT
609+
GenF4.menu.pnum.DIYMROE_F407VGT.build.series=STM32F4xx
610+
GenF4.menu.pnum.DIYMROE_F407VGT.build.product_line=STM32F407xx
611+
GenF4.menu.pnum.DIYMROE_F407VGT.build.variant=DIYMROE_F407VGT
612+
GenF4.menu.pnum.DIYMROE_F407VGT.build.cmsis_lib_gcc=arm_cortexM4l_math
613+
625614
# Upload menu
626615
GenF4.menu.upload_method.STLink=STLink
627616
GenF4.menu.upload_method.STLink.upload.protocol=STLink
@@ -639,11 +628,7 @@ GenF4.menu.upload_method.bmpMethod.upload.tool=bmp_upload
639628
# Maple
640629
Maple.name=Maple series
641630

642-
Maple.build.vid=0x1EAF
643-
Maple.build.pid=0x0004
644-
Maple.vid.0=0x1EAF
645-
Maple.pid.0=0x0004
646-
631+
Maple.build.vid=0x0483
647632
Maple.build.core=arduino
648633
Maple.build.board=Maple
649634
Maple.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -675,10 +660,6 @@ Maple.menu.upload_method.serialMethod.upload.tool=serial_upload
675660
RAK.name=RAKWireless
676661

677662
RAK.build.vid=0x0483
678-
RAK.build.pid=0x5711
679-
RAK.vid.0=0x0483
680-
RAK.pid.0=0x5711
681-
682663
RAK.build.core=arduino
683664
RAK.build.board=RAK
684665
RAK.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -717,10 +698,6 @@ RAK.menu.upload_method.STLink.upload.tool=stlink_upload
717698
3dprinter.name=3D printer boards
718699

719700
3dprinter.build.vid=0x0483
720-
3dprinter.build.pid=0x5711
721-
3dprinter.vid.0=0x0483
722-
3dprinter.pid.0=0x5711
723-
724701
3dprinter.build.core=arduino
725702
3dprinter.build.board=3dprinter
726703
3dprinter.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
@@ -750,11 +727,6 @@ RAK.menu.upload_method.STLink.upload.tool=stlink_upload
750727
3dprinter.menu.pnum.REMRAM_V1.build.variant=REMRAM_V1
751728
3dprinter.menu.pnum.REMRAM_V1.build.cmsis_lib_gcc=arm_cortexM7l_math
752729

753-
# Virtual COM port
754-
#3dprinter.menu.usb.none=None
755-
#3dprinter.menu.usb.CDC=CDC
756-
#3dprinter.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
757-
758730
# Upload menu
759731
3dprinter.menu.upload_method.STLinkMethod=STLink
760732
3dprinter.menu.upload_method.STLinkMethod.upload.protocol=STLink
@@ -828,28 +800,82 @@ RAK.menu.xserial.disabled.build.xSerial=
828800

829801
# USB connectivity
830802
Nucleo_144.menu.usb.none=None
831-
Nucleo_144.menu.usb.HID=HID keyboard and mouse support (if available)
832-
Nucleo_144.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
833-
#Nucleo_144.menu.usb.CDC=CDC (if available)
834-
#Nucleo_144.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
803+
Nucleo_144.menu.usb.none=None
804+
Nucleo_144.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
805+
Nucleo_144.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
806+
Nucleo_144.menu.usb.HIDHS=HID keyboard and mouse support High Speed
807+
Nucleo_144.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
808+
Nucleo_144.menu.usb.CDCFS=CDC Full Speed
809+
Nucleo_144.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
810+
Nucleo_144.menu.usb.CDCHS=CDC High Speed
811+
Nucleo_144.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
835812

836813
Nucleo_64.menu.usb.none=None
837-
Nucleo_64.menu.usb.HID=HID keyboard and mouse support (if available)
838-
Nucleo_64.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
839-
#Nucleo_64.menu.usb.CDC=CDC (if available)
840-
#Nucleo_64.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
814+
Nucleo_64.menu.usb.none=None
815+
Nucleo_64.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
816+
Nucleo_64.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
817+
Nucleo_64.menu.usb.HIDHS=HID keyboard and mouse support High Speed
818+
Nucleo_64.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
819+
Nucleo_64.menu.usb.CDCFS=CDC Full Speed
820+
Nucleo_64.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
821+
Nucleo_64.menu.usb.CDCHS=CDC High Speed
822+
Nucleo_64.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
841823

842824
Nucleo_32.menu.usb.none=None
843-
Nucleo_32.menu.usb.HID=HID keyboard and mouse support (if available)
844-
Nucleo_32.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
845-
#Nucleo_32.menu.usb.CDC=CDC (if available)
846-
#Nucleo_32.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
825+
Nucleo_32.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
826+
Nucleo_32.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
827+
Nucleo_32.menu.usb.HIDHS=HID keyboard and mouse support High Speed
828+
Nucleo_32.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
829+
Nucleo_32.menu.usb.CDCFS=CDC Full Speed
830+
Nucleo_32.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
831+
Nucleo_32.menu.usb.CDCHS=CDC High Speed
832+
Nucleo_32.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
847833

848834
Disco.menu.usb.none=None
849-
Disco.menu.usb.HID=HID keyboard and mouse support (if available)
850-
Disco.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
851-
#Disco.menu.usb.CDC=CDC (if available)
852-
#Disco.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_FS
835+
Disco.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
836+
Disco.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
837+
Disco.menu.usb.HIDHS=HID keyboard and mouse support High Speed
838+
Disco.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
839+
Disco.menu.usb.CDCFS=CDC Full Speed
840+
Disco.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
841+
Disco.menu.usb.CDCHS=CDC High Speed
842+
Disco.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
843+
844+
GenF103.menu.usb.none=None
845+
GenF103.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
846+
GenF103.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
847+
GenF103.menu.usb.HIDHS=HID keyboard and mouse support High Speed
848+
GenF103.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
849+
GenF103.menu.usb.CDCFS=CDC Full Speed
850+
GenF103.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
851+
GenF103.menu.usb.CDCHS=CDC High Speed
852+
GenF103.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
853+
854+
GenF4.menu.usb.none=None
855+
GenF4.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
856+
GenF4.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
857+
GenF4.menu.usb.HIDHS=HID keyboard and mouse support High Speed
858+
GenF4.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
859+
GenF4.menu.usb.CDCFS=CDC Full Speed
860+
GenF4.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
861+
GenF4.menu.usb.CDCHS=CDC High Speed
862+
GenF4.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
863+
864+
Maple.menu.usb.none=None
865+
Maple.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
866+
Maple.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
867+
Maple.menu.usb.HIDHS=HID keyboard and mouse support High Speed
868+
Maple.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
869+
Maple.menu.usb.CDCFS=CDC Full Speed
870+
Maple.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
871+
Maple.menu.usb.CDCHS=CDC High Speed
872+
Maple.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
873+
874+
3dprinter.menu.usb.none=None
875+
3dprinter.menu.usb.CDCFS=CDC Full Speed
876+
3dprinter.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
877+
3dprinter.menu.usb.CDCHS=CDC High Speed
878+
3dprinter.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
853879

854880
# Optimizations
855881
Nucleo_144.menu.opt.osstd=Smallest (-Os default)

‎cores/arduino/HardwareSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ HardwareSerial::HardwareSerial(void* peripheral)
166166
// If Serial is defined in variant set
167167
// the Rx/Tx pins for com port if defined
168168
#if defined(Serial) && defined(PIN_SERIAL_RX) && defined(PIN_SERIAL_TX)
169-
if (this == &Serial) {
169+
if ((void*)this == (void*)&Serial) {
170170
setRx(PIN_SERIAL_RX);
171171
setTx(PIN_SERIAL_TX);
172172
} else

0 commit comments

Comments
 (0)