Build refinement to handle warnings and quiet output
This commit is contained in:
parent
9d91111b1b
commit
168e23e466
|
@ -1 +1 @@
|
||||||
Subproject commit 30e3c64134789416e10ed867fa12c210b808e98f
|
Subproject commit 537a29273c08b1e047004e1bd71c37af82937dd4
|
4
py/py.mk
4
py/py.mk
|
@ -307,7 +307,7 @@ $(HEADER_BUILD)/qstrdefs.preprocessed.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(QSTR_DEF
|
||||||
# qstr data
|
# qstr data
|
||||||
$(HEADER_BUILD)/qstrdefs.enum.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h
|
$(HEADER_BUILD)/qstrdefs.enum.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h
|
||||||
$(STEPECHO) "GEN $@"
|
$(STEPECHO) "GEN $@"
|
||||||
$(PYTHON3) $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
|
$(Q)$(PYTHON3) $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
|
||||||
|
|
||||||
# Adding an order only dependency on $(HEADER_BUILD) causes $(HEADER_BUILD) to get
|
# Adding an order only dependency on $(HEADER_BUILD) causes $(HEADER_BUILD) to get
|
||||||
# created before we run the script to generate the .h
|
# created before we run the script to generate the .h
|
||||||
|
@ -315,7 +315,7 @@ $(HEADER_BUILD)/qstrdefs.enum.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrd
|
||||||
# the lines in "" and then unwrap after the preprocessor is finished.
|
# the lines in "" and then unwrap after the preprocessor is finished.
|
||||||
$(HEADER_BUILD)/qstrdefs.generated.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h
|
$(HEADER_BUILD)/qstrdefs.generated.h: $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h
|
||||||
$(STEPECHO) "GEN $@"
|
$(STEPECHO) "GEN $@"
|
||||||
$(PYTHON3) $(PY_SRC)/makeqstrdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
|
$(Q)$(PYTHON3) $(PY_SRC)/makeqstrdata.py --compression_filename $(HEADER_BUILD)/compression.generated.h --translation $(HEADER_BUILD)/$(TRANSLATION).mo $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
|
||||||
|
|
||||||
$(PY_BUILD)/qstr.o: $(HEADER_BUILD)/qstrdefs.generated.h
|
$(PY_BUILD)/qstr.o: $(HEADER_BUILD)/qstrdefs.generated.h
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ static uint8_t digitizer_report_buffer[USB_HID_REPORT_LENGTH_DIGITIZER];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
usb_hid_device_obj_t usb_hid_devices[] = {
|
usb_hid_device_obj_t usb_hid_devices[] = {
|
||||||
#if USB_HID_REPORT_ID_KEYBOARD
|
#ifdef USB_HID_REPORT_ID_KEYBOARD
|
||||||
{
|
{
|
||||||
.base = { .type = &usb_hid_device_type } ,
|
.base = { .type = &usb_hid_device_type } ,
|
||||||
.report_buffer = keyboard_report_buffer ,
|
.report_buffer = keyboard_report_buffer ,
|
||||||
|
@ -69,7 +69,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if USB_HID_REPORT_ID_MOUSE
|
#ifdef USB_HID_REPORT_ID_MOUSE
|
||||||
{
|
{
|
||||||
.base = { .type = &usb_hid_device_type } ,
|
.base = { .type = &usb_hid_device_type } ,
|
||||||
.report_buffer = mouse_report_buffer ,
|
.report_buffer = mouse_report_buffer ,
|
||||||
|
@ -80,7 +80,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if USB_HID_REPORT_ID_CONSUMER
|
#ifdef USB_HID_REPORT_ID_CONSUMER
|
||||||
{
|
{
|
||||||
.base = { .type = &usb_hid_device_type } ,
|
.base = { .type = &usb_hid_device_type } ,
|
||||||
.report_buffer = consumer_report_buffer ,
|
.report_buffer = consumer_report_buffer ,
|
||||||
|
@ -91,7 +91,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if USB_HID_REPORT_ID_SYS_CONTROL
|
#ifdef USB_HID_REPORT_ID_SYS_CONTROL
|
||||||
{
|
{
|
||||||
.base = { .type = &usb_hid_device_type } ,
|
.base = { .type = &usb_hid_device_type } ,
|
||||||
.report_buffer = sys_control_report_buffer ,
|
.report_buffer = sys_control_report_buffer ,
|
||||||
|
@ -102,7 +102,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if USB_HID_REPORT_ID_GAMEPAD
|
#ifdef USB_HID_REPORT_ID_GAMEPAD
|
||||||
{
|
{
|
||||||
.base = { .type = &usb_hid_device_type } ,
|
.base = { .type = &usb_hid_device_type } ,
|
||||||
.report_buffer = gamepad_report_buffer ,
|
.report_buffer = gamepad_report_buffer ,
|
||||||
|
@ -113,7 +113,7 @@ usb_hid_device_obj_t usb_hid_devices[] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if USB_HID_REPORT_ID_DIGITIZER
|
#ifdef USB_HID_REPORT_ID_DIGITIZER
|
||||||
{
|
{
|
||||||
.base = { .type = &usb_hid_device_type } ,
|
.base = { .type = &usb_hid_device_type } ,
|
||||||
.report_buffer = digitizer_report_buffer ,
|
.report_buffer = digitizer_report_buffer ,
|
||||||
|
|
|
@ -75,6 +75,7 @@
|
||||||
#define CFG_TUD_CDC 1
|
#define CFG_TUD_CDC 1
|
||||||
#define CFG_TUD_MSC 1
|
#define CFG_TUD_MSC 1
|
||||||
#define CFG_TUD_HID 1
|
#define CFG_TUD_HID 1
|
||||||
|
#define CFG_TUD_CUSTOM_CLASS 0
|
||||||
|
|
||||||
/*------------------------------------------------------------------*/
|
/*------------------------------------------------------------------*/
|
||||||
/* CLASS DRIVER
|
/* CLASS DRIVER
|
||||||
|
|
|
@ -66,10 +66,14 @@ SUPERVISOR_O = $(addprefix $(BUILD)/, $(SRC_SUPERVISOR:.c=.o))
|
||||||
|
|
||||||
$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h
|
$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h
|
||||||
|
|
||||||
$(BUILD)/autogen_usb_descriptor.c $(BUILD)/genhdr/autogen_usb_descriptor.h: ../../tools/gen_usb_descriptor.py Makefile | $(HEADER_BUILD)
|
$(BUILD)/autogen_usb_descriptor.c $(BUILD)/genhdr/autogen_usb_descriptor.h: autogen_usb_descriptor.intermediate
|
||||||
|
|
||||||
|
.INTERMEDIATE: autogen_usb_descriptor.intermediate
|
||||||
|
|
||||||
|
autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile | $(HEADER_BUILD)
|
||||||
$(STEPECHO) "GEN $@"
|
$(STEPECHO) "GEN $@"
|
||||||
$(Q)install -d $(BUILD)/genhdr
|
$(Q)install -d $(BUILD)/genhdr
|
||||||
$(PYTHON3) ../../tools/gen_usb_descriptor.py \
|
$(Q)$(PYTHON3) ../../tools/gen_usb_descriptor.py \
|
||||||
--manufacturer $(USB_MANUFACTURER)\
|
--manufacturer $(USB_MANUFACTURER)\
|
||||||
--product $(USB_PRODUCT)\
|
--product $(USB_PRODUCT)\
|
||||||
--vid $(USB_VID)\
|
--vid $(USB_VID)\
|
||||||
|
|
Loading…
Reference in New Issue