pointing_device data-driven: fix schema, order, add extended_mouse_re…

…port + motion_active_low
qmk · Aug 17, 2023 · f0315be · f0315be
1 parent 49c6103
commit f0315be
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
@@ -86,6 +86,7 @@
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
 
     // Mouse Keys
+    "MOUSE_EXTENDED_REPORT": {"info_key": "pointing_device.extended_mouse_report", "value_type": "bool"},
     "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"},
     "MOUSEKEY_INTERVAL": {"info_key": "mousekey.interval", "value_type": "int"},
     "MOUSEKEY_MAX_SPEED": {"info_key": "mousekey.max_speed", "value_type": "int"},

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
@@ -420,21 +420,17 @@
             "properties": {
                 "enabled": {"type": "boolean"},
                 "driver": {"type": "string"},
-                "auto_mouse":  {
-                    "type": "object",
-                    "properties": {
-                        "enabled": {"type": "boolean"},
-                        "default_layer": {"type":  "qmk.definitions.v1#/unsigned_int_8"},
-                        "time": {"type":  "qmk.definitions.v1#/unsigned_int"},
-                        "delay": {"type":  "qmk.definitions.v1#/unsigned_int"},
-                        "debounce": {"type":  "qmk.definitions.v1#/unsigned_int"}
-                    }
-                }
+                "rotation": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "enum": [0, 90, 180, 270]
+                },
                 "pins": {
                     "type": "object",
                     "additionalProperties": false,
                     "properties": {
                         "motion": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                        "motion_active_low": {"type": "boolean"},
                         "cs": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                         "sdio": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                         "sclk": {"$ref": "qmk.definitions.v1#/mcu_pin"}
@@ -450,10 +446,16 @@
                         "scroll": {"type": "boolean"}
                     }
                 },
-                "rotation": {
-                    "type": "integer",
-                    "minimum": 0,
-                    "enum": [0, 90, 180, 270]
+                "extended_mouse_report": {"type": "boolean"},
+                "auto_mouse":  {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {"type": "boolean"},
+                        "default_layer": {"type":  "qmk.definitions.v1#/unsigned_int_8"},
+                        "time": {"type":  "qmk.definitions.v1#/unsigned_int"},
+                        "delay": {"type":  "qmk.definitions.v1#/unsigned_int"},
+                        "debounce": {"type":  "qmk.definitions.v1#/unsigned_int"}
+                    }
                 }
             }
         },
@@ -666,22 +668,21 @@
                     "enum": ["eeprom", "left", "matrix_grid", "pin", "right"]
                 },
                 "pointing_device": {
+                    "side": {
+                        "type": "string",
+                        "enum": ["left", "right", "combined"]
+                    },
                     "right": {
                         "type": "object",
                         "additionalProperties": false,
-                        "type": "object",
                         "properties": {
-                            "side": {
-                                "type": "string",
-                                "enum": ["left", "right", "combined"]
-                            },
-                            "invert_x": {"type": "boolean"},
-                            "invert_y": {"type": "boolean"},
                             "rotation": {
                                 "type": "integer",
                                 "minimum": 0,
                                 "enum": [0, 90, 180, 270]
-                            }
+                            },
+                            "invert_x": {"type": "boolean"},
+                            "invert_y": {"type": "boolean"}
                         }
                     }
                 },

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
@@ -129,10 +129,8 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):
 
 
 def generate_pointing_device_config(pointing_device_json, config_h_lines, postfix=''):
-
     rotation = pointing_device_json.get('rotation', 0)
-
-    generate_define(f'POINTING_DEVICE_ROTATION_{rotation}{postfix}')
+    config_h_lines.append(generate_define(f'POINTING_DEVICE_ROTATION_{rotation}{postfix}'))
 
 
 def generate_split_config(kb_info_json, config_h_lines):
@@ -165,6 +163,9 @@ def generate_split_config(kb_info_json, config_h_lines):
     if 'right' in kb_info_json['split'].get('encoder', {}):
         generate_encoder_config(kb_info_json['split']['encoder']['right'], config_h_lines, '_RIGHT')
 
+    if 'side' in kb_info_json['split'].get('pointing_device', {}):
+        s = kb_info_json['split']['pointing_device']['side']
+        config_h_lines.append(generate_define('POINTING_DEVICE_' + s.upper()))
     if 'right' in kb_info_json['split'].get('pointing_device', {}):
         generate_pointing_device_config(kb_info_json['split']['pointing_device']['right'], config_h_lines, '_RIGHT')