Skip to content

Commit 168e23e

Browse files
tannewttannewt
committed
Build refinement to handle warnings and quiet output
1 parent 9d91111 commit 168e23e

5 files changed

Lines changed: 16 additions & 11 deletions

File tree

‎lib/tinyusb‎

‎py/py.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,15 @@ $(HEADER_BUILD)/qstrdefs.preprocessed.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(QSTR_DEF
307307
# qstr data
308308
$(HEADER_BUILD)/qstrdefs.enum.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h
309309
$(STEPECHO) "GEN $@"
310-
$(PYTHON3) $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
310+
$(Q)$(PYTHON3) $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
311311

312312
# Adding an order only dependency on $(HEADER_BUILD) causes $(HEADER_BUILD) to get
313313
# created before we run the script to generate the .h
314314
# Note: we need to protect the qstr names from the preprocessor, so we wrap
315315
# the lines in "" and then unwrap after the preprocessor is finished.
316316
$(HEADER_BUILD)/qstrdefs.generated.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h
317317
$(STEPECHO) "GEN $@"
318-
$(PYTHON3) $(PY_SRC)/makeqstrdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
318+
$(Q)$(PYTHON3) $(PY_SRC)/makeqstrdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
319319

320320
$(PY_BUILD)/qstr.o: $(HEADER_BUILD)/qstrdefs.generated.h
321321

‎shared-module/usb_hid/__init__.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static uint8_t digitizer_report_buffer[USB_HID_REPORT_LENGTH_DIGITIZER];
5858
#endif
5959

6060
usb_hid_device_obj_t usb_hid_devices[] = {
61-
#if USB_HID_REPORT_ID_KEYBOARD
61+
#ifdef USB_HID_REPORT_ID_KEYBOARD
6262
{
6363
.base = { .type = &usb_hid_device_type } ,
6464
.report_buffer = keyboard_report_buffer ,
@@ -69,7 +69,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
6969
},
7070
#endif
7171

72-
#if USB_HID_REPORT_ID_MOUSE
72+
#ifdef USB_HID_REPORT_ID_MOUSE
7373
{
7474
.base = { .type = &usb_hid_device_type } ,
7575
.report_buffer = mouse_report_buffer ,
@@ -80,7 +80,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
8080
},
8181
#endif
8282

83-
#if USB_HID_REPORT_ID_CONSUMER
83+
#ifdef USB_HID_REPORT_ID_CONSUMER
8484
{
8585
.base = { .type = &usb_hid_device_type } ,
8686
.report_buffer = consumer_report_buffer ,
@@ -91,7 +91,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
9191
},
9292
#endif
9393

94-
#if USB_HID_REPORT_ID_SYS_CONTROL
94+
#ifdef USB_HID_REPORT_ID_SYS_CONTROL
9595
{
9696
.base = { .type = &usb_hid_device_type } ,
9797
.report_buffer = sys_control_report_buffer ,
@@ -102,7 +102,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
102102
},
103103
#endif
104104

105-
#if USB_HID_REPORT_ID_GAMEPAD
105+
#ifdef USB_HID_REPORT_ID_GAMEPAD
106106
{
107107
.base = { .type = &usb_hid_device_type } ,
108108
.report_buffer = gamepad_report_buffer ,
@@ -113,7 +113,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
113113
},
114114
#endif
115115

116-
#if USB_HID_REPORT_ID_DIGITIZER
116+
#ifdef USB_HID_REPORT_ID_DIGITIZER
117117
{
118118
.base = { .type = &usb_hid_device_type } ,
119119
.report_buffer = digitizer_report_buffer ,

‎supervisor/shared/usb/tusb_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
#define CFG_TUD_CDC 1
7676
#define CFG_TUD_MSC 1
7777
#define CFG_TUD_HID 1
78+
#define CFG_TUD_CUSTOM_CLASS 0
7879

7980
/*------------------------------------------------------------------*/
8081
/* CLASS DRIVER

‎supervisor/supervisor.mk‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,14 @@ SUPERVISOR_O = $(addprefix $(BUILD)/, $(SRC_SUPERVISOR:.c=.o))
6666

6767
$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h
6868

69-
$(BUILD)/autogen_usb_descriptor.c $(BUILD)/genhdr/autogen_usb_descriptor.h: ../../tools/gen_usb_descriptor.py Makefile | $(HEADER_BUILD)
69+
$(BUILD)/autogen_usb_descriptor.c $(BUILD)/genhdr/autogen_usb_descriptor.h: autogen_usb_descriptor.intermediate
70+
71+
.INTERMEDIATE: autogen_usb_descriptor.intermediate
72+
73+
autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile | $(HEADER_BUILD)
7074
$(STEPECHO) "GEN $@"
7175
$(Q)install -d $(BUILD)/genhdr
72-
$(PYTHON3) ../../tools/gen_usb_descriptor.py \
76+
$(Q)$(PYTHON3) ../../tools/gen_usb_descriptor.py \
7377
--manufacturer $(USB_MANUFACTURER)\
7478
--product $(USB_PRODUCT)\
7579
--vid $(USB_VID)\

0 commit comments

Comments
 (0)