summaryrefslogtreecommitdiffstats
path: root/data/mappings
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-05-29 07:57:11 +1000
committerNick Brassel <nick@tzarc.org>2022-05-29 07:57:11 +1000
commitb835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch)
treede22c239cc47556f8be7538f95f48ad75b86d110 /data/mappings
parentf5d091a9d58c8349437e9d52de87294258cbd256 (diff)
parent0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff)
Merge branch 'develop' -- breaking changes 2022-05-28.
Diffstat (limited to 'data/mappings')
-rw-r--r--data/mappings/defaults.json35
-rw-r--r--data/mappings/info_config.json10
-rw-r--r--data/mappings/info_rules.json7
-rw-r--r--data/mappings/keyboard_aliases.json86
4 files changed, 130 insertions, 8 deletions
diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json
new file mode 100644
index 0000000000..e62ab688d6
--- /dev/null
+++ b/data/mappings/defaults.json
@@ -0,0 +1,35 @@
+{
+ "development_board": {
+ "promicro": {
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "pin_compatible": "promicro"
+ },
+ "elite_c": {
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "pin_compatible": "promicro"
+ },
+ "proton_c": {
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
+ "pin_compatible": "promicro"
+ },
+ "bluepill": {
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "board": "STM32_F103_STM32DUINO"
+ },
+ "blackpill_f401": {
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "board": "BLACKPILL_STM32_F401"
+ },
+ "blackpill_f411": {
+ "processor": "STM32F411",
+ "bootloader": "stm32-dfu",
+ "board": "BLACKPILL_STM32_F411"
+ }
+ }
+} \ No newline at end of file
diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index cfe8807d43..d9f96b5892 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -3,7 +3,7 @@
{
# Format:
# <config.h key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
- # value_type: one of "array", "array.int", "bool", "int", "hex", "list", "mapping"
+ # value_type: one of "array", "array.int", "bool", "int", "hex", "list", "mapping", "str", "raw"
# to_json: Default `true`. Set to `false` to exclude this mapping from info.json
# to_c: Default `true`. Set to `false` to exclude this mapping from config.h
# warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
@@ -11,14 +11,17 @@
"BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
"BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
"BACKLIGHT_PIN": {"info_key": "backlight.pin"},
+ "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
+ "CAPS_WORD_IDLE_TIMEOUT": {"info_key": "caps_word.idle_timeout", "value_type": "int"},
"COMBO_COUNT": {"info_key": "combo.count", "value_type": "int"},
"COMBO_TERM": {"info_key": "combo.term", "value_type": "int"},
"DEBOUNCE": {"info_key": "debounce", "value_type": "int"},
"DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"},
# TODO: Replace ^^^ with vvv
#"DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"},
- "DESCRIPTION": {"info_key": "keyboard_folder", "to_json": false},
+ "DESCRIPTION": {"info_key": "keyboard_folder", "value_type": "str", "to_json": false},
"DIODE_DIRECTION": {"info_key": "diode_direction"},
+ "DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.double_tap_shift_turns_on", "value_type": "bool"},
"FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"},
"DYNAMIC_KEYMAP_EEPROM_MAX_ADDR": {"info_key": "dynamic_keymap.eeprom_max_addr", "value_type": "int"},
"DYNAMIC_KEYMAP_LAYER_COUNT": {"info_key": "dynamic_keymap.layer_count", "value_type": "int"},
@@ -78,6 +81,9 @@
"QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int"},
"QMK_LED": {"info_key": "qmk_lufa_bootloader.led"},
"QMK_SPEAKER": {"info_key": "qmk_lufa_bootloader.speaker"},
+ "SECURE_UNLOCK_SEQUENCE": {"info_key": "secure.unlock_sequence", "value_type": "array.array.int", "to_json": false},
+ "SECURE_UNLOCK_TIMEOUT": {"info_key": "secure.unlock_timeout", "value_type": "int"},
+ "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
"SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "bool"},
"SPLIT_MODS_ENABLE": {"info_key": "split.transport.sync_modifiers", "value_type": "bool"},
"SPLIT_TRANSPORT_MIRROR": {"info_key": "split.transport.sync_matrix_state", "value_type": "bool"},
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
index aea67e04c8..a8b39afbd1 100644
--- a/data/mappings/info_rules.json
+++ b/data/mappings/info_rules.json
@@ -3,13 +3,14 @@
{
# Format:
# <rules.mk key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
- # value_type: one of "array", "array.int", "bool", "int", "list", "hex", "mapping"
+ # value_type: one of "array", "array.int", "bool", "int", "list", "hex", "mapping", "str", "raw"
# to_json: Default `true`. Set to `false` to exclude this mapping from info.json
# to_c: Default `true`. Set to `false` to exclude this mapping from rules.mk
# warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
"BOARD": {"info_key": "board"},
"BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
"BLUETOOTH": {"info_key": "bluetooth.driver"},
+ "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
"FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
"KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
"MOUSE_SHARED_EP": {"info_key": "usb.shared_endpoint.mouse", "value_type": "bool"},
@@ -19,7 +20,9 @@
"MCU": {"info_key": "processor", "warn_duplicate": false},
"MOUSEKEY_ENABLE": {"info_key": "mouse_key.enabled", "value_type": "bool"},
"NO_USB_STARTUP_CHECK": {"info_key": "usb.no_startup_check", "value_type": "bool"},
+ "PIN_COMPATIBLE": {"info_key": "pin_compatible"},
+ "SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
"SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
- "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "value_type": "str", "to_c": false},
+ "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
"WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"}
}
diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 343812718e..93be17cf81 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -11,6 +11,9 @@
'2_milk': {
target: 'spaceman/2_milk'
},
+ 'absinthe': {
+ target: 'keyhive/absinthe'
+ },
'aeboards/constellation': {
target: 'aeboards/constellation/rev1'
},
@@ -26,6 +29,18 @@
alice: {
target: 'tgr/alice'
},
+ amj40: {
+ target: 'amjkeyboard/amj40'
+ },
+ amj60: {
+ target: 'amjkeyboard/amj60'
+ },
+ amj96: {
+ target: 'amjkeyboard/amj96'
+ },
+ amjpad: {
+ target: 'amjkeyboard/amjpad'
+ },
angel17: {
target: 'angel17/alpha'
},
@@ -33,7 +48,10 @@
target: 'angel64/alpha'
},
at101_blackheart: {
- target: 'at101_bh'
+ target: 'viktus/at101_bh'
+ },
+ at101_bh: {
+ target: 'viktus/at101_bh'
},
'atom47/rev2': {
target: 'maartenwut/atom47/rev2'
@@ -158,6 +176,9 @@
ergoinu: {
target: 'dm9records/ergoinu'
},
+ ergosaurus: {
+ target: 'keyhive/ergosaurus'
+ },
'exclusive/e85': {
target: 'exclusive/e85/hotswap'
},
@@ -165,7 +186,13 @@
target: 'gh60/revc'
},
'gmmk/pro': {
- target: 'gmmk/pro/ansi'
+ target: 'gmmk/pro/rev1/ansi'
+ },
+ 'gmmk/pro/ansi': {
+ target: 'gmmk/pro/rev1/ansi'
+ },
+ 'gmmk/pro/iso': {
+ target: 'gmmk/pro/rev1/iso'
},
'handwired/ferris': {
target: 'ferris/0_1'
@@ -212,6 +239,9 @@
'helix/rev2/under/oled': {
target: 'helix/rev2/under'
},
+ honeycomb: {
+ target: 'keyhive/honeycomb'
+ },
id80: {
target: 'id80/ansi'
},
@@ -260,6 +290,9 @@
'kyria': {
target: 'splitkb/kyria'
},
+ lattice60: {
+ target: 'keyhive/lattice60'
+ },
'lazydesigners/the60': {
target: 'lazydesigners/the60/rev1'
},
@@ -392,7 +425,13 @@
target: 'oddball/v1'
},
omnikey_blackheart: {
- target: 'omnikey_bh'
+ target: 'viktus/omnikey_bh'
+ },
+ omnikey_bh: {
+ target: 'viktus/omnikey_bh'
+ },
+ opus: {
+ target: 'keyhive/opus'
},
'pabile/p20': {
target: 'pabile/p20/ver1'
@@ -489,6 +528,12 @@
skog: {
target: 'percent/skog'
},
+ smallice: {
+ target: 'keyhive/smallice'
+ },
+ southpole: {
+ target: 'keyhive/southpole'
+ },
speedo: {
target: 'cozykeys/speedo/v2'
},
@@ -577,7 +622,10 @@
target: 'ymd75/rev1'
},
z150_blackheart: {
- target: 'z150_bh'
+ target: 'viktus/z150_bh'
+ },
+ z150_bh:{
+ target: 'viktus/z150_bh'
},
zeal60: {
target: 'wilba_tech/zeal60'
@@ -904,6 +952,9 @@
meishi2: {
target: 'biacco42/meishi2'
},
+ melody96: {
+ target: 'ymdk/melody96'
+ },
minidox/rev1: {
target: 'maple_computing/minidox/rev1'
},
@@ -919,6 +970,18 @@
montex: {
target: 'idobao/montex/v1'
},
+ mt40: {
+ target: 'mt/mt40'
+ },
+ mt64rgb: {
+ target: 'mt/mt64rgb'
+ },
+ mt84: {
+ target: 'mt/mt84'
+ },
+ mt980: {
+ target: 'mt/mt980'
+ },
nafuda: {
target: 'salicylic_acid3/nafuda'
},
@@ -943,6 +1006,9 @@
namecard2x4: {
target: 'takashiski/namecard2x4'
},
+ navi10: {
+ target: 'keyhive/navi10'
+ },
nebula12: {
target: 'spaceholdings/nebula12'
},
@@ -1144,6 +1210,12 @@
underscore33/rev2: {
target: 'tominabox1/underscore33/rev2'
},
+ uno: {
+ target: 'keyhive/uno'
+ },
+ ut472: {
+ target: 'keyhive/ut472'
+ },
vn66: {
target: 'hnahkb/vn66'
},
@@ -1153,6 +1225,12 @@
wanten: {
target: 'qpockets/wanten'
},
+ 'wheatfield/blocked65': {
+ target: 'mt/blocked65'
+ },
+ 'wheatfield/split75': {
+ target: 'mt/split75'
+ },
whitefox: {
target: 'input_club/whitefox'
},