From 7a2f60c43deeea71f2fd86e2f22c812556e2aea7 Mon Sep 17 00:00:00 2001 From: Hierophect Date: Thu, 3 Oct 2019 15:23:45 -0400 Subject: Add Always Build flag, remove redundancy --- ports/stm32f4/mpconfigport.mk | 4 ---- py/circuitpy_mpconfig.mk | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk index 0dd4862ec..985c4a18a 100644 --- a/ports/stm32f4/mpconfigport.mk +++ b/ports/stm32f4/mpconfigport.mk @@ -20,10 +20,6 @@ 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..77607a374 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) @@ -198,7 +203,7 @@ endif CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO) ifndef CIRCUITPY_RANDOM -CIRCUITPY_RANDOM = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_RANDOM = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_RANDOM=$(CIRCUITPY_RANDOM) @@ -227,22 +232,22 @@ endif CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE) ifndef CIRCUITPY_STORAGE -CIRCUITPY_STORAGE = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_STORAGE = $(CIRCUITPY_ALWAYS_BUILD) 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) @@ -264,12 +269,12 @@ endif CFLAGS += -DCIRCUITPY_UHEAP=$(CIRCUITPY_UHEAP) ifndef CIRCUITPY_USB_HID -CIRCUITPY_USB_HID = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_USB_HID = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_USB_HID=$(CIRCUITPY_USB_HID) ifndef CIRCUITPY_USB_MIDI -CIRCUITPY_USB_MIDI = $(CIRCUITPY_DEFAULT_BUILD) +CIRCUITPY_USB_MIDI = $(CIRCUITPY_ALWAYS_BUILD) endif CFLAGS += -DCIRCUITPY_USB_MIDI=$(CIRCUITPY_USB_MIDI) -- cgit v1.2.3 From dc4abb922bc7209d29dfb116e13dd58eec874289 Mon Sep 17 00:00:00 2001 From: Hierophect Date: Thu, 3 Oct 2019 15:40:46 -0400 Subject: Revert accidental OS delete --- ports/stm32f4/mpconfigport.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk index 985c4a18a..93b22dc6a 100644 --- a/ports/stm32f4/mpconfigport.mk +++ b/ports/stm32f4/mpconfigport.mk @@ -20,6 +20,7 @@ CIRCUITPY_DIGITALIO = 1 CIRCUITPY_ANALOGIO = 1 CIRCUITPY_MICROCONTROLLER = 1 CIRCUITPY_BUSIO = 1 +CIRCUITPY_OS = 1 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx) #endif -- cgit v1.2.3 From ef42abb8184b4c26e8ad4d047d7cca4372c9300b Mon Sep 17 00:00:00 2001 From: Kamil Tomaszewski Date: Fri, 4 Oct 2019 13:49:33 +0200 Subject: Add a way to change max packet size for MSC --- supervisor/supervisor.mk | 5 +++++ tools/gen_usb_descriptor.py | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index ee47be4b0..2b646f898 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -99,6 +99,10 @@ ifndef USB_MSC_NUM_ENDPOINT_PAIRS USB_MSC_NUM_ENDPOINT_PAIRS = 1 endif +ifndef USB_MSC_MAX_PACKET_SIZE +USB_MSC_MAX_PACKET_SIZE = 64 +endif + SUPERVISOR_O = $(addprefix $(BUILD)/, $(SRC_SUPERVISOR:.c=.o)) $(BUILD)/autogen_display_resources.o $(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h @@ -119,6 +123,7 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile --devices $(USB_DEVICES)\ --hid_devices $(USB_HID_DEVICES)\ --msc_num_endpoint_pairs $(USB_MSC_NUM_ENDPOINT_PAIRS)\ + --msc_max_packet_size $(USB_MSC_MAX_PACKET_SIZE)\ --output_c_file $(BUILD)/autogen_usb_descriptor.c\ --output_h_file $(BUILD)/genhdr/autogen_usb_descriptor.h diff --git a/tools/gen_usb_descriptor.py b/tools/gen_usb_descriptor.py index c4ff74d39..d92848c55 100644 --- a/tools/gen_usb_descriptor.py +++ b/tools/gen_usb_descriptor.py @@ -34,6 +34,8 @@ parser.add_argument('--hid_devices', type=lambda l: tuple(l.split(',')), default help='HID devices to include in HID report descriptor') parser.add_argument('--msc_num_endpoint_pairs', type=int, default=1, help='Use 1 or 2 endpoint pairs for MSC (1 bidirectional, or 1 input + 1 output (required by SAMD21))') +parser.add_argument('--msc_max_packet_size', type=int, default=64, + help='Max packet size for MSC') parser.add_argument('--output_c_file', type=argparse.FileType('w'), required=True) parser.add_argument('--output_h_file', type=argparse.FileType('w'), required=True) @@ -155,14 +157,16 @@ msc_interfaces = [ description="MSC in", bEndpointAddress=0x0 | standard.EndpointDescriptor.DIRECTION_IN, bmAttributes=standard.EndpointDescriptor.TYPE_BULK, - bInterval=0), + bInterval=0, + wMaxPacketSize=args.msc_max_packet_size), standard.EndpointDescriptor( description="MSC out", # SAMD21 needs to use a separate pair of endpoints for MSC. bEndpointAddress=((0x1 if args.msc_num_endpoint_pairs == 2 else 0x0) | standard.EndpointDescriptor.DIRECTION_OUT), bmAttributes=standard.EndpointDescriptor.TYPE_BULK, - bInterval=0) + bInterval=0, + wMaxPacketSize=args.msc_max_packet_size) ] ) ] -- cgit v1.2.3 From e017a5925d165fc5748e1f0a3f985339f3e75f88 Mon Sep 17 00:00:00 2001 From: Hierophect Date: Fri, 4 Oct 2019 15:01:33 -0400 Subject: Revert modules with missed dependence --- py/circuitpy_mpconfig.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 77607a374..ac79d32d0 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -203,7 +203,7 @@ endif CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO) ifndef CIRCUITPY_RANDOM -CIRCUITPY_RANDOM = $(CIRCUITPY_ALWAYS_BUILD) +CIRCUITPY_RANDOM = $(CIRCUITPY_DEFAULT_BUILD) endif CFLAGS += -DCIRCUITPY_RANDOM=$(CIRCUITPY_RANDOM) @@ -232,7 +232,7 @@ endif CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE) ifndef CIRCUITPY_STORAGE -CIRCUITPY_STORAGE = $(CIRCUITPY_ALWAYS_BUILD) +CIRCUITPY_STORAGE = $(CIRCUITPY_DEFAULT_BUILD) endif CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE) @@ -269,12 +269,12 @@ endif CFLAGS += -DCIRCUITPY_UHEAP=$(CIRCUITPY_UHEAP) ifndef CIRCUITPY_USB_HID -CIRCUITPY_USB_HID = $(CIRCUITPY_ALWAYS_BUILD) +CIRCUITPY_USB_HID = $(CIRCUITPY_DEFAULT_BUILD) endif CFLAGS += -DCIRCUITPY_USB_HID=$(CIRCUITPY_USB_HID) ifndef CIRCUITPY_USB_MIDI -CIRCUITPY_USB_MIDI = $(CIRCUITPY_ALWAYS_BUILD) +CIRCUITPY_USB_MIDI = $(CIRCUITPY_DEFAULT_BUILD) endif CFLAGS += -DCIRCUITPY_USB_MIDI=$(CIRCUITPY_USB_MIDI) -- cgit v1.2.3 From 4d8aae12b5ebcd5ceeddbfbad5805741497415c1 Mon Sep 17 00:00:00 2001 From: Thomas Konnemann Date: Sat, 5 Oct 2019 12:42:40 +0200 Subject: Update de_DE.po --- locale/de_DE.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 -- cgit v1.2.3