Merge pull request #35 from ilc/duplo

Duplo - The realization of Lego.
svalboard · May 14, 2024 · 961417b · 961417b
2 parents e0dbdac + 2c0a618
commit 961417b
Show file tree

Hide file tree

Showing 52 changed files with 354 additions and 1,583 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,6 +19,6 @@ jobs:
       side: ${{ matrix.side }}
     strategy:
       matrix:
-        keyboard: [ svalboard/trackpoint, svalboard, svalboard/trackball, svalboard/ballpoint, svalboard/pointball ]
+        keyboard: [ svalboard/trackpoint, svalboard, svalboard/trackball ]
         keymap: [ vial ]
         side: [ left, right ]
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
@@ -120,7 +120,8 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     MOUSE_ENABLE := yes
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3320 pmw3360 pmw3389 pimoroni_trackball ps2_mouse custom
+CUSTOM_TYPES := custom ps2_mouse
 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)
@@ -131,7 +132,7 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         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)
+        ifeq ($(filter $(POINTING_DEVICE_DRIVER), $(CUSTOM_TYPES)),)
             SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
             OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
         endif
@@ -157,6 +158,9 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)
             SPI_DRIVER_REQUIRED = yes
             SRC += drivers/sensors/pmw33xx_common.c
+        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), ps2_mouse)
+            PS2_ENABLE := yes
+            SRC += drivers/ps2/ps2_mouse.c
         endif
     endif
 endif
@@ -796,10 +800,7 @@ ifeq ($(strip $(UNICODE_COMMON)), yes)
 endif
 
 ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
-    PS2_ENABLE := yes
-    MOUSE_ENABLE := yes
-    SRC += ps2_mouse.c
-    OPT_DEFS += -DPS2_MOUSE_ENABLE
+    $(call CATASTROPHIC_ERROR,PS2_MOUSE has migrated to pointing device,Please see docs/feature_pointing_device.md for more information.)
 endif
 
 VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor

diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
@@ -63,7 +63,6 @@ OTHER_OPTION_NAMES = \
   LCD_BACKLIGHT_ENABLE \
   MACROS_ENABLED \
   PS2_ENABLE \
-  PS2_MOUSE_ENABLE \
   PS2_DRIVER \
   RAW_ENABLE \
   SWAP_HANDS_ENABLE \

diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
@@ -35,7 +35,6 @@
     "PLATFORM_KEY": {"info_key": "platform_key", "to_json": false},
     "PS2_DRIVER": {"info_key": "ps2.driver"},
     "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
-    "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
     "RGBLIGHT_DRIVER": {"info_key": "rgblight.driver"},
     "SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
@@ -51,4 +50,5 @@
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
     "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
     "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true}
+    "PS2_MOUSE_ENABLE": {"info_key": "_invalid.ps2.mouse_enabled", "inivalid": true},
 }
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
@@ -690,7 +690,6 @@
             "additionalProperties": false,
             "properties": {
                 "enabled": {"type": "boolean"},
-                "mouse_enabled": {"type": "boolean"},
                 "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "driver": {