From 796fc3f5abd856848829fc58861c2a69d42c684f Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 12 Apr 2019 15:25:48 -0700 Subject: Update font location and shrink a bunch of builds --- supervisor/shared/usb/usb.c | 2 ++ supervisor/supervisor.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'supervisor') 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 b56249406..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/default-font/new-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 $@" -- cgit v1.2.3