diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-06 12:38:13 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-06 12:38:13 +0000 |
| commit | 820371c31bf1afdde8294aa050f95b0434ff5fd9 (patch) | |
| tree | 7a5cbd765354c9c20bf2bc7c53927cf77efc50c3 /data/mappings | |
| parent | f27b617f36d55ac5469247016a1b79304f892366 (diff) | |
| parent | 37345e2ace56e1ea17e0ab6b4df3af81f437ae79 (diff) | |
| download | qmk_firmware-820371c31bf1afdde8294aa050f95b0434ff5fd9.tar.gz qmk_firmware-820371c31bf1afdde8294aa050f95b0434ff5fd9.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'data/mappings')
| -rw-r--r-- | data/mappings/info_config.json | 3 | ||||
| -rw-r--r-- | data/mappings/info_rules.json | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index d03f50c51e..66a20e588b 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -9,6 +9,7 @@ # warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places # deprecated: Default `false`. Set to `true` to turn on warning when a value exists # 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_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"}, @@ -110,7 +111,7 @@ "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true}, "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true}, "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true}, - "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true}, + "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, replace_with: "DEBOUNCE"}, "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true}, "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool", "deprecated": true}, "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json index 279b5ac213..9fd67f7785 100644 --- a/data/mappings/info_rules.json +++ b/data/mappings/info_rules.json @@ -9,6 +9,7 @@ # warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places # deprecated: Default `false`. Set to `true` to turn on warning when a value exists # 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 "BOARD": {"info_key": "board"}, "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false}, "BLUETOOTH": {"info_key": "bluetooth.driver"}, @@ -32,7 +33,7 @@ "STENO_PROTOCOL": {"info_key": "stenography.protocol"}, # Items we want flagged in lint - "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true}, - "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true}, + "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"}, "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true}, } |