djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a5578cf067
circuitpython/supervisor/supervisor.mk

240 lines
7.1 KiB
Makefile
Raw Normal View History

Move to ASF4 and introduce SAMD51 support. (#258) * atmel-samd: Remove ASF3. This will break builds. * atmel-samd: Add ASF4 for the SAMD21 and SAMD51. * Introduce the supervisor concept to facilitate porting. The supervisor is the code which runs individual MicroPython VMs. By splitting it out we make it more consistent and easier to find. This also adds very basic SAMD21 and SAMD51 support using the supervisor. Only the REPL currently works. This begins the work for #178.
2017-09-22 21:05:51 -04:00
SRC_SUPERVISOR = \
main.c \
supervisor/port.c \
supervisor: Add a linked list of background callbacks In time, we should transition interrupt driven background tasks out of the overall run_background_tasks into distinct background callbacks, so that the number of checks that occur with each tick is reduced.
2020-05-11 09:37:20 -04:00
supervisor/shared/background_callback.c \
reset NeoPixels on CPB on soft reload
2020-01-23 20:03:55 -05:00
supervisor/shared/board.c \
Don't block serial output in interrupt The interrupt may have a higher priority than the serial output's (USB) interrupt and may never make room. This makes prints from interrupts (like the BLE event calls) best effort for what can be queued up. The rest of the output will be dropped.
2021-04-08 16:33:14 -04:00
supervisor/shared/cpu.c \
Enable* web workflow for Pico W * Except for circuitpython.local which depends on MDNS and will be done in a follow up PR. Progress on #7214
2022-11-18 14:21:02 -05:00
supervisor/shared/fatfs.c \
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
supervisor/shared/flash.c \
compiles
2021-06-14 20:54:43 -04:00
supervisor/shared/lock.c \
fix ulab commit
2021-06-15 11:39:40 -04:00
supervisor/shared/memory.c \
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
supervisor/shared/micropython.c \
Lots of web workflow, C3 and title bar fixes * Fixes #6221 - C3 hang on `import wifi`. Enabling the WiFi PHY was disabling USB. Now boards that use it set CONFIG_ESP_PHY_ENABLE_USB explicitly. * Fixes #6655 - Allows pasting into the web serial page. Fixes reading more than 0xf bytes at a time. * Fixes #6653 - Fixes web socket encoding of payloads >125 bytes. Can happen when printing a long string. * Fixes C3 responsiveness when waiting for key to enter REPL. (It now correctly stops sleeping.) * Disables title bar updates when in raw REPL. Related to #6548. * Adds version to title bar.
2022-07-27 20:00:38 -04:00
supervisor/shared/port.c \
rework auto-reload delay logic
2022-03-11 13:29:20 -05:00
supervisor/shared/reload.c \
Rework safe mode and have heap overwrite trigger it. This creates a common safe mode mechanic that ports can share. As a result, the nRF52 now has safe mode support as well. The common safe mode adds a 700ms delay at startup where a reset during that window will cause a reset into safe mode. This window is designated by a yellow status pixel and flashing the single led three times. A couple NeoPixel fixes are included for the nRF52 as well. Fixes #1034. Fixes #990. Fixes #615.
2018-12-06 17:24:20 -05:00
supervisor/shared/safe_mode.c \
Add ability to reserve psram .. the primary user of which will be the camera, since the framebuffers must be allocated via esp-idf allocation function and never from the gc heap. A board can have a default value, and the value can also be set in the /.env file using the key CIRCUITPY_RESERVED_PSRAM with the value being the reserved size in bytes. Co-authored-by: Dan Halbert <halbert@adafruit.com>
2022-08-02 08:10:51 -04:00
supervisor/shared/serial.c \
Support internationalisation.
2018-07-31 19:53:54 -04:00
supervisor/shared/stack.c \
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
supervisor/shared/status_leds.c \
Supervisor: move most of systick to the supervisor This code is shared by most parts, except where not all the #ifdefs inside the tick function were present in all ports. This mostly would have broken gamepad tick support on non-samd ports. The "ms32" and "ms64" variants of the tick functions are introduced because there is no 64-bit atomic read. Disabling interrupts avoids a low probability bug where milliseconds could be off by ~49.5 days once every ~49.5 days (2^32 ms). Avoiding disabling interrupts when only the low 32 bits are needed is a minor optimization. Testing performed: on metro m4 express, USB still works and time.monotonic_ns() still counts up
2019-11-18 09:22:41 -05:00
supervisor/shared/tick.c \
Add supervisor.get_previous_traceback() function. Useful for #1084.
2020-09-27 06:58:51 -04:00
supervisor/shared/traceback.c \
Conditionalize LTO
2022-05-27 15:59:54 -04:00
supervisor/shared/translate/translate.c \
Add ability to reserve psram .. the primary user of which will be the camera, since the framebuffers must be allocated via esp-idf allocation function and never from the gc heap. A board can have a default value, and the value can also be set in the /.env file using the key CIRCUITPY_RESERVED_PSRAM with the value being the reserved size in bytes. Co-authored-by: Dan Halbert <halbert@adafruit.com>
2022-08-02 08:10:51 -04:00
supervisor/shared/workflow.c \
supervisor/stub/misc.c \
Move to ASF4 and introduce SAMD51 support. (#258) * atmel-samd: Remove ASF3. This will break builds. * atmel-samd: Add ASF4 for the SAMD21 and SAMD51. * Introduce the supervisor concept to facilitate porting. The supervisor is the code which runs individual MicroPython VMs. By splitting it out we make it more consistent and easier to find. This also adds very basic SAMD21 and SAMD51 support using the supervisor. Only the REPL currently works. This begins the work for #178.
2017-09-22 21:05:51 -04:00
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
NO_USB ?= $(wildcard supervisor/usb.c)
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
Fix wifi but not ble builds. Add DELETE and PUT support
2022-06-17 19:41:42 -04:00
ifeq ($(CIRCUITPY_USB),1)
CIRCUITPY_CREATOR_ID ?= $(USB_VID)
CIRCUITPY_CREATION_ID ?= $(USB_PID)
endif
ifneq ($(CIRCUITPY_CREATOR_ID),)
CFLAGS += -DCIRCUITPY_CREATOR_ID=$(CIRCUITPY_CREATOR_ID)
endif
ifneq ($(CIRCUITPY_CREATION_ID),)
CFLAGS += -DCIRCUITPY_CREATION_ID=$(CIRCUITPY_CREATION_ID)
endif
ifeq ($(CIRCUITPY_BLEIO),1)
SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c
ifeq ($(CIRCUITPY_BLE_FILE_SERVICE),1)
SRC_SUPERVISOR += supervisor/shared/bluetooth/file_transfer.c
endif
ifeq ($(CIRCUITPY_SERIAL_BLE),1)
SRC_SUPERVISOR += supervisor/shared/bluetooth/serial.c
endif
endif
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
INTERNAL_FLASH_FILESYSTEM ?= 0
wip
2019-12-05 22:45:53 -05:00
CFLAGS += -DINTERNAL_FLASH_FILESYSTEM=$(INTERNAL_FLASH_FILESYSTEM)
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
QSPI_FLASH_FILESYSTEM ?= 0
working on all ports
2019-12-10 17:57:17 -05:00
CFLAGS += -DQSPI_FLASH_FILESYSTEM=$(QSPI_FLASH_FILESYSTEM)
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
merge from upstream; complicated webusb merge
2021-02-11 18:50:02 -05:00
SPI_FLASH_FILESYSTEM ?= 0
working on all ports
2019-12-10 17:57:17 -05:00
CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM)
Refine _bleio This PR refines the _bleio API. It was originally motivated by the addition of a new CircuitPython service that enables reading and modifying files on the device. Moving the BLE lifecycle outside of the VM motivated a number of changes to remove heap allocations in some APIs. It also motivated unifying connection initiation to the Adapter class rather than the Central and Peripheral classes which have been removed. Adapter now handles the GAP portion of BLE including advertising, which has moved but is largely unchanged, and scanning, which has been enhanced to return an iterator of filtered results. Once a connection is created (either by us (aka Central) or a remote device (aka Peripheral)) it is represented by a new Connection class. This class knows the current connection state and can discover and instantiate remote Services along with their Characteristics and Descriptors. Relates to #586
2019-09-14 15:40:24 -04:00
Fixed build issue when DISABLE_FILESYSTEM is set.
2022-06-16 13:27:08 -04:00
DISABLE_FILESYSTEM ?= 0
CFLAGS += -DDISABLE_FILESYSTEM=$(DISABLE_FILESYSTEM)
Fixes from PR feedback: Test DISABLE_FILESYSTEM after it set. https://github.com/adafruit/circuitpython/pull/6492/files/53f4eeaf8b2a99da2562faa9828f3e80c4871800#r899419987
2022-06-16 15:43:07 -04:00
ifeq ($(DISABLE_FILESYSTEM),1)
SRC_SUPERVISOR += supervisor/stub/filesystem.c
else
SRC_SUPERVISOR += supervisor/shared/filesystem.c
endif
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
# Choose which flash filesystem impl to use.
wip
2019-12-05 22:45:53 -05:00
# (Right now INTERNAL_FLASH_FILESYSTEM and (Q)SPI_FLASH_FILESYSTEM are mutually exclusive.
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
# But that might not be true in the future.)
Redo RP2040 flash settings This switches stage2 to C and uses Jinja to change the C code based on flash settings from https://github.com/adafruit/nvm.toml. It produces the fastest settings for the given set of external flashes. Flash size is no longer hard coded so switching flashes with similar capabilities but different sizes should *just work*. This PR also places "ITCM" code in RAM to save the XIP cache for code execution. Further optimization is possible. A blink code.py still requires a number of flash fetches every blink. Fixes #4041
2021-03-04 16:12:24 -05:00
ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
ifeq ($(DISABLE_FILESYSTEM),1)
SRC_SUPERVISOR += supervisor/stub/internal_flash.c
else
SRC_SUPERVISOR += supervisor/internal_flash.c
endif
else
wip
2021-02-12 19:01:14 -05:00
CFLAGS += -DEXTERNAL_FLASH_DEVICES=$(EXTERNAL_FLASH_DEVICES) \
SRC_SUPERVISOR += supervisor/shared/external_flash/external_flash.c
Switch devices.h to nvm.toml data
2021-03-24 20:10:54 -04:00
ifeq ($(SPI_FLASH_FILESYSTEM),1)
SRC_SUPERVISOR += supervisor/shared/external_flash/spi_flash.c
endif
ifeq ($(QSPI_FLASH_FILESYSTEM),1)
SRC_SUPERVISOR += supervisor/qspi_flash.c supervisor/shared/external_flash/qspi_flash.c
endif
$(HEADER_BUILD)/devices.h : ../../supervisor/shared/external_flash/devices.h.jinja ../../tools/gen_nvm_devices.py | $(HEADER_BUILD)
$(STEPECHO) "GEN $@"
$(Q)install -d $(BUILD)/genhdr
Always use python3 .. similar to https://github.com/micropython/micropython/pull/4448
2021-10-15 15:59:04 -04:00
$(Q)$(PYTHON) ../../tools/gen_nvm_devices.py $< $@
Switch devices.h to nvm.toml data
2021-03-24 20:10:54 -04:00
$(BUILD)/supervisor/shared/external_flash/external_flash.o: $(HEADER_BUILD)/devices.h
Move to ASF4 and introduce SAMD51 support. (#258) * atmel-samd: Remove ASF3. This will break builds. * atmel-samd: Add ASF4 for the SAMD21 and SAMD51. * Introduce the supervisor concept to facilitate porting. The supervisor is the code which runs individual MicroPython VMs. By splitting it out we make it more consistent and easier to find. This also adds very basic SAMD21 and SAMD51 support using the supervisor. Only the REPL currently works. This begins the work for #178.
2017-09-22 21:05:51 -04:00
endif
Switch to port_serial_* hooks This makes it easier to integrate port specific serial alongside the common approaches.
2022-03-22 22:40:33 -04:00
ifneq ($(wildcard supervisor/serial.c),)
SRC_SUPERVISOR += supervisor/serial.c
endif
Add USB to Serial/JTAG support for REPL Adds Adafruit QT Py C3 board that uses it. Also revamps size check script to work for S3 and C3 as well. Fixes #6030
2022-03-21 16:57:29 -04:00
status bar control
2022-08-28 21:55:13 -04:00
ifeq ($(CIRCUITPY_STATUS_BAR),1)
SRC_SUPERVISOR += \
supervisor/shared/status_bar.c \
endif
Switch to port_serial_* hooks This makes it easier to integrate port specific serial alongside the common approaches.
2022-03-22 22:40:33 -04:00
ifeq ($(CIRCUITPY_USB),1)
wip
2021-02-12 19:01:14 -05:00
SRC_SUPERVISOR += \
lib/tinyusb/src/class/cdc/cdc_device.c \
lib/tinyusb/src/common/tusb_fifo.c \
lib/tinyusb/src/device/usbd.c \
lib/tinyusb/src/device/usbd_control.c \
lib/tinyusb/src/tusb.c \
supervisor/usb.c \
supervisor/shared/usb/usb_desc.c \
supervisor/shared/usb/usb.c \
ifeq ($(CIRCUITPY_USB_CDC), 1)
SRC_SUPERVISOR += \
shared-bindings/usb_cdc/__init__.c \
shared-bindings/usb_cdc/Serial.c \
shared-module/usb_cdc/__init__.c \
shared-module/usb_cdc/Serial.c \
endif
ifeq ($(CIRCUITPY_USB_HID), 1)
SRC_SUPERVISOR += \
lib/tinyusb/src/class/hid/hid_device.c \
shared-bindings/usb_hid/__init__.c \
shared-bindings/usb_hid/Device.c \
shared-module/usb_hid/__init__.c \
shared-module/usb_hid/Device.c \
endif
ifeq ($(CIRCUITPY_USB_MIDI), 1)
SRC_SUPERVISOR += \
lib/tinyusb/src/class/midi/midi_device.c \
shared-bindings/usb_midi/__init__.c \
shared-bindings/usb_midi/PortIn.c \
shared-bindings/usb_midi/PortOut.c \
shared-module/usb_midi/__init__.c \
shared-module/usb_midi/PortIn.c \
shared-module/usb_midi/PortOut.c \
endif
ifeq ($(CIRCUITPY_USB_MSC), 1)
SRC_SUPERVISOR += \
lib/tinyusb/src/class/msc/msc_device.c \
supervisor/shared/usb/usb_msc_flash.c \
endif
ifeq ($(CIRCUITPY_USB_VENDOR), 1)
SRC_SUPERVISOR += \
lib/tinyusb/src/class/vendor/vendor_device.c \
endif
Start of USB host API This allows you to list and explore connected USB devices. It only stubs out the methods to communicate to endpoints. That will come in a follow up once TinyUSB has it. (It's in progress.) Related to #5986
2022-02-18 20:57:54 -05:00
ifeq ($(CIRCUITPY_USB_HOST), 1)
SRC_SUPERVISOR += \
Basic USB host support and keyboard workflow Connects up read, write and ctrl_transfer to TinyUSB. USB Host support is available on iMX RT and RP2040. Fixes #6527 (imx) and fixes #5986 (rp2).
2023-05-02 15:13:54 -04:00
lib/tinyusb/src/class/hid/hid_host.c \
Start of USB host API This allows you to list and explore connected USB devices. It only stubs out the methods to communicate to endpoints. That will come in a follow up once TinyUSB has it. (It's in progress.) Related to #5986
2022-02-18 20:57:54 -05:00
lib/tinyusb/src/host/hub.c \
lib/tinyusb/src/host/usbh.c \
Basic USB host support and keyboard workflow Connects up read, write and ctrl_transfer to TinyUSB. USB Host support is available on iMX RT and RP2040. Fixes #6527 (imx) and fixes #5986 (rp2).
2023-05-02 15:13:54 -04:00
supervisor/shared/usb/host_keyboard.c \
Start of USB host API This allows you to list and explore connected USB devices. It only stubs out the methods to communicate to endpoints. That will come in a follow up once TinyUSB has it. (It's in progress.) Related to #5986
2022-02-18 20:57:54 -05:00
endif
Move to ASF4 and introduce SAMD51 support. (#258) * atmel-samd: Remove ASF3. This will break builds. * atmel-samd: Add ASF4 for the SAMD21 and SAMD51. * Introduce the supervisor concept to facilitate porting. The supervisor is the code which runs individual MicroPython VMs. By splitting it out we make it more consistent and easier to find. This also adds very basic SAMD21 and SAMD51 support using the supervisor. Only the REPL currently works. This begins the work for #178.
2017-09-22 21:05:51 -04:00
endif
Static files + welcome page
2022-06-23 19:32:42 -04:00
STATIC_RESOURCES = $(wildcard $(TOP)/supervisor/shared/web_workflow/static/*)
Fix creator ID and build order
2022-06-27 17:40:38 -04:00
$(BUILD)/autogen_web_workflow_static.c: ../../tools/gen_web_workflow_static.py $(STATIC_RESOURCES) | $(HEADER_BUILD)
Static files + welcome page
2022-06-23 19:32:42 -04:00
$(STEPECHO) "GEN $@"
$(Q)$(PYTHON) $< \
--output_c_file $@ \
$(STATIC_RESOURCES)
Wi-Fi autoconnect and title bar status This adds support for CIRCUITPY_WIFI_SSID and CIRCUITPY_WIFI_PASSWORD in `/.env`. When both are defined, CircuitPython will attempt to connect to the network even when user code isn't running. If the user code attempts to a network with the same SSID, it will return immediately. Connecting to another SSID will disconnect from the auto-connected network. If the user code initiates the connection, then it will be shutdown after user code exits. (Should match <8 behavior.) This PR also reworks the default displayio terminal. It now supports a title bar TileGrid in addition to the (newly renamed) scroll area. The default title bar is the top row of the display and is positioned to the right of the Blinka logo when it is enabled. The scroll area is now below the Blinka logo. The Wi-Fi auto-connect code now uses the title bar to show its state including the IP address when connected. It does this through the "standard" OSC control sequence `ESC ] 0 ; <s> ESC \` where <s> is the title bar string. This is commonly supported by terminals so it should work over USB and UART as well. Related to #6174
2022-06-06 19:54:02 -04:00
ifeq ($(CIRCUITPY_WEB_WORKFLOW),1)
WIP websocket to serial
2022-07-01 19:57:10 -04:00
SRC_SUPERVISOR += supervisor/shared/web_workflow/web_workflow.c \
supervisor/shared/web_workflow/websocket.c
Static files + welcome page
2022-06-23 19:32:42 -04:00
SRC_SUPERVISOR += $(BUILD)/autogen_web_workflow_static.c
Wi-Fi autoconnect and title bar status This adds support for CIRCUITPY_WIFI_SSID and CIRCUITPY_WIFI_PASSWORD in `/.env`. When both are defined, CircuitPython will attempt to connect to the network even when user code isn't running. If the user code attempts to a network with the same SSID, it will return immediately. Connecting to another SSID will disconnect from the auto-connected network. If the user code initiates the connection, then it will be shutdown after user code exits. (Should match <8 behavior.) This PR also reworks the default displayio terminal. It now supports a title bar TileGrid in addition to the (newly renamed) scroll area. The default title bar is the top row of the display and is positioned to the right of the Blinka logo when it is enabled. The scroll area is now below the Blinka logo. The Wi-Fi auto-connect code now uses the title bar to show its state including the IP address when connected. It does this through the "standard" OSC control sequence `ESC ] 0 ; <s> ESC \` where <s> is the title bar string. This is commonly supported by terminals so it should work over USB and UART as well. Related to #6174
2022-06-06 19:54:02 -04:00
endif
More missing-prototypes fixes
2021-11-10 13:22:07 -05:00
SRC_TINYUSB = $(filter lib/tinyusb/%.c, $(SRC_SUPERVISOR))
$(patsubst %.c,$(BUILD)/%.o,$(SRC_TINYUSB)): CFLAGS += -Wno-missing-prototypes
Initial ESP32S2 port. Basic blinky works but doesn't check pins.
2020-04-17 19:23:28 -04:00
SUPERVISOR_O = $(addprefix $(BUILD)/, $(SRC_SUPERVISOR:.c=.o))
ifeq ($(CIRCUITPY_DISPLAYIO), 1)
wip
2021-02-12 19:01:14 -05:00
SRC_SUPERVISOR += \
supervisor/shared/display.c
Initial ESP32S2 port. Basic blinky works but doesn't check pins.
2020-04-17 19:23:28 -04:00
Fix builds with displayio but not terminalio
2022-08-04 17:53:49 -04:00
# Include the display resources because it includes the Blinka logo as well.
SUPERVISOR_O += $(BUILD)/autogen_display_resources-$(TRANSLATION).o
Initial ESP32S2 port. Basic blinky works but doesn't check pins.
2020-04-17 19:23:28 -04:00
endif
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
wip: compiles
2021-04-27 14:37:36 -04:00
# Preserve double quotes in these values by single-quoting them.
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
USB_INTERFACE_NAME ?= "CircuitPython"
wip: compiles
2021-04-27 14:37:36 -04:00
CFLAGS += -DUSB_INTERFACE_NAME='$(USB_INTERFACE_NAME)'
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
ifneq ($(USB_VID),)
CFLAGS += -DUSB_VID=$(USB_VID)
wip: compiles
2021-04-27 14:37:36 -04:00
CFLAGS += -DUSB_PID=$(USB_PID)
CFLAGS += -DUSB_MANUFACTURER='$(USB_MANUFACTURER)'
MSC, CDC, HID keyboard definitely working
2021-04-29 17:41:43 -04:00
USB_MANUFACTURER_8 := "$(shell echo $(USB_MANUFACTURER) | cut -c 1-8)"
# Length-limited versions of strings for MSC names.
CFLAGS += -DUSB_MANUFACTURER_8='$(USB_MANUFACTURER_8)'
USB_PRODUCT_16 := "$(shell echo $(USB_PRODUCT) | cut -c 1-16)"
CFLAGS += -DUSB_PRODUCT_16='$(USB_PRODUCT_16)'
wip: compiles
2021-04-27 14:37:36 -04:00
CFLAGS += -DUSB_PRODUCT='$(USB_PRODUCT)'
MSC, CDC, HID keyboard definitely working
2021-04-29 17:41:43 -04:00
Allow boards to change the "CircuitPython" text in their USB interface description. In cases where more than one board is connected to a single computer it can become pretty hard to figure out which board you're actually talking to. For example, if you have several MIDI-compatible boards they all show up as "CircuitPython MIDI". This change allows boards to replace the "CircuitPython" part of their USB descriptors with more specific text, for example, "CircuitPython Feather" or just "Feather". This will let folks more easily tell boards apart. The new option is named `USB_INTERFACE_NAME` and is available in `mkconfigboard.mk`. For example: ``` USB_INTERFACE_NAME = "Feather" ```
2019-11-12 16:29:35 -05:00
endif
Changed URL
2021-02-04 17:31:18 -05:00
# In the following URL, don't include the https:// prefix.
# It gets added automatically.
merge from upstream; complicated webusb merge
2021-02-11 18:50:02 -05:00
USB_WEBUSB_URL ?= "circuitpython.org"
Most of the code we need has been pulled in from the tinyusb webusb_serial demo. Still LOTS to do regarding descriptors.
2021-01-25 21:37:58 -05:00
wip
2021-02-12 19:01:14 -05:00
ifeq ($(CIRCUITPY_USB_CDC),1)
wip: compiles
2021-04-27 14:37:36 -04:00
# Inform TinyUSB there will be up to two CDC devices.
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
CFLAGS += -DCFG_TUD_CDC=2
Add an alternative way to number the USB endpoints Two options available: - relative numbering (USB_RELATIVE_EP_NUM = 1) - default - absolute numbering (USB_RELATIVE_EP_NUM = 0) - new!
2019-10-01 04:00:32 -04:00
endif
usb descriptors all set; rework of enabling for USB devices
2021-02-04 19:23:40 -05:00
USB_HIGHSPEED ?= 0
MSC, CDC, HID keyboard definitely working
2021-04-29 17:41:43 -04:00
CFLAGS += -DUSB_HIGHSPEED=$(USB_HIGHSPEED)
use only one endpoint pair for MSC except on SAMD21
2019-09-04 21:45:16 -04:00
Move compressed strings into own object file This breaks the translation dependency to all of the other objects and therefore speeds up subsequent builds. Now, even when the big translate() function is inlined in the header, it only needs to be optimized once.
2022-06-02 14:48:56 -04:00
$(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/compression.generated.h
Move atmel-samd to tinyusb and support nRF flash. This started while adding USB MIDI support (and descriptor support is in this change.) When seeing that I'd have to implement the MIDI class logic twice, once for atmel-samd and once for nrf, I decided to refactor the USB stack so its shared across ports. This has led to a number of changes that remove items from the ports folder and move them into supervisor. Furthermore, we had external SPI flash support for nrf pending so I factored out the connection between the usb stack and the flash API as well. This PR also includes the QSPI support for nRF.
2018-10-19 21:46:22 -04:00
Update font location and shrink a bunch of builds
2019-04-12 18:25:48 -04:00
CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf"
Begin font parsing and packing for terminal
2019-01-24 20:25:08 -05:00
Fix display resources build qstrdefs.generated.h no longer includes the translated strings. So, use the .po file directly.
2022-06-02 15:26:42 -04:00
$(BUILD)/autogen_display_resources-$(TRANSLATION).c: ../../tools/gen_display_resources.py $(TOP)/locale/$(TRANSLATION).po Makefile | $(HEADER_BUILD)
Begin font parsing and packing for terminal
2019-01-24 20:25:08 -05:00
$(STEPECHO) "GEN $@"
$(Q)install -d $(BUILD)/genhdr
Always use python3 .. similar to https://github.com/micropython/micropython/pull/4448
2021-10-15 15:59:04 -04:00
$(Q)$(PYTHON) ../../tools/gen_display_resources.py \
Begin font parsing and packing for terminal
2019-01-24 20:25:08 -05:00
--font $(CIRCUITPY_DISPLAY_FONT) \
Fix display resources build qstrdefs.generated.h no longer includes the translated strings. So, use the .po file directly.
2022-06-02 15:26:42 -04:00
--sample_file $(TOP)/locale/$(TRANSLATION).po \
Static files + welcome page
2022-06-23 19:32:42 -04:00
--output_c_file $@
Reference in New Issue Copy Permalink