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.hjson2
-rw-r--r--data/mappings/keyboard_aliases.hjson7
-rw-r--r--data/schemas/keyboard.jsonschema10
-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
8 files changed, 86 insertions, 21 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..c0417b8839 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"},
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..25aaabcf4a 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -135,6 +135,14 @@
},
"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"}
}
},
@@ -445,6 +453,7 @@
"enum": [
"custom",
"is31fl3218",
+ "is31fl3236",
"is31fl3729",
"is31fl3731",
"is31fl3733",
@@ -527,6 +536,7 @@
"aw20216s",
"custom",
"is31fl3218",
+ "is31fl3236",
"is31fl3729",
"is31fl3731",
"is31fl3733",
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