From c952458c780baf425d3717e29f8004486b5637e8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 30 Nov 2022 04:27:21 +0000 Subject: DD bootmagic config (#19201) * DD bootmagic config * Also enable * docs --- data/mappings/info_config.hjson | 4 ++++ data/mappings/info_rules.hjson | 1 + 2 files changed, 5 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index c1c01ff70f..a97e77a794 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -18,6 +18,10 @@ "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"}, "BACKLIGHT_PIN": {"info_key": "backlight.pin"}, "BACKLIGHT_PINS": {"info_key": "backlight.pins", "value_type": "array"}, + "BOOTMAGIC_LITE_ROW": {"info_key": "bootmagic.matrix.0", "value_type": "int"}, + "BOOTMAGIC_LITE_COLUMN": {"info_key": "bootmagic.matrix.1", "value_type": "int"}, + "BOOTMAGIC_LITE_ROW_RIGHT": {"info_key": "split.bootmagic.matrix.0", "value_type": "int"}, + "BOOTMAGIC_LITE_COLUMN_RIGHT": {"info_key": "split.bootmagic.matrix.1", "value_type": "int"}, "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"}, diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index 2f8656c4bf..b020d0c813 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -12,6 +12,7 @@ // replace_with: use with a key marked deprecated or invalid to designate a replacement "BOARD": {"info_key": "board"}, "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false}, + "BOOTMAGIC_ENABLE": {"info_key": "bootmagic.enabled", "value_type": "bool"}, "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"}, "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"}, "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"}, -- cgit v1.2.3 From 50661ab65cc04c6400cd20037181dabba1872c86 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 1 Dec 2022 13:06:45 -0800 Subject: Remove RGBLIGHT_ANIMATIONS from core (+cleanup) (#19216) --- data/mappings/info_config.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/mappings') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index a97e77a794..8f7b34d41a 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -126,7 +126,7 @@ "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, "replace_with": "DEBOUNCE"}, "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true}, "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true}, - "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true}, + "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "bool", "invalid": true}, "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, // USB params, need to mark as failure when specified in config.h, rather than deprecated -- cgit v1.2.3 From f2a8a13dbad220cfb0dfbd72a90492a15a2e58bb Mon Sep 17 00:00:00 2001 From: dexter93 Date: Thu, 8 Dec 2022 18:09:01 +0200 Subject: Core: Support inverted scan logic for optical switches (#19053) --- data/mappings/info_config.hjson | 1 + 1 file changed, 1 insertion(+) (limited to 'data/mappings') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 8f7b34d41a..414439d6e7 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -55,6 +55,7 @@ "LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"}, "LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"}, "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"}, + "MATRIX_INPUT_PRESSED_STATE": {"info_key": "matrix_pins.input_pressed_state", "value_type": "int"}, "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"}, "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"}, "MOUSEKEY_INTERVAL": {"info_key": "mousekey.interval", "value_type": "int"}, -- cgit v1.2.3 From cbabc8dbe6a8476d3082e8bc649d330f87e7b904 Mon Sep 17 00:00:00 2001 From: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Mon, 12 Dec 2022 23:52:22 +0800 Subject: [Core] Replace Tapping Force Hold feature with Quick Tap Term (#17007) * Replace Tapping Force Hold feature with Quick Tap Term * Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0 * Deprecate force hold in info_config.json * Before and after quick tap term unit tests * Quick tap unit tests iteration * Keymap config.h correction * Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed * Add two more test cases for quick tap * Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2 * Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2 * Add function declaration for get_quick_tap_term Co-authored-by: Stefan Kerkmann --- data/mappings/info_config.hjson | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/mappings') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 414439d6e7..479b1579da 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -111,8 +111,6 @@ "SOFT_SERIAL_SPEED": {"info_key": "split.soft_serial_speed"}, "TAP_CODE_DELAY": {"info_key": "qmk.tap_keycode_delay", "value_type": "int"}, "TAP_HOLD_CAPS_DELAY": {"info_key": "qmk.tap_capslock_delay", "value_type": "int"}, - "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool"}, - "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool"}, "TAPPING_TERM": {"info_key": "tapping.term", "value_type": "int"}, "TAPPING_TERM_PER_KEY": {"info_key": "tapping.term_per_key", "value_type": "bool"}, "TAPPING_TOGGLE": {"info_key": "tapping.toggle", "value_type": "int"}, @@ -129,6 +127,8 @@ "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true}, "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "bool", "invalid": true}, "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, + "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true}, + "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true}, // USB params, need to mark as failure when specified in config.h, rather than deprecated "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"}, -- cgit v1.2.3 From 515dd18c2801663bbac0e59f683c2a93e4bd9b1a Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:20:07 +0100 Subject: Remove IGNORE_MOD_TAP_INTERRUPT_PER_KEY in favour of HOLD_ON_OTHER_KEY_PRESS_PER_KEY (#15741) --- data/mappings/info_config.hjson | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/mappings') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 479b1579da..7645598c77 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -32,8 +32,6 @@ "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"}, - "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "tapping.ignore_mod_tap_interrupt", "value_type": "bool"}, - "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "tapping.ignore_mod_tap_interrupt_per_key", "value_type": "bool"}, "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "bool"}, "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "bool"}, "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"}, @@ -129,6 +127,8 @@ "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true}, "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true}, + "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_deprecated.ignore_mod_tap_interrupt", "value_type": "bool", "deprecated": true}, + "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true} // USB params, need to mark as failure when specified in config.h, rather than deprecated "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"}, -- cgit v1.2.3 From e11235ee14f9cd3fc45b836eec99ed312cb137dd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 11 Jan 2023 02:13:32 +0000 Subject: De-duplicate platform detection (#19545) --- data/mappings/info_rules.hjson | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index b020d0c813..c409da04c6 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -38,6 +38,8 @@ "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"}, "PS2_DRIVER": {"info_key": "ps2.driver"}, + "PLATFORM_KEY": {"info_key": "platform_key", "to_json": false}, + // Items we want flagged in lint "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"}, "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"}, -- cgit v1.2.3 From 46c85c93f05003ecc9d5b9266bc78e98cc7a843b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 11 Jan 2023 19:58:27 +0000 Subject: Revert "De-duplicate platform detection (#19545)" (#19564) This reverts commit e11235ee14f9cd3fc45b836eec99ed312cb137dd. --- data/mappings/info_rules.hjson | 2 -- 1 file changed, 2 deletions(-) (limited to 'data/mappings') diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index c409da04c6..b020d0c813 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -38,8 +38,6 @@ "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"}, "PS2_DRIVER": {"info_key": "ps2.driver"}, - "PLATFORM_KEY": {"info_key": "platform_key", "to_json": false}, - // Items we want flagged in lint "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"}, "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"}, -- cgit v1.2.3 From 0ce3f6bcfe8241e51dd6936d24e6a88c907c535d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 19 Jan 2023 00:27:00 +0000 Subject: De-duplicate platform detection (#19603) --- data/mappings/info_rules.hjson | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index b020d0c813..c409da04c6 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -38,6 +38,8 @@ "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"}, "PS2_DRIVER": {"info_key": "ps2.driver"}, + "PLATFORM_KEY": {"info_key": "platform_key", "to_json": false}, + // Items we want flagged in lint "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"}, "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"}, -- cgit v1.2.3 From df3c9a54015616d31ae0f55afb7b326bd6c300e6 Mon Sep 17 00:00:00 2001 From: Ramon Imbao Date: Thu, 9 Feb 2023 11:05:21 +0800 Subject: Rename ramonimbao folder to rmi_kb (#19699) Co-authored-by: Joel Challis --- data/mappings/keyboard_aliases.hjson | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 78a85ef6e7..4295d0700c 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -1060,6 +1060,48 @@ "rabbit_capture_plan": { "target": "kakunpc/rabbit_capture_plan" }, + "ramonimbao/aelith": { + "target": "rmi_kb/aelith" + }, + "ramonimbao/chevron": { + "target": "rmi_kb/chevron" + }, + "ramonimbao/herringbone/pro": { + "target": "rmi_kb/herringbone/pro" + }, + "ramonimbao/herringbone/v1": { + "target": "rmi_kb/herringbone/v1" + }, + "ramonimbao/mona/v1": { + "target": "rmi_kb/mona/v1" + }, + "ramonimbao/mona/v1_1": { + "target": "rmi_kb/mona/v1_1" + }, + "ramonimbao/mona/v32a": { + "target": "rmi_kb/mona/v32a" + }, + "ramonimbao/squishy65": { + "target": "rmi_kb/squishy65" + }, + "ramonimbao/squishyfrl": { + "target": "rmi_kb/squishyfrl" + }, + "ramonimbao/squishytkl": { + "target": "rmi_kb/squishytkl" + }, + "ramonimbao/tkl_ff/v1": { + "target": "rmi_kb/tkl_ff/v1" + }, + "ramonimbao/tkl_ff/v2": { + "target": "rmi_kb/tkl_ff/v2" + }, + "ramonimbao/wete/v1": { + "target": "rmi_kb/wete/v1" + }, + "ramonimbao/wete/v2": { + "target": "rmi_kb/wete/v2" + }, "rainkeeb": { "target": "rainkeebs/rainkeeb" }, -- cgit v1.2.3 From e24f9b2c0af33ec0df0fb341546102e8f14b9be8 Mon Sep 17 00:00:00 2001 From: miguelelinventor Date: Thu, 9 Feb 2023 20:27:37 +0100 Subject: Add Michi MCU Converter support (#19163) --- data/mappings/defaults.hjson | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson index 13835721d4..8efe73dcde 100644 --- a/data/mappings/defaults.hjson +++ b/data/mappings/defaults.hjson @@ -35,6 +35,11 @@ "bootloader": "rp2040", "board": "QMK_PM2040" }, + "michi": { + "processor": "RP2040", + "bootloader": "rp2040", + "board": "QMK_PM2040" + }, "bit_c_pro": { "processor": "RP2040", "bootloader": "rp2040", -- cgit v1.2.3 From 896d9aa98cfec0f2b1010be7e0db289b8b809311 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 12 Feb 2023 23:02:05 +0000 Subject: Add rp2040_ce and add elite-pi and helios as alias (#19830) * add rp2040_ce and add elite-pi and helios as alias (#19628) * fix git mishap * Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h Co-authored-by: Joel Challis --------- Co-authored-by: Joel Challis * Tidy docs --------- Co-authored-by: Conor Burns --- data/mappings/defaults.hjson | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson index 8efe73dcde..93da6161d6 100644 --- a/data/mappings/defaults.hjson +++ b/data/mappings/defaults.hjson @@ -69,6 +69,11 @@ "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BONSAI_C4" + }, + "helios": { + "processor": "RP2040", + "bootloader": "rp2040", + "board": "QMK_PM2040" } } } -- cgit v1.2.3 From 7ce71625bc15e649f8c080b61ff17f7d7c2dfa9f Mon Sep 17 00:00:00 2001 From: pauper <125139481+pauperboards@users.noreply.github.com> Date: Sat, 18 Feb 2023 00:26:43 -0500 Subject: [Keyboard] Brick (#19851) Co-authored-by: Joel Challis Co-authored-by: Jason Chestnut --- data/mappings/keyboard_aliases.hjson | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 4295d0700c..5fe31c4fb1 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -92,6 +92,9 @@ "bpiphany/pegasushoof": { "target": "bpiphany/pegasushoof/2013" }, + "brick": { + "target": "pauperboards/brick" + }, "chavdai40": { "target": "chavdai40/rev1" }, -- cgit v1.2.3 From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- data/mappings/info_config.hjson | 1 + data/mappings/info_rules.hjson | 1 + 2 files changed, 2 insertions(+) (limited to 'data/mappings') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 7645598c77..46108e6fe6 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -13,6 +13,7 @@ "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"}, "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"}, "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"}, + "BACKLIGHT_CAPS_LOCK": {"info_key": "backlight.as_caps_lock", "value_type": "bool"}, "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"}, "BACKLIGHT_LIMIT_VAL": {"info_key": "backlight.max_brightness", "value_type": "int"}, "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"}, diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index c409da04c6..7c3780504c 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -14,6 +14,7 @@ "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false}, "BOOTMAGIC_ENABLE": {"info_key": "bootmagic.enabled", "value_type": "bool"}, "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"}, + "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"}, "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"}, "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"}, "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"}, -- cgit v1.2.3