freznel10
diff --git a/‎.vscode/.cortex-debug.peripherals.state.json
Lines changed: 1 addition & 0 deletions b/‎.vscode/.cortex-debug.peripherals.state.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎.vscode/.cortex-debug.registers.state.json
Lines changed: 1 addition & 0 deletions b/‎.vscode/.cortex-debug.registers.state.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎.vscode/settings.json
Lines changed: 17 additions & 2 deletions b/‎.vscode/settings.json
Lines changed: 17 additions & 2 deletions
diff --git a/‎builddefs/common_features.mk
Lines changed: 2 additions & 42 deletions b/‎builddefs/common_features.mk
Lines changed: 2 additions & 42 deletions
diff --git a/‎data/constants/keycodes/keycodes_0.0.1.hjson
Lines changed: 1 addition & 2 deletions b/‎data/constants/keycodes/keycodes_0.0.1.hjson
Lines changed: 1 addition & 2 deletions
diff --git a/‎data/constants/keycodes/keycodes_0.0.2.hjson
Lines changed: 0 additions & 3 deletions b/‎data/constants/keycodes/keycodes_0.0.2.hjson
Lines changed: 0 additions & 3 deletions
diff --git a/‎data/constants/keycodes/keycodes_0.0.3.hjson
Lines changed: 13 additions & 0 deletions b/‎data/constants/keycodes/keycodes_0.0.3.hjson
Lines changed: 13 additions & 0 deletions
diff --git a/‎data/constants/keycodes/keycodes_0.0.3_pointing_mode_util.hjson
Lines changed: 28 additions & 0 deletions b/‎data/constants/keycodes/keycodes_0.0.3_pointing_mode_util.hjson
Lines changed: 28 additions & 0 deletions
diff --git a/‎data/schemas/keyboard.jsonschema
Lines changed: 0 additions & 1 deletion b/‎data/schemas/keyboard.jsonschema
Lines changed: 0 additions & 1 deletion
diff --git a/‎docs/feature_joystick.md
Lines changed: 2 additions & 2 deletions b/‎docs/feature_joystick.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎docs/feature_layers.md
Lines changed: 2 additions & 2 deletions b/‎docs/feature_layers.md
Lines changed: 2 additions & 2 deletions
@@ -0,0 +1 @@
+[]
@@ -0,0 +1 @@
+[]
@@ -18,7 +18,9 @@
         "xstddef": "c",
         "type_traits": "c",
         "utility": "c",
-        "ranges": "c"
+        "ranges": "c",
+        "*.def": "c",
+        "apds": "c"
     },
     "[markdown]": {
         "editor.trimAutoWhitespace": false,
@@ -27,5 +29,18 @@
     "python.formatting.provider": "yapf",
     "[json]": {
 	    "editor.formatOnSave": false
-    }
+    },
+    "terminal.integrated.profiles.windows": {
+        "QMK_MSYS": {
+            "path": "C:/QMK_MSYS/usr/bin/bash.exe",
+            "env": {
+                "MSYSTEM": "MINGW64",
+                "CHERE_INVOKING": "1"
+            },
+            "args": ["--login"]
+        }
+    },
+
+    "terminal.integrated.cursorStyle": "line",
+    "cmake.sourceDirectory": "${workspaceFolder}/lib/googletest"
 }
@@ -134,49 +134,9 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/mousekey.c
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
+POINTING_DEVICE_ENABLE ?= no
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
-    ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
-        $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
-    else
-        OPT_DEFS += -DPOINTING_DEVICE_ENABLE
-        MOUSE_ENABLE := yes
-        VPATH += $(QUANTUM_DIR)/pointing_device
-        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c
-        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c
-        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_auto_mouse.c
-        ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom)
-            SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
-            OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
-        endif
-        OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(POINTING_DEVICE_DRIVER))
-        ifeq ($(strip $(POINTING_DEVICE_DRIVER)), adns9800)
-            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
-            QUANTUM_LIB_SRC += spi_master.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), analog_joystick)
-            OPT_DEFS += -DSTM32_ADC -DHAL_USE_ADC=TRUE
-            LIB_SRC += analog.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_i2c)
-            OPT_DEFS += -DSTM32_I2C -DHAL_USE_I2C=TRUE
-            SRC += drivers/sensors/cirque_pinnacle.c
-            SRC += drivers/sensors/cirque_pinnacle_gestures.c
-            SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
-            QUANTUM_LIB_SRC += i2c_master.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_spi)
-            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
-            SRC += drivers/sensors/cirque_pinnacle.c
-            SRC += drivers/sensors/cirque_pinnacle_gestures.c
-            SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
-            QUANTUM_LIB_SRC += spi_master.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
-            OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE
-            QUANTUM_LIB_SRC += i2c_master.c
-        else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)
-            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
-            SRC += drivers/sensors/pmw33xx_common.c
-            QUANTUM_LIB_SRC += spi_master.c
-        endif
-    endif
+    include $(QUANTUM_DIR)/pointing_device/rules.mk
 endif
 
 QUANTUM_PAINTER_ENABLE ?= no
 
@@ -36,7 +36,6 @@
         "0x52C0/0x001F": {
             "define": "QK_LAYER_TAP_TOGGLE"
         },
-        // 0x52E0/0x001F - UNUSED
         // 0x5300/0x02FF - UNUSED
         "0x5600/0x00FF": {
             "define": "QK_SWAP_HANDS"
@@ -93,4 +92,4 @@
             "key": "SAFE_RANGE"
         }
     }
