Merge 08a3218585 into 7e53bb9965

Merge remote-tracking branch 'origin/master' into develop
Digitizer: fix units tag in report descriptor (#24482 )
2024-10-15 21:51:24 +01:00 · 2024-10-15 14:06:17 +00:00 · 2024-10-15 07:05:43 -07:00 · 2023-04-08 17:18:59 +02:00 · 2023-04-08 11:45:38 +02:00
3 changed files with 10 additions and 2 deletions
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@ -262,3 +262,11 @@ endif
 ifeq ($(strip $(QUANTUM_PAINTER_LVGL_INTEGRATION)), yes)
    include $(QUANTUM_DIR)/painter/lvgl/rules.mk
 endif
+
+# add every keyboard-, keymap-, or user- level fonts and images
+QP_DIRS := $(KEYBOARD_PATHS) $(KEYMAP_PATH) $(USER_PATH)
+QP_FONTS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/fonts/*.qff.c))
+QP_IMGS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/images/*.qgf.c))
+SRC += $(QP_FONTS) $(QP_IMGS)
+
+# TODO: generate a header file (with CLI) which includes all the headers found
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@ -305,7 +305,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
            HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF),
            HID_RI_REPORT_COUNT(8, 0x02),
            HID_RI_REPORT_SIZE(8, 0x10),
-            HID_RI_UNIT(8, 0x33),          // Inch, English Linear
+            HID_RI_UNIT(8, 0x13),          // Inch, English Linear
            HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
        HID_RI_END_COLLECTION(0),
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@ -673,7 +673,7 @@ const PROGMEM uchar shared_hid_report[] = {
    0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
    0x95, 0x02,       //     Report Count (2)
    0x75, 0x10,       //     Report Size (16)
-    0x65, 0x33,       //     Unit (Inch, English Linear)
+    0x65, 0x13,       //     Unit (Inch, English Linear)
    0x55, 0x0E,       //     Unit Exponent (-2)
    0x81, 0x02,       //     Input (Data, Variable, Absolute)
    0xC0,             //   End Collection
Author	SHA1	Message	Date
Pablo Martínez	7e989bce99	Merge `08a3218585` into `7e53bb9965`	2024-10-15 21:51:24 +01:00
QMK Bot	7e53bb9965	Merge remote-tracking branch 'origin/master' into develop	2024-10-15 14:06:17 +00:00
Ryan	85a7627641	Digitizer: fix units tag in report descriptor (#24482 )	2024-10-15 07:05:43 -07:00
elpekenin	08a3218585	Move to painter's mk	2023-04-08 17:18:59 +02:00
elpekenin	7b56f31ace	Initial code	2023-04-08 11:45:38 +02:00