diff options
| -rw-r--r-- | locale/de_DE.po | 20 | ||||
| -rw-r--r-- | ports/stm32f4/mpconfigport.mk | 3 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.mk | 13 | ||||
| -rw-r--r-- | supervisor/supervisor.mk | 5 | ||||
| -rw-r--r-- | tools/gen_usb_descriptor.py | 8 |
5 files changed, 30 insertions, 19 deletions
diff --git a/locale/de_DE.po b/locale/de_DE.po index c846b646b..d8fbc1f0d 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -48,7 +48,7 @@ msgstr "%q in Benutzung" #: py/obj.c msgid "%q index out of range" -msgstr "Der Index %q befindet sich außerhalb der Reihung" +msgstr "Der Index %q befindet sich außerhalb des Bereiches" #: py/obj.c msgid "%q indices must be integers, not %s" @@ -124,7 +124,7 @@ msgstr "'%s' Integer 0x%x passt nicht in Maske 0x%x" #: py/obj.c #, c-format msgid "'%s' object does not support item assignment" -msgstr "'%s' Objekt unterstützt keine item assignment" +msgstr "'%s' Objekt unterstützt keine Zuordnung von Elementen" #: py/obj.c #, c-format @@ -226,7 +226,7 @@ msgstr "Die Adresse muss %d Bytes lang sein" #: shared-bindings/_bleio/Address.c msgid "Address type out of range" -msgstr "" +msgstr "Adresstyp außerhalb des zulässigen Bereichs" #: ports/nrf/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" @@ -303,7 +303,7 @@ msgstr "" #: shared-module/displayio/Display.c msgid "Below minimum frame rate" -msgstr "" +msgstr "Unterhalb der minimalen Frame Rate" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must share a clock unit" @@ -319,7 +319,7 @@ msgstr "Beide pins müssen Hardware Interrupts unterstützen" #: shared-bindings/displayio/Display.c msgid "Brightness must be 0-1.0" -msgstr "" +msgstr "Die Helligkeit muss zwischen 0 und 1.0 liegen" #: shared-bindings/supervisor/__init__.c msgid "Brightness must be between 0 and 255" @@ -340,7 +340,7 @@ msgstr "" #: shared-bindings/displayio/Display.c msgid "Buffer is too small" -msgstr "" +msgstr "Der Puffer ist zu klein" #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #, c-format @@ -562,7 +562,7 @@ msgstr "Eine UUID wird erwartet" #: shared-bindings/_bleio/Central.c msgid "Expected an Address" -msgstr "" +msgstr "Erwartet eine Adresse" #: shared-module/_pixelbuf/PixelBuf.c #, c-format @@ -571,7 +571,7 @@ msgstr "Habe ein Tupel der Länge %d erwartet aber %d erhalten" #: shared-bindings/ps2io/Ps2.c msgid "Failed sending command." -msgstr "" +msgstr "Kommando nicht gesendet." #: ports/nrf/sd_mutex.c #, c-format @@ -614,7 +614,7 @@ msgstr "" #: ports/nrf/common-hal/_bleio/Central.c msgid "Failed to connect: timeout" -msgstr "" +msgstr "Verbindung nicht erfolgreich: timeout" #: ports/nrf/common-hal/_bleio/Scanner.c #, c-format @@ -681,7 +681,7 @@ msgstr "Kann advertisement nicht starten. Status: 0x%04x" #: ports/nrf/common-hal/_bleio/Central.c #, c-format msgid "Failed to start connecting, error 0x%04x" -msgstr "" +msgstr "Verbindung konnte nicht hergestellt werden. Fehler: 0x%04x" #: ports/nrf/common-hal/_bleio/Peripheral.c #, c-format diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk index 0dd4862ec..93b22dc6a 100644 --- a/ports/stm32f4/mpconfigport.mk +++ b/ports/stm32f4/mpconfigport.mk @@ -20,10 +20,7 @@ CIRCUITPY_DIGITALIO = 1 CIRCUITPY_ANALOGIO = 1 CIRCUITPY_MICROCONTROLLER = 1 CIRCUITPY_BUSIO = 1 -CIRCUITPY_TIME = 1 CIRCUITPY_OS = 1 -CIRCUITPY_STRUCT = 1 -CIRCUITPY_MATH = 1 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx) #endif diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index c5756f488..ac79d32d0 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -52,6 +52,11 @@ ifndef CIRCUITPY_DEFAULT_BUILD endif endif +# Some features have no unique HAL component, and thus there's never +# a reason to not include them. +ifndef CIRCUITPY_ALWAYS_BUILD + CIRCUITPY_ALWAYS_BUILD = 1 +endif # All builtin modules are listed below, with default values (0 for off, 1 for on) @@ -151,7 +156,7 @@ endif CFLAGS += -DCIRCUITPY_I2CSLAVE=$(CIRCUITPY_I2CSLAVE) ifndef CIRCUITPY_MATH -CIRCUITPY_MATH = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_MATH = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH) @@ -232,17 +237,17 @@ endif CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE) ifndef CIRCUITPY_STRUCT -CIRCUITPY_STRUCT = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_STRUCT = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_STRUCT=$(CIRCUITPY_STRUCT) ifndef CIRCUITPY_SUPERVISOR -CIRCUITPY_SUPERVISOR = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_SUPERVISOR = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_SUPERVISOR=$(CIRCUITPY_SUPERVISOR) ifndef CIRCUITPY_TIME -CIRCUITPY_TIME = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_TIME = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index e1d5f5951..48697a94a 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -94,6 +94,10 @@ ifndef USB_HID_DEVICES USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD" endif +ifndef USB_MSC_MAX_PACKET_SIZE +USB_MSC_MAX_PACKET_SIZE = 64 +endif + ifndef USB_CDC_EP_NUM_NOTIFICATION USB_CDC_EP_NUM_NOTIFICATION = 0 endif @@ -138,6 +142,7 @@ USB_DESCRIPTOR_ARGS = \ --serial_number_length $(USB_SERIAL_NUMBER_LENGTH)\ --devices $(USB_DEVICES)\ --hid_devices $(USB_HID_DEVICES)\ + --msc_max_packet_size $(USB_MSC_MAX_PACKET_SIZE)\ --cdc_ep_num_notification $(USB_CDC_EP_NUM_NOTIFICATION)\ --cdc_ep_num_data_out $(USB_CDC_EP_NUM_DATA_OUT)\ --cdc_ep_num_data_in $(USB_CDC_EP_NUM_DATA_IN)\ diff --git a/tools/gen_usb_descriptor.py b/tools/gen_usb_descriptor.py index 34bca1170..ec7cc4bde 100644 --- a/tools/gen_usb_descriptor.py +++ b/tools/gen_usb_descriptor.py @@ -32,6 +32,8 @@ parser.add_argument('--devices', type=lambda l: tuple(l.split(',')), default=DEF help='devices to include in descriptor (AUDIO includes MIDI support)') parser.add_argument('--hid_devices', type=lambda l: tuple(l.split(',')), default=DEFAULT_HID_DEVICES, help='HID devices to include in HID report descriptor') +parser.add_argument('--msc_max_packet_size', type=int, default=64, + help='Max packet size for MSC') parser.add_argument('--no-renumber_endpoints', dest='renumber_endpoints', action='store_false', help='use to not renumber endpoint') parser.add_argument('--cdc_ep_num_notification', type=int, default=0, @@ -196,12 +198,14 @@ msc_interfaces = [ description="MSC in", bEndpointAddress=args.msc_ep_num_in | standard.EndpointDescriptor.DIRECTION_IN, bmAttributes=standard.EndpointDescriptor.TYPE_BULK, - bInterval=0), + bInterval=0, + wMaxPacketSize=args.msc_max_packet_size), standard.EndpointDescriptor( description="MSC out", bEndpointAddress=(args.msc_ep_num_out | standard.EndpointDescriptor.DIRECTION_OUT), bmAttributes=standard.EndpointDescriptor.TYPE_BULK, - bInterval=0) + bInterval=0, + wMaxPacketSize=args.msc_max_packet_size) ] ) ] |