aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/constants/keycodes/keycodes_0.0.4.hjson0
-rw-r--r--data/constants/keycodes/keycodes_0.0.4_lighting.hjson67
-rw-r--r--data/mappings/info_config.hjson5
-rw-r--r--data/mappings/info_rules.hjson4
-rw-r--r--data/mappings/keyboard_aliases.hjson7
-rw-r--r--data/schemas/keyboard.jsonschema31
-rw-r--r--data/templates/keyboard/config.h20
-rw-r--r--data/templates/keyboard/keyboard.json (renamed from data/templates/keyboard/info.json)0
-rw-r--r--data/templates/keyboard/rules.mk1
9 files changed, 110 insertions, 25 deletions
diff --git a/data/constants/keycodes/keycodes_0.0.4.hjson b/data/constants/keycodes/keycodes_0.0.4.hjson
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.4.hjson
diff --git a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson
new file mode 100644
index 0000000000..d7b27230f3
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson
@@ -0,0 +1,67 @@
+{
+ "keycodes": {
+ "0x7810": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_ON",
+ "aliases": [
+ "LM_ON"
+ ]
+ },
+ "0x7811": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_OFF",
+ "aliases": [
+ "LM_OFF"
+ ]
+ },
+ "0x7812": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_TOGGLE",
+ "aliases": [
+ "LM_TOGG"
+ ]
+ },
+ "0x7813": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_MODE_NEXT",
+ "aliases": [
+ "LM_NEXT"
+ ]
+ },
+ "0x7814": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_MODE_PREVIOUS",
+ "aliases": [
+ "LM_PREV"
+ ]
+ },
+ "0x7815": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_BRIGHTNESS_UP",
+ "aliases": [
+ "LM_BRIU"
+ ]
+ },
+ "0x7816": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN",
+ "aliases": [
+ "LM_BRID"
+ ]
+ },
+ "0x7817": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_SPEED_UP",
+ "aliases": [
+ "LM_SPDU"
+ ]
+ },
+ "0x7818": {
+ "group": "led_matrix",
+ "key": "QK_LED_MATRIX_SPEED_DOWN",
+ "aliases": [
+ "LM_SPDD"
+ ]
+ }
+ }
+}
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index e2e9569372..b61ca04071 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -19,6 +19,8 @@
// Audio
"AUDIO_DEFAULT_ON": {"info_key": "audio.default.on", "value_type": "bool"},
"AUDIO_DEFAULT_CLICKY_ON": {"info_key": "audio.default.clicky", "value_type": "bool"},
+ "AUDIO_POWER_CONTROL_PIN": {"info_key": "audio.power_control.pin"},
+ "AUDIO_POWER_CONTROL_PIN_ON_STATE": {"info_key": "audio.power_control.on_state", "value_type": "int" },
"AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "flag"},
"SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "flag"},
@@ -162,7 +164,6 @@
"RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"},
"RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"},
"RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"},
- "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"},
// Secure
"SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
@@ -213,6 +214,7 @@
"WS2812_DI_PIN": {"info_key": "ws2812.pin"},
"WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"},
"WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"},
+ "WS2812_RGBW": {"info_key": "ws2812.rgbw", "value_type": "flag"},
"LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"},
@@ -227,6 +229,7 @@
"PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
"QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
"RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
+ "RGBW": {"info_key": "rgblight.rgbw", "invalid": true, "replace_with": "WS2812_RGBW"},
"RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"},
"RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true},
"TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index fc25eb3328..97611bcf58 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -11,6 +11,7 @@
// invalid: Default `false`. Set to `true` to generate errors when a value exists
// replace_with: use with a key marked deprecated or invalid to designate a replacement
+ "AUDIO_DRIVER": {"info_key": "audio.driver"},
"BACKLIGHT_DRIVER": {"info_key": "backlight.driver"},
"BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
"BOARD": {"info_key": "board"},
@@ -23,6 +24,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"},
@@ -43,7 +45,7 @@
"SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
"STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
"STENO_PROTOCOL": {"info_key": "stenography.protocol"},
- "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
+ "USB_WAIT_FOR_ENUMERATION": {"info_key": "usb.wait_for_enumeration", "value_type": "bool"},
"WEAR_LEVELING_DRIVER": {"info_key": "eeprom.wear_leveling.driver"},
"WS2812_DRIVER": {"info_key": "ws2812.driver"},
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 29a7a719f3..7421b8bfac 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1518,5 +1518,12 @@
// Moved during 2023 Q4 cycle
"ymdk/melody96": {
"target": "ymdk/melody96/soldered"
+ },
+ // Moved during 2024 Q2 cycle
+ "kprepublic/jj40": {
+ "target": "kprepublic/jj40/rev1"
+ },
+ "kprepublic/jj50": {
+ "target": "kprepublic/jj50/rev1"
}
}
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 340eb64ba1..de01809b43 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -133,8 +133,20 @@
"clicky": {"type": "boolean"}
}
},
+ "driver": {
+ "type": "string",
+ "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"]
+ },
"macro_beep": {"type": "boolean"},
"pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
+ "power_control": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "on_state": {"$ref": "qmk.definitions.v1#/bit"},
+ "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}
+ }
+ },
"voices": {"type": "boolean"}
}
},
@@ -379,6 +391,15 @@
}
}
},
+ "haptic": {
+ "type": "object",
+ "properties": {
+ "driver": {
+ "type": "string",
+ "enum": ["drv2605l", "solenoid"]
+ }
+ }
+ },
"leader_key": {
"type": "object",
"properties": {
@@ -445,6 +466,7 @@
"enum": [
"custom",
"is31fl3218",
+ "is31fl3236",
"is31fl3729",
"is31fl3731",
"is31fl3733",
@@ -527,6 +549,7 @@
"aw20216s",
"custom",
"is31fl3218",
+ "is31fl3236",
"is31fl3729",
"is31fl3731",
"is31fl3733",
@@ -638,7 +661,10 @@
"$ref": "qmk.definitions.v1#/mcu_pin",
"$comment": "Deprecated: use ws2812.pin instead"
},
- "rgbw": {"type": "boolean"},
+ "rgbw": {
+ "type": "boolean",
+ "$comment": "Deprecated: use ws2812.rgbw instead"
+ },
"saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"sleep": {"type": "boolean"},
"split": {"type": "boolean"},
@@ -875,7 +901,7 @@
}
},
"suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
- "wait_for": {"type": "boolean"}
+ "wait_for_enumeration": {"type": "boolean"}
}
},
"qmk": {
@@ -914,6 +940,7 @@
"enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"]
},
"pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+ "rgbw": {"type": "boolean"},
"i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"},
"i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
}
diff --git a/data/templates/keyboard/config.h b/data/templates/keyboard/config.h
deleted file mode 100644
index b15c8d31f1..0000000000
--- a/data/templates/keyboard/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright %YEAR% %REAL_NAME% (@%USER_NAME%)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/keyboard.json
index 65f935fb42..65f935fb42 100644
--- a/data/templates/keyboard/info.json
+++ b/data/templates/keyboard/keyboard.json
diff --git a/data/templates/keyboard/rules.mk b/data/templates/keyboard/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/data/templates/keyboard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank