diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-04-12 20:36:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 20:36:59 -0400 |
| commit | f8473f4a3917f7816fccd1be2a67041a7dfce5ef (patch) | |
| tree | 77513b415d116ec45c5ec62e959d5f73962ffc6d /supervisor | |
| parent | c064deaaf5a80dab681027aaf09e058a760dbf01 (diff) | |
| parent | defc6dceb0c018bc67a4041f91a2f277eebb4dbc (diff) | |
Merge pull request #1788 from tannewt/pinyin4.0.0-beta.7
Add Chinese (Pinyin) and slim down boards so it fits
Diffstat (limited to 'supervisor')
| -rw-r--r-- | supervisor/shared/usb/usb.c | 2 | ||||
| -rw-r--r-- | supervisor/supervisor.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c index 02a5da6c5..0678a3a3f 100644 --- a/supervisor/shared/usb/usb.c +++ b/supervisor/shared/usb/usb.c @@ -70,7 +70,9 @@ void usb_init(void) { tud_cdc_set_wanted_char(CHAR_CTRL_C); #endif +#if CIRCUITPY_USB_MIDI usb_midi_init(); +#endif } void usb_background(void) { diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index f94f19353..2d50e7a8b 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -101,7 +101,7 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile --output_c_file $(BUILD)/autogen_usb_descriptor.c\ --output_h_file $(BUILD)/genhdr/autogen_usb_descriptor.h -CIRCUITPY_DISPLAY_FONT ?= "../../tools/Tecate-bitmap-fonts/bitmap/terminus-font-4.39/ter-u12n.bdf" +CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf" $(BUILD)/autogen_display_resources.c: ../../tools/gen_display_resources.py $(HEADER_BUILD)/qstrdefs.generated.h Makefile | $(HEADER_BUILD) $(STEPECHO) "GEN $@" |