Skip to content

Commit 267e34f

Browse files
fpistmfpistm
committed
Rework Serial and USB menu
Rename "Serial interface" to "U(S)ART support" Rename "USB interface" to "USB support" Add "USB speed" menu for USB speed: LS/FS/HS/HS in FS Reword some descriptions Signed-off-by: Frederic Pillon <[email protected]>
1 parent 94f7ac2 commit 267e34f

File tree

2 files changed

+108
-85
lines changed

2 files changed

+108
-85
lines changed

‎boards.txt

+106-84
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
menu.pnum=Board part number
44

5-
menu.xserial=Serial interface
6-
menu.usb=USB interface (if available)
5+
menu.xserial=U(S)ART support
6+
menu.usb=USB support (if available)
7+
menu.xusb=USB speed (if available)
78

89
menu.opt=Optimize
910
menu.rtlib=C Runtime Library
@@ -578,7 +579,7 @@ GenF1.menu.pnum.MAPLEMINI_F103CB.build.product_line=STM32F103xB
578579
GenF1.menu.pnum.MAPLEMINI_F103CB.build.variant=MAPLEMINI_F103CB
579580

580581
# HY-TinySTM103TB board
581-
# Support:
582+
# Support:
582583
GenF1.menu.pnum.HY_TinySTM103TB=HY-TinySTM103TB
583584
GenF1.menu.pnum.HY_TinySTM103TB.upload.maximum_size=131072
584585
GenF1.menu.pnum.HY_TinySTM103TB.upload.maximum_data_size=20480
@@ -841,128 +842,149 @@ RAK.menu.upload_method.STLink.upload.tool=stlink_upload
841842

842843
################################################################################
843844
# Serialx activation
844-
Nucleo_144.menu.xserial.generic=Enabled with generic Serial
845-
Nucleo_144.menu.xserial.none=Enabled without generic Serial
845+
Nucleo_144.menu.xserial.generic=Enabled (generic 'Serial')
846+
Nucleo_144.menu.xserial.none=Enabled (no generic 'Serial')
846847
Nucleo_144.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
847-
Nucleo_144.menu.xserial.disabled=Disabled (No Serial)
848+
Nucleo_144.menu.xserial.disabled=Disabled (No Serial support)
848849
Nucleo_144.menu.xserial.disabled.build.xSerial=
849850

850-
Nucleo_64.menu.xserial.generic=Enabled with generic Serial
851-
Nucleo_64.menu.xserial.none=Enabled without generic Serial
851+
Nucleo_64.menu.xserial.generic=Enabled (generic 'Serial')
852+
Nucleo_64.menu.xserial.none=Enabled (no generic 'Serial')
852853
Nucleo_64.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
853-
Nucleo_64.menu.xserial.disabled=Disabled (No Serial)
854+
Nucleo_64.menu.xserial.disabled=Disabled (No Serial support)
854855
Nucleo_64.menu.xserial.disabled.build.xSerial=
855856

856-
Nucleo_32.menu.xserial.generic=Enabled with generic Serial
857-
Nucleo_32.menu.xserial.none=Enabled without generic Serial
857+
Nucleo_32.menu.xserial.generic=Enabled (generic 'Serial')
858+
Nucleo_32.menu.xserial.none=Enabled (no generic 'Serial')
858859
Nucleo_32.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
859-
Nucleo_32.menu.xserial.disabled=Disabled (No Serial)
860+
Nucleo_32.menu.xserial.disabled=Disabled (No Serial support)
860861
Nucleo_32.menu.xserial.disabled.build.xSerial=
861862

862-
Disco.menu.xserial.generic=Enabled with generic Serial
863-
Disco.menu.xserial.none=Enabled without generic Serial
863+
Disco.menu.xserial.generic=Enabled (generic 'Serial')
864+
Disco.menu.xserial.none=Enabled (no generic 'Serial')
864865
Disco.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
865-
Disco.menu.xserial.disabled=Disabled (No Serial)
866+
Disco.menu.xserial.disabled=Disabled (no Serial support)
866867
Disco.menu.xserial.disabled.build.xSerial=
867868

868-
GenF0.menu.xserial.generic=Enabled with generic Serial
869-
GenF0.menu.xserial.none=Enabled without generic Serial
869+
GenF0.menu.xserial.generic=Enabled (generic 'Serial')
870+
GenF0.menu.xserial.none=Enabled (no generic 'Serial')
870871
GenF0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
871-
GenF0.menu.xserial.disabled=Disabled (No Serial)
872+
GenF0.menu.xserial.disabled=Disabled (no Serial support)
872873
GenF0.menu.xserial.disabled.build.xSerial=
873874

874-
GenF1.menu.xserial.generic=Enabled with generic Serial
875-
GenF1.menu.xserial.none=Enabled without generic Serial
875+
GenF1.menu.xserial.generic=Enabled (generic 'Serial')
876+
GenF1.menu.xserial.none=Enabled (no generic 'Serial')
876877
GenF1.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
877-
GenF1.menu.xserial.disabled=Disabled (No Serial)
878+
GenF1.menu.xserial.disabled=Disabled (no Serial support)
878879
GenF1.menu.xserial.disabled.build.xSerial=
879880

