diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/constants/keycodes/extras/keycodes_uk_0.0.1.hjson | 353 | ||||
| -rw-r--r-- | data/constants/keycodes/extras/keycodes_us_0.0.1.hjson | 155 | ||||
| -rw-r--r-- | data/mappings/info_config.hjson | 15 | ||||
| -rw-r--r-- | data/mappings/info_rules.hjson | 1 | ||||
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 33 | ||||
| -rw-r--r-- | data/templates/config-overrides/chibios/board.h | 20 | ||||
| -rw-r--r-- | data/templates/config-overrides/chibios/chconf.h | 20 | ||||
| -rw-r--r-- | data/templates/config-overrides/chibios/halconf.h | 20 | ||||
| -rw-r--r-- | data/templates/config-overrides/chibios/mcuconf.h | 21 | ||||
| -rw-r--r-- | data/templates/config-overrides/common/lv_conf.h | 10 | 
10 files changed, 642 insertions, 6 deletions
diff --git a/data/constants/keycodes/extras/keycodes_uk_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_uk_0.0.1.hjson new file mode 100644 index 0000000000..006bf5c59e --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_uk_0.0.1.hjson @@ -0,0 +1,353 @@ +{ +    "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +        "KC_GRV": { +            "key": "UK_GRV", +            "label": "`" +        }, +        "KC_1": { +            "key": "UK_1", +            "label": "1" +        }, +        "KC_2": { +            "key": "UK_2", +            "label": "2" +        }, +        "KC_3": { +            "key": "UK_3", +            "label": "3" +        }, +        "KC_4": { +            "key": "UK_4", +            "label": "4" +        }, +        "KC_5": { +            "key": "UK_5", +            "label": "5" +        }, +        "KC_6": { +            "key": "UK_6", +            "label": "6" +        }, +        "KC_7": { +            "key": "UK_7", +            "label": "7" +        }, +        "KC_8": { +            "key": "UK_8", +            "label": "8" +        }, +        "KC_9": { +            "key": "UK_9", +            "label": "9" +        }, +        "KC_0": { +            "key": "UK_0", +            "label": "0" +        }, +        "KC_MINS": { +            "key": "UK_MINS", +            "label": "-" +        }, +        "KC_EQL": { +            "key": "UK_EQL", +            "label": "=" +        }, +        "KC_Q": { +            "key": "UK_Q", +            "label": "Q" +        }, +        "KC_W": { +            "key": "UK_W", +            "label": "W" +        }, +        "KC_E": { +            "key": "UK_E", +            "label": "E" +        }, +        "KC_R": { +            "key": "UK_R", +            "label": "R" +        }, +        "KC_T": { +            "key": "UK_T", +            "label": "T" +        }, +        "KC_Y": { +            "key": "UK_Y", +            "label": "Y" +        }, +        "KC_U": { +            "key": "UK_U", +            "label": "U" +        }, +        "KC_I": { +            "key": "UK_I", +            "label": "I" +        }, +        "KC_O": { +            "key": "UK_O", +            "label": "O" +        }, +        "KC_P": { +            "key": "UK_P", +            "label": "P" +        }, +        "KC_LBRC": { +            "key": "UK_LBRC", +            "label": "[" +        }, +        "KC_RBRC": { +            "key": "UK_RBRC", +            "label": "]" +        }, +        "KC_A": { +            "key": "UK_A", +            "label": "A" +        }, +        "KC_S": { +            "key": "UK_S", +            "label": "S" +        }, +        "KC_D": { +            "key": "UK_D", +            "label": "D" +        }, +        "KC_F": { +            "key": "UK_F", +            "label": "F" +        }, +        "KC_G": { +            "key": "UK_G", +            "label": "G" +        }, +        "KC_H": { +            "key": "UK_H", +            "label": "H" +        }, +        "KC_J": { +            "key": "UK_J", +            "label": "J" +        }, +        "KC_K": { +            "key": "UK_K", +            "label": "K" +        }, +        "KC_L": { +            "key": "UK_L", +            "label": "L" +        }, +        "KC_SCLN": { +            "key": "UK_SCLN", +            "label": ";" +        }, +        "KC_QUOT": { +            "key": "UK_QUOT", +            "label": "'" +        }, +        "KC_NUHS": { +            "key": "UK_HASH", +            "label": "#" +        }, +        "KC_NUBS": { +            "key": "UK_BSLS", +            "label": "\\" +        }, +        "KC_Z": { +            "key": "UK_Z", +            "label": "Z" +        }, +        "KC_X": { +            "key": "UK_X", +            "label": "X" +        }, +        "KC_C": { +            "key": "UK_C", +            "label": "C" +        }, +        "KC_V": { +            "key": "UK_V", +            "label": "V" +        }, +        "KC_B": { +            "key": "UK_B", +            "label": "B" +        }, +        "KC_N": { +            "key": "UK_N", +            "label": "N" +        }, +        "KC_M": { +            "key": "UK_M", +            "label": "M" +        }, +        "KC_COMM": { +            "key": "UK_COMM", +            "label": "," +        }, +        "KC_DOT": { +            "key": "UK_DOT", +            "label": "." +        }, +        "KC_SLSH": { +            "key": "UK_SLSH", +            "label": "/" +        }, + +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¬ │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │   │   │   │   │   │   │   │   │   │ : │ @ │ ~ │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │ | │   │   │   │   │   │   │   │ < │ > │ ? │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +        "S(UK_GRV)": { +            "key": "UK_NOT", +            "label": "¬" +        }, +        "S(UK_1)": { +            "key": "UK_EXLM", +            "label": "!" +        }, +        "S(UK_2)": { +            "key": "UK_DQUO", +            "label": "\"" +        }, +        "S(UK_3)": { +            "key": "UK_PND", +            "label": "£" +        }, +        "S(UK_4)": { +            "key": "UK_DLR", +            "label": "$" +        }, +        "S(UK_5)": { +            "key": "UK_PERC", +            "label": "%" +        }, +        "S(UK_6)": { +            "key": "UK_CIRC", +            "label": "^" +        }, +        "S(UK_7)": { +            "key": "UK_AMPR", +            "label": "&" +        }, +        "S(UK_8)": { +            "key": "UK_ASTR", +            "label": "*" +        }, +        "S(UK_9)": { +            "key": "UK_LPRN", +            "label": "(" +        }, +        "S(UK_0)": { +            "key": "UK_RPRN", +            "label": ")" +        }, +        "S(UK_MINS)": { +            "key": "UK_UNDS", +            "label": "_" +        }, +        "S(UK_EQL)": { +            "key": "UK_PLUS", +            "label": "+" +        }, +        "S(UK_LBRC)": { +            "key": "UK_LCBR", +            "label": "{" +        }, +        "S(UK_RBRC)": { +            "key": "UK_RCBR", +            "label": "}" +        }, +        "S(UK_SCLN)": { +            "key": "UK_COLN", +            "label": ":" +        }, +        "S(UK_QUOT)": { +            "key": "UK_AT", +            "label": "@" +        }, +        "S(UK_HASH)": { +            "key": "UK_TILD", +            "label": "~" +        }, +        "S(UK_BSLS)": { +            "key": "UK_PIPE", +            "label": "|" +        }, +        "S(UK_COMM)": { +            "key": "UK_LABK", +            "label": "<" +        }, +        "S(UK_DOT)": { +            "key": "UK_RABK", +            "label": ">" +        }, +        "S(UK_SLSH)": { +            "key": "UK_QUES", +            "label": "?" +        }, + +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¦ │   │   │   │ € │   │   │   │   │   │   │   │   │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │ É │   │   │   │ Ú │ Í │ Ó │   │   │   │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │ Á │   │   │   │   │   │   │   │   │   │   │   │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │   │   │   │   │   │   │   │   │   │   │   │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +        "ALGR(UK_GRV)": { +            "key": "UK_BRKP", +            "label": "¦" +        }, +        "ALGR(UK_4)": { +            "key": "UK_EURO", +            "label": "€" +        }, +        "ALGR(KC_E)": { +            "key": "UK_EACU", +            "label": "É" +        }, +        "ALGR(KC_U)": { +            "key": "UK_UACU", +            "label": "Ú" +        }, +        "ALGR(KC_I)": { +            "key": "UK_IACU", +            "label": "Í" +        }, +        "ALGR(KC_O)": { +            "key": "UK_OACU", +            "label": "Ó" +        }, +        "ALGR(KC_A)": { +            "key": "UK_AACU", +            "label": "Á" +        } +    } +}
\ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_us_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_us_0.0.1.hjson new file mode 100644 index 0000000000..af7e462611 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_us_0.0.1.hjson @@ -0,0 +1,155 @@ +{ +    "aliases": { +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │  |  │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │      │   │   │   │   │   │   │   │   │   │ : │ " │        │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │        │   │   │   │   │   │   │   │ < │ > │ ? │          │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +        "S(KC_GRAVE)": { +            "key": "KC_TILD", +            "label": "~", +            "aliases": [ +                "KC_TILDE" +            ] +        }, +        "S(KC_1)": { +            "key": "KC_EXLM", +            "label": "!", +            "aliases": [ +                "KC_EXCLAIM" +            ] +        }, +        "S(KC_2)": { +            "key": "KC_AT", +            "label": "@" +        }, +        "S(KC_3)": { +            "key": "KC_HASH", +            "label": "#" +        }, +        "S(KC_4)": { +            "key": "KC_DLR", +            "label": "$", +            "aliases": [ +                "KC_DOLLAR" +            ] +        }, +        "S(KC_5)": { +            "key": "KC_PERC", +            "label": "%", +            "aliases": [ +                "KC_PERCENT" +            ] +        }, +        "S(KC_6)": { +            "key": "KC_CIRC", +            "label": "^", +            "aliases": [ +                "KC_CIRCUMFLEX" +            ] +        }, +        "S(KC_7)": { +            "key": "KC_AMPR", +            "label": "&", +            "aliases": [ +                "KC_AMPERSAND" +            ] +        }, +        "S(KC_8)": { +            "key": "KC_ASTR", +            "label": "*", +            "aliases": [ +                "KC_ASTERISK" +            ] +        }, +        "S(KC_9)": { +            "key": "KC_LPRN", +            "label": "(", +            "aliases": [ +                "KC_LEFT_PAREN" +            ] +        }, +        "S(KC_0)": { +            "key": "KC_RPRN", +            "label": ")", +            "aliases": [ +                "KC_RIGHT_PAREN" +            ] +        }, +        "S(KC_MINUS)": { +            "key": "KC_UNDS", +            "label": "_", +            "aliases": [ +                "KC_UNDERSCORE" +            ] +        }, +        "S(KC_EQUAL)": { +            "key": "KC_PLUS", +            "label": "+" +        }, +        "S(KC_LEFT_BRACKET)": { +            "key": "KC_LCBR", +            "label": "{", +            "aliases": [ +                "KC_LEFT_CURLY_BRACE" +            ] +        }, +        "S(KC_RIGHT_BRACKET)": { +            "key": "KC_RCBR", +            "label": "}", +            "aliases": [ +                "KC_RIGHT_CURLY_BRACE" +            ] +        }, +        "S(KC_BACKSLASH)": { +            "key": "KC_PIPE", +            "label": "|" +        }, +        "S(KC_SEMICOLON)": { +            "key": "KC_COLN", +            "label": ":", +            "aliases": [ +                "KC_COLON" +            ] +        }, +        "S(KC_QUOTE)": { +            "key": "KC_DQUO", +            "label": "\"", +            "aliases": [ +                "KC_DOUBLE_QUOTE", +                "KC_DQT" +            ] +        }, +        "S(KC_COMMA)": { +            "key": "KC_LABK", +            "label": "<", +            "aliases": [ +                "KC_LEFT_ANGLE_BRACKET", +                "KC_LT" +            ] +        }, +        "S(KC_DOT)": { +            "key": "KC_RABK", +            "label": ">", +            "aliases": [ +                "KC_RIGHT_ANGLE_BRACKET", +                "KC_GT" +            ] +        }, +        "S(KC_SLASH)": { +            "key": "KC_QUES", +            "label": "?", +            "aliases": [ +                "KC_QUESTION" +            ] +        } +    } +} diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index c1c01ff70f..7645598c77 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"}, @@ -28,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"}, @@ -51,6 +53,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"}, @@ -106,8 +109,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"}, @@ -122,8 +123,12 @@      "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}, +    "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"}, 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"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 921726a5e9..513564a643 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -131,6 +131,22 @@                  }              }          }, +        "bootmagic":{ +            "type": "object", +            "additionalProperties": false, +            "properties": { +                "enabled": {"type": "boolean"}, +                "matrix": { +                    "type": "array", +                    "minItems": 2, +                    "maxItems": 2, +                    "items": { +                        "type": "integer", +                        "minimum": 0 +                    } +                } +            } +        },          "board": {              "type": "string",              "minLength": 2, @@ -288,6 +304,7 @@                  "custom": {"type": "boolean"},                  "custom_lite": {"type": "boolean"},                  "ghost": {"type": "boolean"}, +                "input_pressed_state": {"$ref": "qmk.definitions.v1#/unsigned_int"},                  "io_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},                  "direct": {                      "type": "array", @@ -511,6 +528,21 @@              "additionalProperties": false,              "properties": {                  "enabled": {"type": "boolean"}, +                "bootmagic":{ +                    "type": "object", +                    "additionalProperties": false, +                    "properties": { +                        "matrix": { +                            "type": "array", +                            "minItems": 2, +                            "maxItems": 2, +                            "items": { +                                "type": "integer", +                                "minimum": 0 +                            } +                        } +                    } +                },                  "matrix_grid": {                      "type": "array",                      "items": {"$ref": "qmk.definitions.v1#/mcu_pin"} @@ -588,7 +620,6 @@                  "force_hold": {"type": "boolean"},                  "force_hold_per_key": {"type": "boolean"},                  "ignore_mod_tap_interrupt": {"type": "boolean"}, -                "ignore_mod_tap_interrupt_per_key": {"type": "boolean"},                  "hold_on_other_key_press": {"type": "boolean"},                  "hold_on_other_key_press_per_key": {"type": "boolean"},                  "permissive_hold": {"type": "boolean"}, diff --git a/data/templates/config-overrides/chibios/board.h b/data/templates/config-overrides/chibios/board.h new file mode 100644 index 0000000000..5b840c389c --- /dev/null +++ b/data/templates/config-overrides/chibios/board.h @@ -0,0 +1,20 @@ +/* Copyright 2020 Nick Brassel (tzarc) + * + *  This program is free software: you can redistribute it and/or modify + *  it under the terms of the GNU General Public License as published by + *  the Free Software Foundation, either version 3 of the License, or + *  (at your option) any later version. + * + *  This program is distributed in the hope that it will be useful, + *  but WITHOUT ANY WARRANTY; without even the implied warranty of + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *  GNU General Public License for more details. + * + *  You should have received a copy of the GNU General Public License + *  along with this program.  If not, see <https://www.gnu.org/licenses/>. + */ +#pragma once + +#include_next <board.h> + +// #undef STM32_HSE_BYPASS diff --git a/data/templates/config-overrides/chibios/chconf.h b/data/templates/config-overrides/chibios/chconf.h new file mode 100644 index 0000000000..fca444747c --- /dev/null +++ b/data/templates/config-overrides/chibios/chconf.h @@ -0,0 +1,20 @@ +/* Copyright 2020 Nick Brassel (tzarc) + * + *  This program is free software: you can redistribute it and/or modify + *  it under the terms of the GNU General Public License as published by + *  the Free Software Foundation, either version 3 of the License, or + *  (at your option) any later version. + * + *  This program is distributed in the hope that it will be useful, + *  but WITHOUT ANY WARRANTY; without even the implied warranty of + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *  GNU General Public License for more details. + * + *  You should have received a copy of the GNU General Public License + *  along with this program.  If not, see <https://www.gnu.org/licenses/>. + */ +#pragma once + +// #define CH_CFG_OPTIMIZE_SPEED TRUE + +#include_next <chconf.h> diff --git a/data/templates/config-overrides/chibios/halconf.h b/data/templates/config-overrides/chibios/halconf.h new file mode 100644 index 0000000000..456020f16a --- /dev/null +++ b/data/templates/config-overrides/chibios/halconf.h @@ -0,0 +1,20 @@ +/* Copyright 2020 Nick Brassel (tzarc) + * + *  This program is free software: you can redistribute it and/or modify + *  it under the terms of the GNU General Public License as published by + *  the Free Software Foundation, either version 3 of the License, or + *  (at your option) any later version. + * + *  This program is distributed in the hope that it will be useful, + *  but WITHOUT ANY WARRANTY; without even the implied warranty of + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *  GNU General Public License for more details. + * + *  You should have received a copy of the GNU General Public License + *  along with this program.  If not, see <https://www.gnu.org/licenses/>. + */ +#pragma once + +// #define HAL_USE_DAC TRUE + +#include_next <halconf.h> diff --git a/data/templates/config-overrides/chibios/mcuconf.h b/data/templates/config-overrides/chibios/mcuconf.h new file mode 100644 index 0000000000..c690b02f4b --- /dev/null +++ b/data/templates/config-overrides/chibios/mcuconf.h @@ -0,0 +1,21 @@ +/* Copyright 2020 Nick Brassel (tzarc) + * + *  This program is free software: you can redistribute it and/or modify + *  it under the terms of the GNU General Public License as published by + *  the Free Software Foundation, either version 3 of the License, or + *  (at your option) any later version. + * + *  This program is distributed in the hope that it will be useful, + *  but WITHOUT ANY WARRANTY; without even the implied warranty of + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *  GNU General Public License for more details. + * + *  You should have received a copy of the GNU General Public License + *  along with this program.  If not, see <https://www.gnu.org/licenses/>. + */ +#pragma once + +#include_next <mcuconf.h> + +// #undef STM32_HSE_ENABLED +// #define STM32_HSE_ENABLED FALSE diff --git a/data/templates/config-overrides/common/lv_conf.h b/data/templates/config-overrides/common/lv_conf.h new file mode 100644 index 0000000000..5c003a6a10 --- /dev/null +++ b/data/templates/config-overrides/common/lv_conf.h @@ -0,0 +1,10 @@ +// Copyright 2022 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +// #define LV_DITHER_GRADIENT 1 + +#include_next <lv_conf.h> + +// #undef LV_COLOR_16_SWAP +// #define LV_COLOR_16_SWAP 0  | 
