Merge remote-tracking branch 'origin/develop' into xap

data/mappings/info_rules.hjson

@@ -23,6 +23,7 @@
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "ENCODER_DRIVER": {"info_key": "encoder.driver"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
+    "HAPTIC_DRIVER": {"info_key": "haptic.driver"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
     "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},

data/schemas/keyboard.jsonschema

@@ -387,6 +387,15 @@
                 }
             }
         },
+        "haptic": {
+            "type": "object",
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["drv2605l", "solenoid"]
+                }
+            }
+        },
         "leader_key": {
             "type": "object",
             "properties": {