Merge 355c4c4e64 into 85a7627641

Digitizer: fix units tag in report descriptor (#24482 )
[murcielago] Enable split watchdog
2024-10-15 07:26:34 -07:00 · 2024-10-15 07:05:43 -07:00 · 2024-10-10 11:31:13 +02:00
4 changed files with 19 additions and 2 deletions
--- a/keyboards/murcielago/rev1/config.h
+++ b/keyboards/murcielago/rev1/config.h
@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* split options, use EEPROM for side detection */
 #define EE_HANDS
 #define SPLIT_USB_DETECT
 #define SPLIT_WATCHDOG_ENABLE
 /*
 * Feature disable options
--- a/keyboards/murcielago/rev1/keymaps/default/keymap.c
+++ b/keyboards/murcielago/rev1/keymaps/default/keymap.c
@ -1,3 +1,19 @@
 /*
 Copyright 2020 elagil
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
 (at your option) any later version.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 enum layers {
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@ -281,7 +281,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
@ -659,7 +659,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
Thomas Queste	54fcb59be1	Merge `355c4c4e64` into `85a7627641`	2024-10-15 07:26:34 -07:00
Ryan	85a7627641	Digitizer: fix units tag in report descriptor (#24482 )	2024-10-15 07:05:43 -07:00
Thomas Queste	355c4c4e64	[murcielago] Enable split watchdog	2024-10-10 11:31:13 +02:00