880-
GenF4.menu.xserial.generic=Enabled with generic Serial
881-
GenF4.menu.xserial.none=Enabled without generic Serial
881+
GenF4.menu.xserial.generic=Enabled (generic 'Serial')
882+
GenF4.menu.xserial.none=Enabled (no generic 'Serial')
882883
GenF4.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
883-
GenF4.menu.xserial.disabled=Disabled (No Serial)
884+
GenF4.menu.xserial.disabled=Disabled (no Serial support)
884885
GenF4.menu.xserial.disabled.build.xSerial=
885886

886-
RAK.menu.xserial.generic=Enabled with generic Serial
887-
RAK.menu.xserial.none=Enabled without generic Serial
887+
RAK.menu.xserial.generic=Enabled (generic 'Serial')
888+
RAK.menu.xserial.none=Enabled (no generic 'Serial')
888889
RAK.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
889-
RAK.menu.xserial.disabled=Disabled (No Serial)
890+
RAK.menu.xserial.disabled=Disabled (no Serial support)
890891
RAK.menu.xserial.disabled.build.xSerial=
891892

892-
3dprinter.menu.xserial.generic=Enabled with generic Serial
893-
3dprinter.menu.xserial.none=Enabled without generic Serial
893+
3dprinter.menu.xserial.generic=Enabled (generic 'Serial')
894+
3dprinter.menu.xserial.none=Enabled (no generic 'Serial')
894895
3dprinter.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
895-
3dprinter.menu.xserial.disabled=Disabled (No Serial)
896+
3dprinter.menu.xserial.disabled=Disabled (no Serial support)
896897
3dprinter.menu.xserial.disabled.build.xSerial=
897898

898899
# USB connectivity
899900
Nucleo_144.menu.usb.none=None
900-
Nucleo_144.menu.usb.none=None
901-
Nucleo_144.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
902-
Nucleo_144.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
903-
Nucleo_144.menu.usb.HIDHS=HID keyboard and mouse support High Speed
904-
Nucleo_144.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
905-
Nucleo_144.menu.usb.CDCFS=CDC Full Speed
906-
Nucleo_144.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
907-
Nucleo_144.menu.usb.CDCHS=CDC High Speed
908-
Nucleo_144.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
901+
Nucleo_144.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
902+
Nucleo_144.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
903+
Nucleo_144.menu.usb.CDC=CDC (no generic 'Serial')
904+
Nucleo_144.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
905+
Nucleo_144.menu.usb.HID=HID (keyboard and mouse)
906+
Nucleo_144.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
907+
Nucleo_144.menu.xusb.FS=Low/Full Speed
908+
Nucleo_144.menu.xusb.HS=High Speed
909+
Nucleo_144.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
910+
Nucleo_144.menu.xusb.HSFS=High Speed in Full Speed mode
911+
Nucleo_144.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
909912

910913
Nucleo_64.menu.usb.none=None
911-
Nucleo_64.menu.usb.none=None
912-
Nucleo_64.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
913-
Nucleo_64.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
914-
Nucleo_64.menu.usb.HIDHS=HID keyboard and mouse support High Speed
915-
Nucleo_64.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
916-
Nucleo_64.menu.usb.CDCFS=CDC Full Speed
917-
Nucleo_64.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
918-
Nucleo_64.menu.usb.CDCHS=CDC High Speed
919-
Nucleo_64.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
914+
Nucleo_64.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
915+
Nucleo_64.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
916+
Nucleo_64.menu.usb.CDC=CDC (no generic 'Serial')
917+
Nucleo_64.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
918+
Nucleo_64.menu.usb.HID=HID (keyboard and mouse)
919+
Nucleo_64.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
920+
Nucleo_64.menu.xusb.FS=Low/Full Speed
921+
Nucleo_64.menu.xusb.HS=High Speed
922+
Nucleo_64.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
923+
Nucleo_64.menu.xusb.HSFS=High Speed in Full Speed mode
924+
Nucleo_64.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
920925

921926
Nucleo_32.menu.usb.none=None
922-
Nucleo_32.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
923-
Nucleo_32.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
924-
Nucleo_32.menu.usb.HIDHS=HID keyboard and mouse support High Speed
925-
Nucleo_32.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
926-
Nucleo_32.menu.usb.CDCFS=CDC Full Speed
927-
Nucleo_32.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
928-
Nucleo_32.menu.usb.CDCHS=CDC High Speed
929-
Nucleo_32.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
927+
Nucleo_32.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
928+
Nucleo_32.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
929+
Nucleo_32.menu.usb.CDC=CDC (no generic 'Serial')
930+
Nucleo_32.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
931+
Nucleo_32.menu.usb.HID=HID (keyboard and mouse)
932+
Nucleo_32.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
933+
Nucleo_32.menu.xusb.FS=Low/Full Speed
934+
Nucleo_32.menu.xusb.HS=High Speed
935+
Nucleo_32.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
936+
Nucleo_32.menu.xusb.HSFS=High Speed in Full Speed mode
937+
Nucleo_32.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
930938

