From ace0603f4f060783ea91c224c0caec6c1b799f15 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 5 Mar 2022 00:25:24 +1100 Subject: Change data driven "str" type to represent a quoted string literal (#16516) * Change data driven "str" type to represent a quoted string literal * Update docs --- data/mappings/info_config.json | 2 +- data/mappings/info_rules.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/mappings') diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index cfe8807d43..6c55f11647 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -3,7 +3,7 @@ { # Format: # : {"info_key": , ["value_type": ], ["to_json": ], ["to_c": ]} - # 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 diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json index aea67e04c8..f03cadcd44 100644 --- a/data/mappings/info_rules.json +++ b/data/mappings/info_rules.json @@ -3,7 +3,7 @@ { # Format: # : {"info_key": , ["value_type": ], ["to_json": ], ["to_c": ]} - # 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 @@ -20,6 +20,6 @@ "MOUSEKEY_ENABLE": {"info_key": "mouse_key.enabled", "value_type": "bool"}, "NO_USB_STARTUP_CHECK": {"info_key": "usb.no_startup_check", "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"} } -- cgit v1.2.3 From 7d41639d549c7db0763d6769a089794b6050c99f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 5 Mar 2022 11:20:34 +1100 Subject: Map data driven `DESCRIPTION` as string literal (#16523) --- data/mappings/info_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/mappings') diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index 6c55f11647..2121741d19 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -17,7 +17,7 @@ "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"}, "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"}, -- cgit v1.2.3 From c0ac3f73724154c02cc5072f7651294d4e9a2366 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 3 Apr 2022 18:45:10 +0100 Subject: Add frameworking for development board presets (#16637) * Add frameworking for development board presets * Update lib/python/qmk/info.py Co-authored-by: Nick Brassel Co-authored-by: Nick Brassel --- data/mappings/defaults.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/mappings/defaults.json (limited to 'data/mappings') diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json new file mode 100644 index 0000000000..d3643fede8 --- /dev/null +++ b/data/mappings/defaults.json @@ -0,0 +1,17 @@ +{ + "development_board": { + "promicro": { + "processor": "atmega32u4", + "bootloader": "caterina" + }, + "elite_c": { + "processor": "atmega32u4", + "bootloader": "atmel-dfu" + }, + "proton_c": { + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" + } + } +} \ No newline at end of file -- cgit v1.2.3 From 45504bb0949f4bddd5679bde0076f10512303e3a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 6 Apr 2022 01:08:38 +0100 Subject: Add mechanism to limit available converters (#16783) --- data/mappings/defaults.json | 9 ++++++--- data/mappings/info_rules.json | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'data/mappings') diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json index d3643fede8..3d3d915c0e 100644 --- a/data/mappings/defaults.json +++ b/data/mappings/defaults.json @@ -2,16 +2,19 @@ "development_board": { "promicro": { "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "pin_compatible": "promicro" }, "elite_c": { "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "pin_compatible": "promicro" }, "proton_c": { "processor": "STM32F303", "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "board": "QMK_PROTON_C", + "pin_compatible": "promicro" } } } \ No newline at end of file diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json index f03cadcd44..237e9f1024 100644 --- a/data/mappings/info_rules.json +++ b/data/mappings/info_rules.json @@ -19,6 +19,7 @@ "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"}, "SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"}, "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false}, "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"} -- cgit v1.2.3 From d8707164578790e7b4aed9767431013b6ded40cb Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 6 Apr 2022 15:46:13 +0100 Subject: Add bluepill/blackpill development board presets (#16806) --- data/mappings/defaults.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/defaults.json b/data/mappings/defaults.json index 3d3d915c0e..e62ab688d6 100644 --- a/data/mappings/defaults.json +++ b/data/mappings/defaults.json @@ -15,6 +15,21 @@ "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 -- cgit v1.2.3 From 92a61aa0cd9a28056e6979f01a72b8742702dbfe Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 16 Apr 2022 19:13:05 +0100 Subject: Implement XAP 'secure' core requirements (#16843) Co-authored-by: Drashna Jaelre Co-authored-by: Stefan Kerkmann --- data/mappings/info_config.json | 3 +++ data/mappings/info_rules.json | 1 + 2 files changed, 4 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index 2121741d19..02ad3226c2 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -78,6 +78,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 237e9f1024..4b0fde5629 100644 --- a/data/mappings/info_rules.json +++ b/data/mappings/info_rules.json @@ -20,6 +20,7 @@ "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", "to_c": false}, "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"} -- cgit v1.2.3 From 68b16bba68d79c63bbd649a5be58756e937c96da Mon Sep 17 00:00:00 2001 From: Pascal Getreuer <50221757+getreuer@users.noreply.github.com> Date: Fri, 13 May 2022 23:00:32 -0700 Subject: [Core] Add Caps Word feature to core (#16588) Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: Drashna Jaelre --- data/mappings/info_config.json | 3 +++ data/mappings/info_rules.json | 1 + 2 files changed, 4 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index 02ad3226c2..d9f96b5892 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -11,6 +11,8 @@ "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"}, @@ -19,6 +21,7 @@ #"DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"}, "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"}, diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json index 4b0fde5629..a8b39afbd1 100644 --- a/data/mappings/info_rules.json +++ b/data/mappings/info_rules.json @@ -10,6 +10,7 @@ "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"}, -- cgit v1.2.3 From 83fa6fe916bfd7d337f05d7805f0a51ad86c8b43 Mon Sep 17 00:00:00 2001 From: GloriousThrall <74627436+GloriousThrall@users.noreply.github.com> Date: Thu, 19 May 2022 19:47:22 -0500 Subject: Move GMMK Pro to allow for multiple revisions (#16423) * Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility. * GMMK PRO MCU Updates only (removed other kbs) * fix problems * Optimize the code. * Update form develop branch * Update * Updater from qmk/develop * Update * Update config.h * Update config.h * Remove gmmk pro rev2 * move moults31/keymap.c * Update * tidy up Co-authored-by: Joy Co-authored-by: zvecr --- data/mappings/keyboard_aliases.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'data/mappings') diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json index 343812718e..87b9e6af68 100644 --- a/data/mappings/keyboard_aliases.json +++ b/data/mappings/keyboard_aliases.json @@ -165,7 +165,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' -- cgit v1.2.3 From cbc68dfd21ec5c93dce682d9f63c94fc01853ca8 Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 24 May 2022 02:20:12 +0100 Subject: Update keyboard aliases --- data/mappings/keyboard_aliases.json | 78 +++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) (limited to 'data/mappings') diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json index 87b9e6af68..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' }, @@ -218,6 +239,9 @@ 'helix/rev2/under/oled': { target: 'helix/rev2/under' }, + honeycomb: { + target: 'keyhive/honeycomb' + }, id80: { target: 'id80/ansi' }, @@ -266,6 +290,9 @@ 'kyria': { target: 'splitkb/kyria' }, + lattice60: { + target: 'keyhive/lattice60' + }, 'lazydesigners/the60': { target: 'lazydesigners/the60/rev1' }, @@ -398,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' @@ -495,6 +528,12 @@ skog: { target: 'percent/skog' }, + smallice: { + target: 'keyhive/smallice' + }, + southpole: { + target: 'keyhive/southpole' + }, speedo: { target: 'cozykeys/speedo/v2' }, @@ -583,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' @@ -910,6 +952,9 @@ meishi2: { target: 'biacco42/meishi2' }, + melody96: { + target: 'ymdk/melody96' + }, minidox/rev1: { target: 'maple_computing/minidox/rev1' }, @@ -925,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' }, @@ -949,6 +1006,9 @@ namecard2x4: { target: 'takashiski/namecard2x4' }, + navi10: { + target: 'keyhive/navi10' + }, nebula12: { target: 'spaceholdings/nebula12' }, @@ -1150,6 +1210,12 @@ underscore33/rev2: { target: 'tominabox1/underscore33/rev2' }, + uno: { + target: 'keyhive/uno' + }, + ut472: { + target: 'keyhive/ut472' + }, vn66: { target: 'hnahkb/vn66' }, @@ -1159,6 +1225,12 @@ wanten: { target: 'qpockets/wanten' }, + 'wheatfield/blocked65': { + target: 'mt/blocked65' + }, + 'wheatfield/split75': { + target: 'mt/split75' + }, whitefox: { target: 'input_club/whitefox' }, -- cgit v1.2.3