-}
+}
@@ -1,8 +1,5 @@
 {
     "ranges": {
-        "0x7E00/0x00FF": "!delete!",
-        "0x7F00/0x00FF": "!delete!",
-
         "0x7E00/0x003F": {
             "define": "QK_KB"
         },
 
@@ -0,0 +1,13 @@
+{
+    "ranges": {
+        "0x52E0/0x000F": {
+            "define": "QK_POINTING_MODE_MO"
+        },
+        "0x52F0/0x000F": {
+            "define": "QK_POINTING_MODE_TG"
+        },
+        "0x5300/0x0002": {
+            "define": "QK_POINTING_MODE_UTIL"
+        }
+    }
+}
@@ -0,0 +1,28 @@
+{
+    "keycodes": {
+        "0x5300": {
+            "group": "pointing_mode_util",
+            "key": "QK_PM_CYCLE_DEVICES",
+            "label": "Cycle pointing mode device",
+            "aliases": [
+                "PMR_CYD"
+            ]
+        },
+        "0x5301": {
+            "group": "pointing_mode_util",
+            "key": "QK_PM_DEVICE_RIGHT",
+            "label": "Set pointing mode device to PM_RIGHT_SIDE",
+            "aliases": [
+                "PMR_RGHT"
+            ]
+        },
+        "0x5302": {
+            "group": "pointing_mode_util",
+            "key": "QK_PM_DEVICE_LEFT",
+            "label": "Set pointing mode device to PM_LEFT_SIDE",
+            "aliases": [
+                "PMR_LEFT"
+            ]
+        }
+    }
+}
@@ -190,7 +190,6 @@
                 "stm32-dfu",
                 "stm32duino",
                 "tinyuf2",
-                "uf2boot",
                 "unknown",
                 "usbasploader",
                 "wb32-dfu"
 
@@ -40,7 +40,7 @@ When defining axes for your joystick, you must provide a definition array typica
 For instance, the below example configures two axes. The X axis is read from the `A4` pin. With the default axis resolution of 8 bits, the range of values between 900 and 575 are scaled to -127 through 0, and values 575 to 285 are scaled to 0 through 127. The Y axis is configured as a virtual axis, and its value is not read from any pin. Instead, the user must update the axis value programmatically.
 
 ```c
-joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
     JOYSTICK_AXIS_IN(A4, 900, 575, 285),
     JOYSTICK_AXIS_VIRTUAL
 };
@@ -64,7 +64,7 @@ The `low` and `high` values can be swapped to effectively invert the axis.
 The following example adjusts two virtual axes (X and Y) based on keypad presses, with `KC_P0` as a precision modifier:
 
 ```c
-joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
     JOYSTICK_AXIS_VIRTUAL, // x
     JOYSTICK_AXIS_VIRTUAL  // y
 };
 
@@ -59,7 +59,7 @@ There are a number of functions (and variables) related to how you can use or ma
 
 |Function                                      |Description                                                                                              |
 |----------------------------------------------|---------------------------------------------------------------------------------------------------------|
-| `layer_state_set(layer_mask)`                | Directly sets the layer state (avoid unless you know what you are doing).                               |
+| `layer_state_set(layer_mask)`                | Directly sets the layer state (recommended, do not use unless you know what you are doing).             |
 | `layer_clear()`                              | Clears all layers (turns them all off).                                                                 |
 | `layer_move(layer)`                          | Turns specified layer on, and all other layers off.                                                     |
 | `layer_on(layer)`                            | Turns specified layer on, leaves all other layers in existing state.                                    |
@@ -69,7 +69,7 @@ There are a number of functions (and variables) related to how you can use or ma
 | `layer_and(layer_mask)`                      | Turns on layers based on matching enabled bits between specifed layer and existing layer state.         |
 | `layer_xor(layer_mask)`                      | Turns on layers based on non-matching bits between specifed layer and existing layer state.             |
 | `layer_debug(layer_mask)`                    | Prints out the current bit mask and highest active layer to debugger console.                           |
-| `default_layer_set(layer_mask)`              | Directly sets the default layer state (avoid unless you know what you are doing).                       |
+| `default_layer_set(layer_mask)`              | Directly sets the default layer state (recommended, do not use unless you know what you are doing).     |
 | `default_layer_or(layer_mask)`               | Turns on layers based on matching bits between specifed layer and existing default layer state.         |
 | `default_layer_and(layer_mask)`              | Turns on layers based on matching enabled bits between specifed layer and existing default layer state. |
 | `default_layer_xor(layer_mask)`              | Turns on layers based on non-matching bits between specifed layer and existing default layer state.     |
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`"0x52C0/0x001F": {`
`37`	`37`	`"define": "QK_LAYER_TAP_TOGGLE"`
`38`	`38`	`},`
`39`		`- // 0x52E0/0x001F - UNUSED`
`40`	`39`	`// 0x5300/0x02FF - UNUSED`
`41`	`40`	`"0x5600/0x00FF": {`
`42`	`41`	`"define": "QK_SWAP_HANDS"`
`@@ -93,4 +92,4 @@`
`93`	`92`	`"key": "SAFE_RANGE"`
`94`	`93`	`}`
`95`	`94`	`}`
`96`		`-}`
	`95`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"ranges": {`
`3`		`- "0x7E00/0x00FF": "!delete!",`
`4`		`- "0x7F00/0x00FF": "!delete!",`
`5`		`-`
`6`	`3`	`"0x7E00/0x003F": {`
`7`	`4`	`"define": "QK_KB"`
`8`	`5`	`},`