931939
Disco.menu.usb.none=None
932-
Disco.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
933-
Disco.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
934-
Disco.menu.usb.HIDHS=HID keyboard and mouse support High Speed
935-
Disco.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
936-
Disco.menu.usb.CDCFS=CDC Full Speed
937-
Disco.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
938-
Disco.menu.usb.CDCHS=CDC High Speed
939-
Disco.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
940+
Disco.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
941+
Disco.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
942+
Disco.menu.usb.CDC=CDC (no generic 'Serial')
943+
Disco.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
944+
Disco.menu.usb.HID=HID (keyboard and mouse)
945+
Disco.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
946+
Disco.menu.xusb.FS=Low/Full Speed
947+
Disco.menu.xusb.HS=High Speed
948+
Disco.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
949+
Disco.menu.xusb.HSFS=High Speed in Full Speed mode
950+
Disco.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
940951

941952
GenF1.menu.usb.none=None
942-
GenF1.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
943-
GenF1.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
944-
GenF1.menu.usb.HIDHS=HID keyboard and mouse support High Speed
945-
GenF1.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
946-
GenF1.menu.usb.CDCFS=CDC Full Speed
947-
GenF1.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
948-
GenF1.menu.usb.CDCHS=CDC High Speed
949-
GenF1.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
953+
GenF1.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
954+
GenF1.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
955+
GenF1.menu.usb.CDC=CDC (no generic 'Serial')
956+
GenF1.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
957+
GenF1.menu.usb.HID=HID (keyboard and mouse)
958+
GenF1.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
959+
GenF1.menu.xusb.FS=Low/Full Speed
960+
GenF1.menu.xusb.HS=High Speed
961+
GenF1.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
962+
GenF1.menu.xusb.HSFS=High Speed in Full Speed mode
963+
GenF1.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
950964

951965
GenF4.menu.usb.none=None
952-
GenF4.menu.usb.HIDFS=HID keyboard and mouse support Full Speed
953-
GenF4.menu.usb.HIDFS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
954-
GenF4.menu.usb.HIDHS=HID keyboard and mouse support High Speed
955-
GenF4.menu.usb.HIDHS.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE -DUSE_USB_HS
956-
GenF4.menu.usb.CDCFS=CDC Full Speed
957-
GenF4.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
958-
GenF4.menu.usb.CDCHS=CDC High Speed
959-
GenF4.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
966+
GenF4.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
967+
GenF4.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
968+
GenF4.menu.usb.CDC=CDC (no generic 'Serial')
969+
GenF4.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
970+
GenF4.menu.usb.HID=HID (keyboard and mouse)
971+
GenF4.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
972+
GenF4.menu.xusb.FS=Low/Full Speed
973+
GenF4.menu.xusb.HS=High Speed
974+
GenF4.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
975+
GenF4.menu.xusb.HSFS=High Speed in Full Speed mode
976+
GenF4.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
960977

961978
3dprinter.menu.usb.none=None
962-
3dprinter.menu.usb.CDCFS=CDC Full Speed
963-
3dprinter.menu.usb.CDCFS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
964-
3dprinter.menu.usb.CDCHS=CDC High Speed
965-
3dprinter.menu.usb.CDCHS.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DUSE_USB_HS
979+
3dprinter.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
980+
3dprinter.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
981+
3dprinter.menu.usb.CDC=CDC (no generic 'Serial')
982+
3dprinter.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
983+
3dprinter.menu.xusb.FS=Low/Full Speed
984+
3dprinter.menu.xusb.HS=High Speed
985+
3dprinter.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
986+
3dprinter.menu.xusb.HSFS=High Speed in Full Speed mode
987+
3dprinter.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
966988

967989
# Optimizations
968990
Nucleo_144.menu.opt.osstd=Smallest (-Os default)

‎platform.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.3.0.path}/CMSIS/Lib/GCC/" -
6767

6868
# USB Flags
6969
# ---------
70-
build.usb_flags=-DUSBCON -DUSBD_VID={build.vid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT="{build.board}"' -DHAL_PCD_MODULE_ENABLED
70+
build.usb_flags=-DUSBCON {build.usb_speed} -DUSBD_VID={build.vid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT="{build.board}"' -DHAL_PCD_MODULE_ENABLED
7171

7272
# Default usb manufacturer will be replaced at compile time using
7373
# numeric vendor ID if available or by board's specific value.
@@ -79,6 +79,7 @@ build.info.flags=-D{build.series} -DARDUINO={runtime.ide.version} -DARDUINO_{bui
7979
# Defaults config
8080
build.xSerial=-DHAL_UART_MODULE_ENABLED
8181
build.enable_usb=
82+
build.usb_speed=
8283
build.startup_file=
8384
build.flags.optimize=-Os
8485
build.flags.ldspecs=--specs=nano.specs

0 commit comments

Comments
 (0)