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 + data/schemas/keyboard.jsonschema | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) (limited to 'data') 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"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 91110b06a0..8c0db6ee92 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, @@ -510,6 +526,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"} -- cgit v1.3.1 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 +- keyboards/bioi/main.c | 2 +- keyboards/idobao/id75/v1/config.h | 1 - keyboards/idobao/id80/v2/config.h | 1 - keyboards/idobao/id87/v1/config.h | 1 - keyboards/idobao/montex/v1/config.h | 1 - keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c | 1 - quantum/rgblight/rgblight.h | 17 ----------------- users/sethBarberee/config.h | 3 --- 9 files changed, 2 insertions(+), 27 deletions(-) (limited to 'data') 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 diff --git a/keyboards/bioi/main.c b/keyboards/bioi/main.c index bba54dfab1..eb149eb7cd 100644 --- a/keyboards/bioi/main.c +++ b/keyboards/bioi/main.c @@ -56,7 +56,7 @@ extern keymap_config_t keymap_config; #include "virtser.h" #endif -#if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE) +#if defined(RGBLIGHT_ENABLE) #include "rgblight.h" #endif diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 0bb05a810c..82e7d705ee 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -45,7 +45,6 @@ along with this program. If not, see . #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN - // RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index a007cff40c..57f26aee57 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -71,7 +71,6 @@ along with this program. If not, see . #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - // RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 6c2d6fc9ce..11372855c0 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -50,7 +50,6 @@ along with this program. If not, see . #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN - // RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index fe1ea61d35..3d1a614e8a 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -46,7 +46,6 @@ #define RGB_DI_PIN B1 #ifdef RGB_DI_PIN - // RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c b/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c index 00f0bb3ced..a65fc3b688 100644 --- a/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c @@ -36,7 +36,6 @@ enum custom_keycodes { // Underglow setup #define RGBLIGHT_SLEEP -#define RGBLIGHT_ANIMATIONS const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h index 46e8e07212..7693888462 100644 --- a/quantum/rgblight/rgblight.h +++ b/quantum/rgblight/rgblight.h @@ -68,23 +68,6 @@ |-----------------|-----------------------------------| *****/ -#ifdef RGBLIGHT_ANIMATIONS -// for backward compatibility -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -#endif - -#ifdef RGBLIGHT_STATIC_PATTERNS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif - // clang-format off // check dynamic animation effects chose ? diff --git a/users/sethBarberee/config.h b/users/sethBarberee/config.h index 7e9fd7d2f1..f323b27368 100644 --- a/users/sethBarberee/config.h +++ b/users/sethBarberee/config.h @@ -28,9 +28,6 @@ # endif // Trim animations I don't use/like -# ifdef RGBLIGHT_ANIMATIONS -# undef RGBLIGHT_ANIMATIONS -# endif # ifndef RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_BREATHING # endif -- cgit v1.3.1 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 + data/schemas/keyboard.jsonschema | 1 + docs/porting_your_keyboard_to_qmk.md | 12 ++++++++++++ quantum/matrix.c | 10 ++++++---- 4 files changed, 20 insertions(+), 4 deletions(-) (limited to 'data') 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"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 5c0c23c2b1..7844bfd579 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -304,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", diff --git a/docs/porting_your_keyboard_to_qmk.md b/docs/porting_your_keyboard_to_qmk.md index 484d079ea6..05054e25c7 100644 --- a/docs/porting_your_keyboard_to_qmk.md +++ b/docs/porting_your_keyboard_to_qmk.md @@ -94,6 +94,18 @@ The next section of the `info` file deals with your keyboard's matrix. The first The size of the `matrix_pins.cols` and `matrix_pins.rows` arrays infer the size of the matrix (previously `MATRIX_ROWS` and `MATRIX_COLS`). +## Configuration Options + +To invert the keypress logic, configure `input_pressed_state`: + +```json + "matrix_pins": { + "input_pressed_state": 1, +}, +``` + +This configures state of the GPIO pins when the key is pressed - `1` for high, `0` for low. Default value is `0`. + Finally, you can specify the direction your diodes point. This can be `COL2ROW` or `ROW2COL`. ```json diff --git a/quantum/matrix.c b/quantum/matrix.c index db683104ed..0de65c6cdd 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -46,6 +46,10 @@ along with this program. If not, see . # define SPLIT_MUTABLE_COL const #endif +#ifndef MATRIX_INPUT_PRESSED_STATE +# define MATRIX_INPUT_PRESSED_STATE 0 +#endif + #ifdef DIRECT_PINS static SPLIT_MUTABLE pin_t direct_pins[ROWS_PER_HAND][MATRIX_COLS] = DIRECT_PINS; #elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) @@ -93,7 +97,7 @@ static inline void setPinInputHigh_atomic(pin_t pin) { static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return (readPin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1; } else { return 1; } @@ -121,9 +125,7 @@ __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[] matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++, row_shifter <<= 1) { pin_t pin = direct_pins[current_row][col_index]; - if (pin != NO_PIN) { - current_row_value |= readPin(pin) ? 0 : row_shifter; - } + current_row_value |= readMatrixPin(pin) ? 0 : row_shifter; } // Update the matrix -- cgit v1.3.1 From 9bc7e9afbd32e3ed34580f1be9a79e6040158de5 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 9 Dec 2022 00:54:52 +0000 Subject: Initial uk+us DD keymap_extras migration (#19031) --- .../keycodes/extras/keycodes_uk_0.0.1.hjson | 353 +++++++++++++++++++++ .../keycodes/extras/keycodes_us_0.0.1.hjson | 155 +++++++++ lib/python/qmk/cli/generate/api.py | 9 +- lib/python/qmk/cli/generate/keycodes.py | 54 ++++ lib/python/qmk/keycodes.py | 73 +++-- quantum/keymap_extras/keymap_uk.h | 96 ++---- quantum/keymap_extras/keymap_us.h | 75 ++--- 7 files changed, 690 insertions(+), 125 deletions(-) create mode 100644 data/constants/keycodes/extras/keycodes_uk_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_us_0.0.1.hjson (limited to 'data') 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/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py index 8650a36b84..dd4830f543 100755 --- a/lib/python/qmk/cli/generate/api.py +++ b/lib/python/qmk/cli/generate/api.py @@ -11,7 +11,7 @@ from qmk.info import info_json from qmk.json_encoders import InfoJSONEncoder from qmk.json_schema import json_load from qmk.keyboard import find_readme, list_keyboards -from qmk.keycodes import load_spec, list_versions +from qmk.keycodes import load_spec, list_versions, list_languages DATA_PATH = Path('data') TEMPLATE_PATH = DATA_PATH / 'templates/api/' @@ -44,6 +44,13 @@ def _resolve_keycode_specs(output_folder): output_file = output_folder / f'constants/keycodes_{version}.json' output_file.write_text(json.dumps(overall, indent=4), encoding='utf-8') + for lang in list_languages(): + for version in list_versions(lang): + overall = load_spec(version, lang) + + output_file = output_folder / f'constants/keycodes_{lang}_{version}.json' + output_file.write_text(json.dumps(overall, indent=4), encoding='utf-8') + # Purge files consumed by 'load_spec' shutil.rmtree(output_folder / 'constants/keycodes/') diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py index 29b7db3c80..cf80689708 100644 --- a/lib/python/qmk/cli/generate/keycodes.py +++ b/lib/python/qmk/cli/generate/keycodes.py @@ -8,6 +8,24 @@ from qmk.path import normpath from qmk.keycodes import load_spec +def _render_key(key): + width = 7 + if 'S(' in key: + width += len('S()') + if 'A(' in key: + width += len('A()') + if 'RCTL(' in key: + width += len('RCTL()') + if 'ALGR(' in key: + width += len('ALGR()') + return key.ljust(width) + + +def _render_label(label): + label = label.replace("\\", "(backslash)") + return label + + def _generate_ranges(lines, keycodes): lines.append('') lines.append('enum qk_keycode_ranges {') @@ -67,6 +85,22 @@ def _generate_helpers(lines, keycodes): lines.append(f'#define IS_{ group.upper() }_KEYCODE(code) ((code) >= {lo} && (code) <= {hi})') +def _generate_aliases(lines, keycodes): + lines.append('') + lines.append('// Aliases') + for key, value in keycodes["aliases"].items(): + define = _render_key(value.get("key")) + val = _render_key(key) + label = _render_label(value.get("label")) + + lines.append(f'#define {define} {val} // {label}') + + lines.append('') + for key, value in keycodes["aliases"].items(): + for alias in value.get("aliases", []): + lines.append(f'#define {alias} {value.get("key")}') + + @cli.argument('-v', '--version', arg_only=True, required=True, help='Version of keycodes to generate.') @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to') @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages") @@ -86,3 +120,23 @@ def generate_keycodes(cli): # Show the results dump_lines(cli.args.output, keycodes_h_lines, cli.args.quiet) + + +@cli.argument('-v', '--version', arg_only=True, required=True, help='Version of keycodes to generate.') +@cli.argument('-l', '--lang', arg_only=True, required=True, help='Language of keycodes to generate.') +@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to') +@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages") +@cli.subcommand('Used by the make system to generate keymap_{lang}.h from keycodes_{lang}_{version}.json', hidden=True) +def generate_keycode_extras(cli): + """Generates the header file. + """ + + # Build the header file. + keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keymap.h"', '// clang-format off'] + + keycodes = load_spec(cli.args.version, cli.args.lang) + + _generate_aliases(keycodes_h_lines, keycodes) + + # Show the results + dump_lines(cli.args.output, keycodes_h_lines, cli.args.quiet) diff --git a/lib/python/qmk/keycodes.py b/lib/python/qmk/keycodes.py index cf1ee0767a..600163bab9 100644 --- a/lib/python/qmk/keycodes.py +++ b/lib/python/qmk/keycodes.py @@ -2,7 +2,42 @@ from pathlib import Path from qmk.json_schema import deep_update, json_load, validate -CONSTANTS_PATH = Path('data/constants/keycodes/') +CONSTANTS_PATH = Path('data/constants/') +KEYCODES_PATH = CONSTANTS_PATH / 'keycodes' +EXTRAS_PATH = KEYCODES_PATH / 'extras' + + +def _find_versions(path, prefix): + ret = [] + for file in path.glob(f'{prefix}_[0-9].[0-9].[0-9].hjson'): + ret.append(file.stem.split('_')[-1]) + + ret.sort(reverse=True) + return ret + + +def _load_fragments(path, prefix, version): + file = path / f'{prefix}_{version}.hjson' + if not file.exists(): + raise ValueError(f'Requested keycode spec ({prefix}:{version}) is invalid!') + + # Load base + spec = json_load(file) + + # Merge in fragments + fragments = path.glob(f'{prefix}_{version}_*.hjson') + for file in fragments: + deep_update(spec, json_load(file)) + + return spec + + +def _search_path(lang=None): + return EXTRAS_PATH if lang else KEYCODES_PATH + + +def _search_prefix(lang=None): + return f'keycodes_{lang}' if lang else 'keycodes' def _validate(spec): @@ -19,26 +54,20 @@ def _validate(spec): raise ValueError(f'Keycode spec contains duplicate keycodes! ({",".join(duplicates)})') -def load_spec(version): +def load_spec(version, lang=None): """Build keycode data from the requested spec file """ if version == 'latest': - version = list_versions()[0] + version = list_versions(lang)[0] - file = CONSTANTS_PATH / f'keycodes_{version}.hjson' - if not file.exists(): - raise ValueError(f'Requested keycode spec ({version}) is invalid!') + path = _search_path(lang) + prefix = _search_prefix(lang) # Load base - spec = json_load(file) - - # Merge in fragments - fragments = CONSTANTS_PATH.glob(f'keycodes_{version}_*.hjson') - for file in fragments: - deep_update(spec, json_load(file)) + spec = _load_fragments(path, prefix, version) # Sort? - spec['keycodes'] = dict(sorted(spec['keycodes'].items())) + spec['keycodes'] = dict(sorted(spec.get('keycodes', {}).items())) # Validate? _validate(spec) @@ -46,12 +75,20 @@ def load_spec(version): return spec -def list_versions(): +def list_versions(lang=None): """Return available versions - sorted newest first """ - ret = [] - for file in CONSTANTS_PATH.glob('keycodes_[0-9].[0-9].[0-9].hjson'): - ret.append(file.stem.split('_')[1]) + path = _search_path(lang) + prefix = _search_prefix(lang) + + return _find_versions(path, prefix) + + +def list_languages(): + """Return available languages + """ + ret = set() + for file in EXTRAS_PATH.glob('keycodes_*_[0-9].[0-9].[0-9].hjson'): + ret.add(file.stem.split('_')[1]) - ret.sort(reverse=True) return ret diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h index 03fe8149f0..a6c42eafbf 100644 --- a/quantum/keymap_extras/keymap_uk.h +++ b/quantum/keymap_extras/keymap_uk.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define UK_GRV KC_GRV // ` #define UK_1 KC_1 // 1 #define UK_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define UK_0 KC_0 // 0 #define UK_MINS KC_MINS // - #define UK_EQL KC_EQL // = -// Row 2 #define UK_Q KC_Q // Q #define UK_W KC_W // W #define UK_E KC_E // E @@ -60,7 +53,6 @@ #define UK_P KC_P // P #define UK_LBRC KC_LBRC // [ #define UK_RBRC KC_RBRC // ] -// Row 3 #define UK_A KC_A // A #define UK_S KC_S // S #define UK_D KC_D // D @@ -73,7 +65,6 @@ #define UK_SCLN KC_SCLN // ; #define UK_QUOT KC_QUOT // ' #define UK_HASH KC_NUHS // # -// Row 4 #define UK_BSLS KC_NUBS // (backslash) #define UK_Z KC_Z // Z #define UK_X KC_X // X @@ -85,21 +76,6 @@ #define UK_COMM KC_COMM // , #define UK_DOT KC_DOT // . #define UK_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¬ │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ : │ @ │ ~ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define UK_NOT S(UK_GRV) // ¬ #define UK_EXLM S(UK_1) // ! #define UK_DQUO S(UK_2) // " @@ -113,39 +89,21 @@ #define UK_RPRN S(UK_0) // ) #define UK_UNDS S(UK_MINS) // _ #define UK_PLUS S(UK_EQL) // + -// Row 2 #define UK_LCBR S(UK_LBRC) // { #define UK_RCBR S(UK_RBRC) // } -// Row 3 #define UK_COLN S(UK_SCLN) // : #define UK_AT S(UK_QUOT) // @ #define UK_TILD S(UK_HASH) // ~ -// Row 4 #define UK_PIPE S(UK_BSLS) // | #define UK_LABK S(UK_COMM) // < #define UK_RABK S(UK_DOT) // > #define UK_QUES S(UK_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¦ │ │ │ │ € │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ É │ │ │ │ Ú │ Í │ Ó │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Á │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define UK_BRKP ALGR(UK_GRV) // ¦ #define UK_EURO ALGR(UK_4) // € -// Row 2 #define UK_EACU ALGR(KC_E) // É #define UK_UACU ALGR(KC_U) // Ú #define UK_IACU ALGR(KC_I) // Í #define UK_OACU ALGR(KC_O) // Ó -// Row 3 #define UK_AACU ALGR(KC_A) // Á + + diff --git a/quantum/keymap_extras/keymap_us.h b/quantum/keymap_extras/keymap_us.h index b18c701679..c5c5285848 100644 --- a/quantum/keymap_extras/keymap_us.h +++ b/quantum/keymap_extras/keymap_us.h @@ -1,52 +1,55 @@ // Copyright 2022 QMK // SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define KC_TILD S(KC_GRAVE) // ~ -#define KC_EXLM S(KC_1) // ! -#define KC_AT S(KC_2) // @ -#define KC_HASH S(KC_3) // # -#define KC_DLR S(KC_4) // $ -#define KC_PERC S(KC_5) // % -#define KC_CIRC S(KC_6) // ^ -#define KC_AMPR S(KC_7) // & -#define KC_ASTR S(KC_8) // * -#define KC_LPRN S(KC_9) // ( -#define KC_RPRN S(KC_0) // ) +#define KC_EXLM S(KC_1) // ! +#define KC_AT S(KC_2) // @ +#define KC_HASH S(KC_3) // # +#define KC_DLR S(KC_4) // $ +#define KC_PERC S(KC_5) // % +#define KC_CIRC S(KC_6) // ^ +#define KC_AMPR S(KC_7) // & +#define KC_ASTR S(KC_8) // * +#define KC_LPRN S(KC_9) // ( +#define KC_RPRN S(KC_0) // ) #define KC_UNDS S(KC_MINUS) // _ #define KC_PLUS S(KC_EQUAL) // + -// Row 2 -#define KC_LCBR S(KC_LEFT_BRACKET) // { +#define KC_LCBR S(KC_LEFT_BRACKET) // { #define KC_RCBR S(KC_RIGHT_BRACKET) // } -#define KC_PIPE S(KC_BACKSLASH) // | -// Row 3 +#define KC_PIPE S(KC_BACKSLASH) // | #define KC_COLN S(KC_SEMICOLON) // : -#define KC_DQUO S(KC_QUOTE) // " -// Row 4 +#define KC_DQUO S(KC_QUOTE) // " #define KC_LABK S(KC_COMMA) // < -#define KC_RABK S(KC_DOT) // > +#define KC_RABK S(KC_DOT) // > #define KC_QUES S(KC_SLASH) // ? -// alias stuff #define KC_TILDE KC_TILD #define KC_EXCLAIM KC_EXLM #define KC_DOLLAR KC_DLR @@ -57,16 +60,14 @@ #define KC_LEFT_PAREN KC_LPRN #define KC_RIGHT_PAREN KC_RPRN #define KC_UNDERSCORE KC_UNDS - #define KC_LEFT_CURLY_BRACE KC_LCBR #define KC_RIGHT_CURLY_BRACE KC_RCBR - #define KC_COLON KC_COLN #define KC_DOUBLE_QUOTE KC_DQUO #define KC_DQT KC_DQUO - #define KC_LEFT_ANGLE_BRACKET KC_LABK #define KC_LT KC_LABK #define KC_RIGHT_ANGLE_BRACKET KC_RABK #define KC_GT KC_RABK #define KC_QUESTION KC_QUES + -- cgit v1.3.1 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 +- docs/config_options.md | 13 +- docs/tap_hold.md | 31 +-- keyboards/25keys/zinc/rev1/config.h | 2 +- keyboards/25keys/zinc/reva/config.h | 2 +- .../gherkin/keymaps/pierrec83/config.h | 2 +- .../gherkin/keymaps/stevexyz/config.h | 2 +- keyboards/adm42/rev4/keymaps/default/config.h | 2 +- keyboards/adm42/rev4/keymaps/default/keymap.c | 6 +- keyboards/arabica37/keymaps/default/config.h | 2 +- keyboards/atreus/keymaps/kejadlen/config.h | 2 +- keyboards/b_sides/rev41lp/keymaps/namnlos/config.h | 2 +- keyboards/basekeys/slice/keymaps/default/config.h | 2 +- .../keymaps/default_split_left_space/config.h | 2 +- .../basekeys/slice/rev1/keymaps/2moons/config.h | 2 +- .../slice/rev1/keymaps/default_all/config.h | 2 +- .../rev1/keymaps/default_split_backspace/config.h | 2 +- keyboards/basekeys/slice/rev1/keymaps/via/config.h | 2 +- .../slice/rev1_rgb/keymaps/2moons_rgb/config.h | 2 +- .../bastardkb/charybdis/3x5/keymaps/bstiq/config.h | 2 +- .../bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h | 2 +- .../bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h | 2 +- .../bastardkb/scylla/keymaps/cykedev/config.h | 2 +- keyboards/bastardkb/scylla/keymaps/xyverz/config.h | 2 +- keyboards/bastardkb/tbk/keymaps/xyverz/config.h | 2 +- keyboards/buzzard/keymaps/crehmann/config.h | 2 +- keyboards/buzzard/keymaps/default/config.h | 2 +- .../clickety_split/leeloo/keymaps/default/config.h | 2 +- keyboards/crkbd/keymaps/ajarov/config.h | 2 +- keyboards/crkbd/keymaps/antosha417/config.h | 2 +- keyboards/crkbd/keymaps/ardakilic/config.h | 2 +- keyboards/crkbd/keymaps/armand1m/config.h | 2 +- keyboards/crkbd/keymaps/benrestech/config.h | 2 +- keyboards/crkbd/keymaps/bermeo/config.h | 2 +- keyboards/crkbd/keymaps/blipson/config.h | 2 +- keyboards/crkbd/keymaps/colemad/config.h | 2 +- keyboards/crkbd/keymaps/crkdves/config.h | 2 +- keyboards/crkbd/keymaps/crkqwes/config.h | 2 +- keyboards/crkbd/keymaps/default/config.h | 2 +- keyboards/crkbd/keymaps/devdev/config.h | 2 +- keyboards/crkbd/keymaps/edvorakjp/config.h | 2 +- keyboards/crkbd/keymaps/hvp/config.h | 2 +- keyboards/crkbd/keymaps/jarred/config.h | 2 +- keyboards/crkbd/keymaps/julian_turner/config.h | 2 +- keyboards/crkbd/keymaps/kidbrazil/config.h | 2 +- keyboards/crkbd/keymaps/madhatter/config.h | 2 +- keyboards/crkbd/keymaps/nimishgautam/config.h | 2 +- keyboards/crkbd/keymaps/ninjonas/config.h | 2 +- keyboards/crkbd/keymaps/oled_sample/config.h | 2 +- keyboards/crkbd/keymaps/ollyhayes/config.h | 2 +- keyboards/crkbd/keymaps/oo/config.h | 2 +- keyboards/crkbd/keymaps/rarick/config.h | 2 +- keyboards/crkbd/keymaps/rjhilgefort/config.h | 2 +- keyboards/crkbd/keymaps/rs/config.h | 2 +- keyboards/crkbd/keymaps/sharkby7e/config.h | 2 +- keyboards/crkbd/keymaps/snowe/config.h | 2 +- keyboards/crkbd/keymaps/soundmonster/config.h | 2 +- keyboards/crkbd/keymaps/thumb_ctrl/config.h | 2 +- keyboards/crkbd/keymaps/toinux/config.h | 2 +- keyboards/crkbd/keymaps/vayashiko/config.h | 2 +- .../crkbd/keymaps/vlukash_trackpad_left/config.h | 2 +- .../crkbd/keymaps/vlukash_trackpad_right/config.h | 2 +- keyboards/crkbd/keymaps/vxid/config.h | 2 +- keyboards/crkbd/keymaps/xyverz/config.h | 2 +- .../crkbd/rev1/keymaps/dvorak_42_key/config.h | 2 +- .../dztech/dz60rgb/keymaps/kgreulich/config.h | 2 +- .../dztech/dz60rgb/keymaps/matthewrobo/config.h | 2 +- keyboards/dztech/dz60rgb/keymaps/xunz/config.h | 2 +- .../dztech/dz65rgb/keymaps/matthewrobo/config.h | 2 +- .../ergodox_ez/keymaps/hacker_dvorak/config.h | 2 +- keyboards/ergodox_ez/keymaps/stamm/config.h | 4 +- keyboards/ergodox_ez/keymaps/stamm/keymap.c | 37 ++- keyboards/ferris/keymaps/bruun-baer/config.h | 2 +- keyboards/ferris/keymaps/default/config.h | 2 +- keyboards/ferris/keymaps/pierrec83/config.h | 2 +- keyboards/gl516/a52gl/keymaps/salicylic/config.h | 2 +- .../gl516/j73gl/keymaps/via_rgb_matrix/config.h | 2 +- keyboards/gl516/n51gl/keymaps/salicylic/config.h | 2 +- keyboards/gl516/n51gl/keymaps/via/config.h | 2 +- .../handwired/aranck/keymaps/turkishish/config.h | 2 +- keyboards/handwired/brain/config.h | 2 +- .../dactyl_manuform/3x5_3/keymaps/dlford/config.h | 2 +- .../dactyl_manuform/3x5_3/keymaps/dlford/keymap.c | 18 +- .../dactyl_manuform/5x6_5/keymaps/cykedev/config.h | 2 +- .../heisenberg/keymaps/turkishish/config.h | 2 +- keyboards/helix/pico/config.h | 2 +- keyboards/helix/rev2/config.h | 2 +- keyboards/helix/rev2/keymaps/edvorakjp/config.h | 20 +- keyboards/hidtech/bastyl/keymaps/xyverz/config.h | 2 +- keyboards/keebio/iris/keymaps/jhelvy/config.h | 2 +- keyboards/keebio/iris/keymaps/osiris/config.h | 2 +- .../kprepublic/bm40hsrgb/keymaps/34keys/config.h | 2 +- .../bm40hsrgb/keymaps/gabustoledo/config.h | 2 +- .../bm68hsrgb/rev1/keymaps/peepeetee/config.h | 2 +- .../bm80hsrgb/keymaps/peepeetee/config.h | 2 +- .../kprepublic/jj40/keymaps/stevexyz/config.h | 2 +- .../keymaps/bongocat_wpm_responsive/config.h | 2 +- keyboards/lily58/keymaps/chuan/config.h | 2 +- keyboards/lily58/keymaps/datadavd/config.h | 2 +- keyboards/lily58/keymaps/default/config.h | 2 +- keyboards/lily58/keymaps/domnantas/config.h | 2 +- keyboards/lily58/keymaps/drasbeck/config.h | 2 +- keyboards/lily58/keymaps/gaston/config.h | 2 +- keyboards/lily58/keymaps/gshmu/config.h | 2 +- keyboards/lily58/keymaps/jhelvy/config.h | 2 +- keyboards/lily58/keymaps/mikefightsbears/config.h | 2 +- keyboards/lily58/keymaps/muppetjones/config.h | 2 +- keyboards/lily58/keymaps/narze/config.h | 2 +- keyboards/lily58/keymaps/ninjonas/config.h | 2 +- keyboards/lily58/keymaps/pttbx/config.h | 2 +- keyboards/lily58/keymaps/via/config.h | 2 +- keyboards/lily58/keymaps/yshrsmz/config.h | 2 +- keyboards/lily58/keymaps/yuchi/config.h | 2 +- keyboards/malevolti/lyra/keymaps/default/config.h | 2 +- keyboards/malevolti/lyra/keymaps/via/config.h | 2 +- .../malevolti/superlyra/keymaps/default/config.h | 2 +- keyboards/malevolti/superlyra/keymaps/via/config.h | 2 +- .../minidox/keymaps/dustypomerleau/config.h | 4 +- keyboards/massdrop/alt/keymaps/b_/config.h | 2 +- keyboards/massdrop/alt/keymaps/pregame/config.h | 2 +- keyboards/massdrop/ctrl/keymaps/endgame/config.h | 2 +- .../massdrop/ctrl/keymaps/matthewrobo/config.h | 2 +- keyboards/massdrop/ctrl/keymaps/xanimos/config.h | 2 +- .../steal_this_keyboard/keymaps/default/config.h | 2 +- keyboards/palette1202/keymaps/default/config.h | 2 +- keyboards/pierce/keymaps/durken1/config.h | 2 +- keyboards/pinky/3/keymaps/default/config.h | 2 +- keyboards/pinky/3/keymaps/ninjonas/config.h | 2 +- keyboards/pinky/3/keymaps/via/config.h | 2 +- keyboards/pinky/4/keymaps/default/config.h | 2 +- keyboards/pinky/4/keymaps/via/config.h | 2 +- keyboards/planck/keymaps/adamtabrams/config.h | 4 +- keyboards/planck/keymaps/adamtabrams/keymap.c | 6 +- keyboards/planck/keymaps/jweickm/config.h | 2 +- keyboards/planck/keymaps/jweickm/keymap.c | 24 +- keyboards/planck/keymaps/muppetjones/config.h | 2 +- keyboards/planck/keymaps/rootiest/config.h | 2 +- keyboards/planck/keymaps/rootiest/keymap.c | 6 +- keyboards/planck/keymaps/tylerwince/config.h | 2 +- .../projectcain/relic/keymaps/default/config.h | 2 +- .../projectcain/vault35/keymaps/default/config.h | 2 +- .../projectcain/vault45/keymaps/default/config.h | 2 +- keyboards/rgbkb/mun/keymaps/xulkal2/config.h | 2 +- .../salicylic_acid3/7skb/keymaps/default/config.h | 2 +- .../7skb/keymaps/salicylic/config.h | 2 +- .../7splus/keymaps/salicylic/config.h | 2 +- .../salicylic_acid3/7splus/keymaps/via/config.h | 2 +- .../ajisai74/keymaps/default/config.h | 2 +- .../salicylic_acid3/ajisai74/keymaps/jis/config.h | 2 +- .../ajisai74/keymaps/salicylic/config.h | 2 +- .../salicylic_acid3/ajisai74/keymaps/via/config.h | 2 +- .../ergoarrows/keymaps/default/config.h | 2 +- .../ergoarrows/keymaps/salicylic/config.h | 2 +- .../ergoarrows/keymaps/via/config.h | 2 +- .../getta25/keymaps/default/config.h | 2 +- .../salicylic_acid3/getta25/keymaps/oled/config.h | 2 +- .../jisplit89/keymaps/salicylic/config.h | 2 +- .../nafuda/keymaps/default/config.h | 2 +- .../naked48/keymaps/default/config.h | 2 +- .../naked48/keymaps/default_with_nafuda/config.h | 2 +- .../naked48/keymaps/default_with_setta21/config.h | 2 +- .../naked48/keymaps/salicylic/config.h | 2 +- .../naked48/keymaps/salicylic_with_nafuda/config.h | 2 +- .../keymaps/salicylic_with_setta21/config.h | 2 +- .../naked48/keymaps/scheiklp/config.h | 2 +- .../salicylic_acid3/naked48/keymaps/via/config.h | 2 +- .../naked48/keymaps/via_rgb_matrix/config.h | 2 +- .../naked60/keymaps/333fred/config.h | 2 +- .../naked60/keymaps/default/config.h | 2 +- .../naked60/keymaps/default_with_nafuda/config.h | 2 +- .../naked60/keymaps/default_with_setta21/config.h | 2 +- .../naked60/keymaps/salicylic/config.h | 2 +- .../naked60/keymaps/salicylic_with_nafuda/config.h | 2 +- .../keymaps/salicylic_with_setta21/config.h | 2 +- .../salicylic_acid3/naked60/keymaps/via/config.h | 2 +- .../naked64/keymaps/default/config.h | 2 +- .../naked64/keymaps/default_with_setta21/config.h | 2 +- .../naked64/keymaps/salicylic/config.h | 2 +- .../keymaps/salicylic_with_setta21/config.h | 2 +- .../nknl7en/keymaps/default/config.h | 2 +- .../nknl7en/keymaps/salicylic/config.h | 2 +- .../salicylic_acid3/nknl7en/keymaps/via/config.h | 2 +- .../nknl7jp/keymaps/default/config.h | 2 +- .../nknl7jp/keymaps/salicylic/config.h | 2 +- .../salicylic_acid3/nknl7jp/keymaps/via/config.h | 2 +- .../setta21/keymaps/default/config.h | 2 +- .../setta21/keymaps/salicylic/config.h | 2 +- keyboards/sofle/keymaps/devdev/config.h | 2 +- keyboards/sofle/keymaps/rgb_default/config.h | 2 +- keyboards/sparrow62/keymaps/74th/config.h | 2 +- keyboards/sparrow62/keymaps/default/config.h | 2 +- keyboards/sparrow62/keymaps/via/config.h | 2 +- keyboards/splitkb/kyria/keymaps/jhelvy/config.h | 2 +- .../splitkb/kyria/keymaps/muppetjones/config.h | 2 +- keyboards/splitkb/kyria/keymaps/ohlin/config.h | 2 +- keyboards/splitkb/kyria/keymaps/pierrec83/config.h | 2 +- .../splitkb/kyria/keymaps/winternebs/config.h | 2 +- keyboards/splitkb/kyria/keymaps/zigotica/config.h | 2 +- .../divergetm2/keymaps/xtonhasvim/config.h | 2 +- keyboards/yosino58/keymaps/default/config.h | 2 +- keyboards/yosino58/keymaps/sakura/config.h | 2 +- keyboards/yushakobo/navpad/10/config.h | 2 +- keyboards/yushakobo/navpad/10_helix_r/config.h | 2 +- keyboards/z34/keymaps/zigotica/config.h | 2 +- layouts/community/split_3x6_3/drashna/config.h | 2 +- quantum/action_tapping.c | 19 +- quantum/action_tapping.h | 13 +- tests/tap_hold_configurations/quick_tap/config.h | 21 ++ tests/tap_hold_configurations/quick_tap/test.mk | 18 ++ .../quick_tap/test_action_layer.cpp | 82 ++++++ .../quick_tap/test_quick_tap.cpp | 291 +++++++++++++++++++++ .../tapping_force_hold/config.h | 21 -- .../tapping_force_hold/test.mk | 18 -- .../tapping_force_hold/test_action_layer.cpp | 80 ------ .../tapping_force_hold/test_tap_hold.cpp | 213 --------------- users/bcat/config.h | 2 +- users/cwebster2/config.h | 2 +- users/drashna/config.h | 2 +- users/drashna/keyrecords/tapping.c | 8 +- users/dshields/config.h | 2 +- users/dshields/dshields.c | 7 +- users/kuchosauronad0/config.h | 2 +- users/manna-harbour_miryoku/config.h | 3 +- users/muppetjones/config.h | 2 +- users/ridingqwerty/config.h | 2 +- users/ridingqwerty/ridingqwerty.c | 14 +- users/uqs/config.h | 2 +- users/vosechu/config.h | 2 +- users/xulkal/config.h | 5 +- users/yet-another-developer/config.h | 2 +- 230 files changed, 738 insertions(+), 656 deletions(-) create mode 100644 tests/tap_hold_configurations/quick_tap/config.h create mode 100644 tests/tap_hold_configurations/quick_tap/test.mk create mode 100644 tests/tap_hold_configurations/quick_tap/test_action_layer.cpp create mode 100644 tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp delete mode 100644 tests/tap_hold_configurations/tapping_force_hold/config.h delete mode 100644 tests/tap_hold_configurations/tapping_force_hold/test.mk delete mode 100644 tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp delete mode 100644 tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp (limited to 'data') 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"}, diff --git a/docs/config_options.md b/docs/config_options.md index 6b1f83214c..edaa739201 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -171,12 +171,13 @@ If you define these options you will enable the associated feature, which may in * See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for details * `#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY` * enables handling for per key `IGNORE_MOD_TAP_INTERRUPT` settings -* `#define TAPPING_FORCE_HOLD` - * makes it possible to use a dual role key as modifier shortly after having been tapped - * See [Tapping Force Hold](tap_hold.md#tapping-force-hold) - * Breaks any Tap Toggle functionality (`TT` or the One Shot Tap Toggle) -* `#define TAPPING_FORCE_HOLD_PER_KEY` - * enables handling for per key `TAPPING_FORCE_HOLD` settings +* `#define QUICK_TAP_TERM 100` + * tap-then-hold timing to use a dual role key to repeat keycode + * See [Quick Tap Term](tap_hold.md#quick-tap-term) + * Changes the timing of Tap Toggle functionality (`TT` or the One Shot Tap Toggle) + * Defaults to `TAPPING_TERM` if not defined +* `#define QUICK_TAP_TERM_PER_KEY` + * enables handling for per key `QUICK_TAP_TERM` settings * `#define LEADER_TIMEOUT 300` * how long before the leader key times out * If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the `LEADER_PER_KEY_TIMING` option, which resets the timeout after each key is tapped. diff --git a/docs/tap_hold.md b/docs/tap_hold.md index 8914b730b3..fa6c6abc14 100644 --- a/docs/tap_hold.md +++ b/docs/tap_hold.md @@ -375,49 +375,50 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { } ``` -## Tapping Force Hold +## Quick Tap Term -To enable `tapping force hold`, add the following to your `config.h`: +When the user holds a key after tapping it, the tapping function is repeated by default, rather than activating the hold function. This allows keeping the ability to auto-repeat the tapping function of a dual-role key. `QUICK_TAP_TERM` enables fine tuning of that ability. If set to `0`, it will remove the auto-repeat ability and activate the hold function instead. + +`QUICK_TAP_TERM` is set to `TAPPING_TERM` by default, which is the maximum allowed value for `QUICK_TAP_TERM`. To override its value (in milliseconds) add the following to your `config.h`: ```c -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 120 ``` -When the user holds a key after tapping it, the tapping function is repeated by default, rather than activating the hold function. This allows keeping the ability to auto-repeat the tapping function of a dual-role key. `TAPPING_FORCE_HOLD` removes that ability to let the user activate the hold function instead, in the case of holding the dual-role key after having tapped it. - Example: - `SFT_T(KC_A)` Down - `SFT_T(KC_A)` Up - `SFT_T(KC_A)` Down -- wait until the tapping term expires... -- `SFT_T(KC_A)` Up +- (wait until tapping term expires...) -With default settings, `a` will be sent on the first release, then `a` will be sent on the second press allowing the computer to trigger its auto-repeat function. +With default settings, `a` will be sent on the first release, then `a` will be sent on the second press allowing the computer to trigger its auto repeat function until the key is released. -With `TAPPING_FORCE_HOLD`, the second press will be interpreted as a Shift, allowing to use it as a modifier shortly after having used it as a tap. +With `QUICK_TAP_TERM` configured, the timing between `SFT_T(KC_A)` up and `SFT_T(KC_A)` down must be within `QUICK_TAP_TERM` to trigger auto repeat. Otherwise the second press will be sent as a Shift. If `QUICK_TAP_TERM` is set to `0`, the second press will always be sent as a Shift, effectively disabling auto-repeat. -!> `TAPPING_FORCE_HOLD` will break anything that uses tapping toggles (Such as the `TT` layer keycode, and the One Shot Tap Toggle). +!> `QUICK_TAP_TERM` timing will also impact anything that uses tapping toggles (Such as the `TT` layer keycode, and the One Shot Tap Toggle). For more granular control of this feature, you can add the following to your `config.h`: ```c -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY ``` You can then add the following function to your keymap: ```c -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case LT(1, KC_BSPC): - return true; + case SFT_T(KC_SPC): + return QUICK_TAP_TERM - 20; default: - return false; + return QUICK_TAP_TERM; } } ``` +?> If `QUICK_TAP_TERM` is set higher than `TAPPING_TERM`, it will default to `TAPPING_TERM`. + ## Retro Tapping To enable `retro tapping`, add the following to your `config.h`: diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index 947f5ccfb1..c2322556bc 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 /* Use I2C or Serial */ diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index 54a26cd5bc..d8c12a726e 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 /* Use I2C or Serial */ diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h index a635e944c1..bde9ec2055 100644 --- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h @@ -28,4 +28,4 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h index bd6fd9d1d0..243b953f68 100644 --- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h @@ -16,7 +16,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) diff --git a/keyboards/adm42/rev4/keymaps/default/config.h b/keyboards/adm42/rev4/keymaps/default/config.h index 38c012e938..4082d84a3a 100644 --- a/keyboards/adm42/rev4/keymaps/default/config.h +++ b/keyboards/adm42/rev4/keymaps/default/config.h @@ -1,3 +1,3 @@ #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY #define IGNORE_MOD_TAP_INTERRUPT_PER_KEY diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c index 109796f7ae..245a3bd4de 100644 --- a/keyboards/adm42/rev4/keymaps/default/keymap.c +++ b/keyboards/adm42/rev4/keymaps/default/keymap.c @@ -114,13 +114,13 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { } } -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LLS_ESC: case LLS_RALT: - return true; + return 0; default: - return false; + return QUICK_TAP_TERM; } } diff --git a/keyboards/arabica37/keymaps/default/config.h b/keyboards/arabica37/keymaps/default/config.h index eed6b7221b..57ce4cc0c1 100644 --- a/keyboards/arabica37/keymaps/default/config.h +++ b/keyboards/arabica37/keymaps/default/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 170 #undef RGBLED_NUM diff --git a/keyboards/atreus/keymaps/kejadlen/config.h b/keyboards/atreus/keymaps/kejadlen/config.h index 437bfa326e..5a9573c57f 100644 --- a/keyboards/atreus/keymaps/kejadlen/config.h +++ b/keyboards/atreus/keymaps/kejadlen/config.h @@ -8,6 +8,6 @@ #define DIODE_DIRECTION COL2ROW #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define USB_MAX_POWER_CONSUMPTION 50 diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h index b6f2866c46..1ad3156afa 100644 --- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h +++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h @@ -26,7 +26,7 @@ #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define TAPPING_TERM_PER_KEY diff --git a/keyboards/basekeys/slice/keymaps/default/config.h b/keyboards/basekeys/slice/keymaps/default/config.h index 3dc07fdac1..f1d6eef419 100644 --- a/keyboards/basekeys/slice/keymaps/default/config.h +++ b/keyboards/basekeys/slice/keymaps/default/config.h @@ -18,5 +18,5 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/basekeys/slice/keymaps/default_split_left_space/config.h b/keyboards/basekeys/slice/keymaps/default_split_left_space/config.h index 3dc07fdac1..f1d6eef419 100644 --- a/keyboards/basekeys/slice/keymaps/default_split_left_space/config.h +++ b/keyboards/basekeys/slice/keymaps/default_split_left_space/config.h @@ -18,5 +18,5 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h b/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h index 8f38938b10..3807c29fa7 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h +++ b/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h @@ -18,6 +18,6 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 //#define MASTER_RIGHT diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_all/config.h b/keyboards/basekeys/slice/rev1/keymaps/default_all/config.h index 3dc07fdac1..f1d6eef419 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_all/config.h +++ b/keyboards/basekeys/slice/rev1/keymaps/default_all/config.h @@ -18,5 +18,5 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/config.h b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/config.h index 3dc07fdac1..f1d6eef419 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/config.h +++ b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/config.h @@ -18,5 +18,5 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/config.h b/keyboards/basekeys/slice/rev1/keymaps/via/config.h index 3dc07fdac1..f1d6eef419 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/via/config.h +++ b/keyboards/basekeys/slice/rev1/keymaps/via/config.h @@ -18,5 +18,5 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/config.h index 8f38938b10..3807c29fa7 100644 --- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/config.h @@ -18,6 +18,6 @@ along with this program. If not, see . /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 //#define MASTER_RIGHT diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h index cceba7c1fb..0d11c53e88 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h @@ -43,7 +43,7 @@ * * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h index cbe8e7bba7..2390d10ca5 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h @@ -41,7 +41,7 @@ * * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h index 139b1f06ea..fce6c3a1f6 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h @@ -37,7 +37,7 @@ * Enable rapid switch from tap to hold. Disable auto-repeat when pressing key * twice, except for one-shot keys. */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h index 3b2fa15b96..43037350f6 100644 --- a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h +++ b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h @@ -32,7 +32,7 @@ // #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // Apply the modifier on keys that are tapped during a short hold of a modtap // #define PERMISSIVE_HOLD diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h index d7baf99376..335f968e2a 100644 --- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h +++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h index d7baf99376..335f968e2a 100644 --- a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h +++ b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h index d5d9a9bb83..c5638c767d 100644 --- a/keyboards/buzzard/keymaps/crehmann/config.h +++ b/keyboards/buzzard/keymaps/crehmann/config.h @@ -10,7 +10,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Apply the modifier on keys that are tapped during a short hold of a modtap #define PERMISSIVE_HOLD diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h index 76294cf78a..0f1db48977 100644 --- a/keyboards/buzzard/keymaps/default/config.h +++ b/keyboards/buzzard/keymaps/default/config.h @@ -10,7 +10,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Apply the modifier on keys that are tapped during a short hold of a modtap #define PERMISSIVE_HOLD diff --git a/keyboards/clickety_split/leeloo/keymaps/default/config.h b/keyboards/clickety_split/leeloo/keymaps/default/config.h index 7a8d0f5bd6..c944579972 100644 --- a/keyboards/clickety_split/leeloo/keymaps/default/config.h +++ b/keyboards/clickety_split/leeloo/keymaps/default/config.h @@ -26,7 +26,7 @@ #undef TAPPING_TERM #define IGNORE_MOD_TAP_INTERRUPT - #define TAPPING_FORCE_HOLD + #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #endif diff --git a/keyboards/crkbd/keymaps/ajarov/config.h b/keyboards/crkbd/keymaps/ajarov/config.h index 4c408112bd..d993e8e659 100644 --- a/keyboards/crkbd/keymaps/ajarov/config.h +++ b/keyboards/crkbd/keymaps/ajarov/config.h @@ -27,7 +27,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/antosha417/config.h b/keyboards/crkbd/keymaps/antosha417/config.h index 4b6e86fd6b..bfe2b143d2 100644 --- a/keyboards/crkbd/keymaps/antosha417/config.h +++ b/keyboards/crkbd/keymaps/antosha417/config.h @@ -10,7 +10,7 @@ #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h index 7a3bb76b38..95e7ddb329 100644 --- a/keyboards/crkbd/keymaps/ardakilic/config.h +++ b/keyboards/crkbd/keymaps/ardakilic/config.h @@ -31,7 +31,7 @@ along with this program. If not, see . // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h index 095879a190..f4b8c08a3f 100644 --- a/keyboards/crkbd/keymaps/armand1m/config.h +++ b/keyboards/crkbd/keymaps/armand1m/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // #define PERMISSIVE_HOLD #define TAPPING_TERM 300 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h index b112aed743..f700899883 100644 --- a/keyboards/crkbd/keymaps/benrestech/config.h +++ b/keyboards/crkbd/keymaps/benrestech/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 175 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h index cadb397834..188f717aba 100644 --- a/keyboards/crkbd/keymaps/bermeo/config.h +++ b/keyboards/crkbd/keymaps/bermeo/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 // #define RETRO_TAPPING // #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/blipson/config.h b/keyboards/crkbd/keymaps/blipson/config.h index 1994795836..ca69ac3873 100644 --- a/keyboards/crkbd/keymaps/blipson/config.h +++ b/keyboards/crkbd/keymaps/blipson/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/colemad/config.h b/keyboards/crkbd/keymaps/colemad/config.h index 6d2050e148..b52c669ea9 100644 --- a/keyboards/crkbd/keymaps/colemad/config.h +++ b/keyboards/crkbd/keymaps/colemad/config.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h index 52d4fdd93a..ca025830b4 100644 --- a/keyboards/crkbd/keymaps/crkdves/config.h +++ b/keyboards/crkbd/keymaps/crkdves/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // #define RETRO_TAPPING // #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h index 878f9a74e1..bf33cc90aa 100644 --- a/keyboards/crkbd/keymaps/crkqwes/config.h +++ b/keyboards/crkbd/keymaps/crkqwes/config.h @@ -32,7 +32,7 @@ along with this program. If not, see . #undef USE_I2C #undef SSD1306OLED -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // #define RETRO_TAPPING // #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h index 8f4d73ca22..4e70141dad 100644 --- a/keyboards/crkbd/keymaps/default/config.h +++ b/keyboards/crkbd/keymaps/default/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/devdev/config.h b/keyboards/crkbd/keymaps/devdev/config.h index 14067d1e74..337a86df8e 100644 --- a/keyboards/crkbd/keymaps/devdev/config.h +++ b/keyboards/crkbd/keymaps/devdev/config.h @@ -34,7 +34,7 @@ along with this program. If not, see . #define CUSTOM_LAYER_READ //if you remove this it causes issues - needs better guarding -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/crkbd/keymaps/edvorakjp/config.h b/keyboards/crkbd/keymaps/edvorakjp/config.h index 8787ba88d3..ee4e7388be 100644 --- a/keyboards/crkbd/keymaps/edvorakjp/config.h +++ b/keyboards/crkbd/keymaps/edvorakjp/config.h @@ -8,7 +8,7 @@ #define SWAP_SCLN -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h index e569a59bc9..a926f67537 100644 --- a/keyboards/crkbd/keymaps/hvp/config.h +++ b/keyboards/crkbd/keymaps/hvp/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #define TAPPING_TERM 150 diff --git a/keyboards/crkbd/keymaps/jarred/config.h b/keyboards/crkbd/keymaps/jarred/config.h index c6c80469ed..c95deb1abb 100644 --- a/keyboards/crkbd/keymaps/jarred/config.h +++ b/keyboards/crkbd/keymaps/jarred/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h index fbe5277c40..3b875235a8 100644 --- a/keyboards/crkbd/keymaps/julian_turner/config.h +++ b/keyboards/crkbd/keymaps/julian_turner/config.h @@ -29,6 +29,6 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 //#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h index 74f8a0823b..33655b4c9d 100644 --- a/keyboards/crkbd/keymaps/kidbrazil/config.h +++ b/keyboards/crkbd/keymaps/kidbrazil/config.h @@ -29,7 +29,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #undef PRODUCT #define PRODUCT "CRKBD Loose Transistor Ed." diff --git a/keyboards/crkbd/keymaps/madhatter/config.h b/keyboards/crkbd/keymaps/madhatter/config.h index 599bbc27c3..afdaf1c1fd 100644 --- a/keyboards/crkbd/keymaps/madhatter/config.h +++ b/keyboards/crkbd/keymaps/madhatter/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h index b09d858898..53b5f1b834 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/config.h +++ b/keyboards/crkbd/keymaps/nimishgautam/config.h @@ -19,7 +19,7 @@ #define EXTRA_SHORT_COMBOS //Tapping values -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h index 174c678769..fa3711ce8f 100644 --- a/keyboards/crkbd/keymaps/ninjonas/config.h +++ b/keyboards/crkbd/keymaps/ninjonas/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . #define MASTER_LEFT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 diff --git a/keyboards/crkbd/keymaps/oled_sample/config.h b/keyboards/crkbd/keymaps/oled_sample/config.h index cd24f74744..14718b26d1 100644 --- a/keyboards/crkbd/keymaps/oled_sample/config.h +++ b/keyboards/crkbd/keymaps/oled_sample/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/ollyhayes/config.h b/keyboards/crkbd/keymaps/ollyhayes/config.h index 4c51005181..9ad1ce2c58 100644 --- a/keyboards/crkbd/keymaps/ollyhayes/config.h +++ b/keyboards/crkbd/keymaps/ollyhayes/config.h @@ -18,7 +18,7 @@ #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #define NO_ACTION_ONESHOT diff --git a/keyboards/crkbd/keymaps/oo/config.h b/keyboards/crkbd/keymaps/oo/config.h index 8dc71430a1..814d227d7d 100644 --- a/keyboards/crkbd/keymaps/oo/config.h +++ b/keyboards/crkbd/keymaps/oo/config.h @@ -22,7 +22,7 @@ along with this program. If not, see . #define SPLIT_USB_DETECT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" diff --git a/keyboards/crkbd/keymaps/rarick/config.h b/keyboards/crkbd/keymaps/rarick/config.h index 3dc4003f75..4a033596a8 100644 --- a/keyboards/crkbd/keymaps/rarick/config.h +++ b/keyboards/crkbd/keymaps/rarick/config.h @@ -27,7 +27,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/rjhilgefort/config.h b/keyboards/crkbd/keymaps/rjhilgefort/config.h index 41d709d3a5..a7eb8b2a4f 100644 --- a/keyboards/crkbd/keymaps/rjhilgefort/config.h +++ b/keyboards/crkbd/keymaps/rjhilgefort/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // 200 is default #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/rs/config.h b/keyboards/crkbd/keymaps/rs/config.h index 85b9b95a23..bbdb0d8106 100644 --- a/keyboards/crkbd/keymaps/rs/config.h +++ b/keyboards/crkbd/keymaps/rs/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h index b1896bea90..0ff3549ba9 100644 --- a/keyboards/crkbd/keymaps/sharkby7e/config.h +++ b/keyboards/crkbd/keymaps/sharkby7e/config.h @@ -27,7 +27,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h index 8bceb729d8..b091cd7903 100644 --- a/keyboards/crkbd/keymaps/snowe/config.h +++ b/keyboards/crkbd/keymaps/snowe/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h index 7cd9ecaed9..6cd090f9fd 100644 --- a/keyboards/crkbd/keymaps/soundmonster/config.h +++ b/keyboards/crkbd/keymaps/soundmonster/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #define RETRO_TAPPING #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/config.h b/keyboards/crkbd/keymaps/thumb_ctrl/config.h index 6e54150c17..4191a14524 100755 --- a/keyboards/crkbd/keymaps/thumb_ctrl/config.h +++ b/keyboards/crkbd/keymaps/thumb_ctrl/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/toinux/config.h b/keyboards/crkbd/keymaps/toinux/config.h index 2ee5a4e182..c033076a5a 100644 --- a/keyboards/crkbd/keymaps/toinux/config.h +++ b/keyboards/crkbd/keymaps/toinux/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/vayashiko/config.h b/keyboards/crkbd/keymaps/vayashiko/config.h index 85a5412851..01a1210c81 100644 --- a/keyboards/crkbd/keymaps/vayashiko/config.h +++ b/keyboards/crkbd/keymaps/vayashiko/config.h @@ -30,7 +30,7 @@ along with this program. If not, see . -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h index 4a370ef43c..8ff7589a9d 100644 --- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h +++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h @@ -5,7 +5,7 @@ #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h index 257c9df97b..cddd09e5b6 100644 --- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h +++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h @@ -12,7 +12,7 @@ /* Select hand configuration */ #define MASTER_RIGHT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/vxid/config.h b/keyboards/crkbd/keymaps/vxid/config.h index 5b18de236e..1960e13194 100644 --- a/keyboards/crkbd/keymaps/vxid/config.h +++ b/keyboards/crkbd/keymaps/vxid/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h index 47a18105bd..2ccbb229b8 100644 --- a/keyboards/crkbd/keymaps/xyverz/config.h +++ b/keyboards/crkbd/keymaps/xyverz/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h index d4d7a264d3..fcf6befb16 100644 --- a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h +++ b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h @@ -11,7 +11,7 @@ #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 // #define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h index 7b408ba7bd..a5235259ff 100644 --- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h @@ -19,7 +19,7 @@ #endif // !NO_PRINT #define NO_ACTION_ONESHOT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h index 786360c5a2..4ea0d150ea 100644 --- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h @@ -65,7 +65,7 @@ #endif // !NO_PRINT #define NO_ACTION_ONESHOT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h index 2fdb3e5f4c..c302214061 100644 --- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h @@ -49,5 +49,5 @@ // #define RGB_MATRIX_KEYRELEASES #define NO_ACTION_ONESHOT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h index 6586ab58e4..93e6990950 100644 --- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h +++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h @@ -59,7 +59,7 @@ #endif // !NO_PRINT #define NO_ACTION_ONESHOT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h index acd3a44e16..3f8c68ceb7 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h @@ -78,7 +78,7 @@ // #define NO_PRINT // #define RETRO_TAPPING -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // #define AUTO_SHIFT_TIMEOUT 150 // #define NO_AUTO_SHIFT_SPECIAL diff --git a/keyboards/ergodox_ez/keymaps/stamm/config.h b/keyboards/ergodox_ez/keymaps/stamm/config.h index e1db3d9002..f9e89d276f 100644 --- a/keyboards/ergodox_ez/keymaps/stamm/config.h +++ b/keyboards/ergodox_ez/keymaps/stamm/config.h @@ -32,8 +32,8 @@ #define IGNORE_MOD_TAP_INTERRUPT #define IGNORE_MOD_TAP_INTERRUPT_PER_KEY -#define TAPPING_FORCE_HOLD -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM 0 +#define QUICK_TAP_TERM_PER_KEY /* #define RETRO_TAPPING */ #undef LED_BRIGHTNESS_DEFAULT diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c index 2b0aff6362..aa9debfe57 100644 --- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c +++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c @@ -225,28 +225,25 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { } } - -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case LT(_1_NUMBERS, KC_E): - case R_MOUSE: - case LSFT_T(KC_A): - case LCTL_T(KC_S): - case LALT_T(KC_D): - case LGUI_T(KC_F): - case RGUI_T(KC_J): - case RALT_T(KC_K): - case RCTL_T(KC_L): - case RSFT_T(KC_SEMICOLON): - case ARROWS: - return false; - default: - return true; - } +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LT(_1_NUMBERS, KC_E): + case R_MOUSE: + case LSFT_T(KC_A): + case LCTL_T(KC_S): + case LALT_T(KC_D): + case LGUI_T(KC_F): + case RGUI_T(KC_J): + case RALT_T(KC_K): + case RCTL_T(KC_L): + case RSFT_T(KC_SEMICOLON): + case ARROWS: + return QUICK_TAP_TERM; + default: + return 0; + } } - - LEADER_EXTERNS(); void matrix_scan_user(void) { diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h index 4f63ee544f..5c2377be1e 100644 --- a/keyboards/ferris/keymaps/bruun-baer/config.h +++ b/keyboards/ferris/keymaps/bruun-baer/config.h @@ -36,4 +36,4 @@ along with this program. If not, see . #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h index 1937b64ffa..b10555bb0d 100644 --- a/keyboards/ferris/keymaps/default/config.h +++ b/keyboards/ferris/keymaps/default/config.h @@ -36,7 +36,7 @@ along with this program. If not, see . #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Underglow configuration #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h index 1937b64ffa..b10555bb0d 100644 --- a/keyboards/ferris/keymaps/pierrec83/config.h +++ b/keyboards/ferris/keymaps/pierrec83/config.h @@ -36,7 +36,7 @@ along with this program. If not, see . #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Underglow configuration #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/config.h b/keyboards/gl516/a52gl/keymaps/salicylic/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/gl516/a52gl/keymaps/salicylic/config.h +++ b/keyboards/gl516/a52gl/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h index b0360ac95d..0f71fedd0e 100644 --- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h +++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/config.h b/keyboards/gl516/n51gl/keymaps/salicylic/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/gl516/n51gl/keymaps/salicylic/config.h +++ b/keyboards/gl516/n51gl/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/gl516/n51gl/keymaps/via/config.h b/keyboards/gl516/n51gl/keymaps/via/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/gl516/n51gl/keymaps/via/config.h +++ b/keyboards/gl516/n51gl/keymaps/via/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/handwired/aranck/keymaps/turkishish/config.h b/keyboards/handwired/aranck/keymaps/turkishish/config.h index 0810a3b23f..69c1beb03c 100644 --- a/keyboards/handwired/aranck/keymaps/turkishish/config.h +++ b/keyboards/handwired/aranck/keymaps/turkishish/config.h @@ -21,4 +21,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD \ No newline at end of file +#define QUICK_TAP_TERM 0 \ No newline at end of file diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 317d25f5f5..9aba789cc2 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -93,7 +93,7 @@ along with this program. If not, see . //#define TAPPING_TERM 150 //#define IGNORE_MOD_TAP_INTERRUPT -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 6 diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h index 1e6e6e58c6..b8df581b72 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h @@ -27,7 +27,7 @@ along with this program. If not, see . #define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key #define IGNORE_MOD_TAP_INTERRUPT // ignore hold mod if another tap occurs within tapping term #define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key -#define TAPPING_FORCE_HOLD_PER_KEY // disable double tap hold key repeat per key +#define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key #undef MOUSEKEY_INTERVAL #undef MOUSEKEY_DELAY #undef MOUSEKEY_TIME_TO_MAX diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c index b5a8c82c4a..7df7897ae9 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c @@ -55,15 +55,15 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { } // Tapping force hold per key -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case LT(3, KC_SPC): - return true; // Enable force hold - case LT(2, KC_TAB): - return true; - default: - return false; // Disable force hold - } +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LT(3, KC_SPC): + return 0; // Enable force hold + case LT(2, KC_TAB): + return 0; + default: + return QUICK_TAP_TERM; // Disable force hold + } } // Tapping term per key diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h index 5a94cd1760..7b43dcb5d4 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h @@ -51,6 +51,6 @@ #define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define FORCE_NKRO diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h index 0810a3b23f..69c1beb03c 100644 --- a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h +++ b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h @@ -21,4 +21,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD \ No newline at end of file +#define QUICK_TAP_TERM 0 \ No newline at end of file diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h index fadb3fe204..3e3eacdaa5 100644 --- a/keyboards/helix/pico/config.h +++ b/keyboards/helix/pico/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 /* Soft Serial defines */ diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h index f409d039c4..460dce69e5 100644 --- a/keyboards/helix/rev2/config.h +++ b/keyboards/helix/rev2/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #define SPLIT_LAYER_STATE_ENABLE diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h index ca3b73aa29..6854249be0 100644 --- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h +++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h @@ -2,7 +2,7 @@ #define SWAP_SCLN -#undef TAPPING_FORCE_HOLD +#undef QUICK_TAP_TERM #undef TAPPING_TERM #define TAPPING_TERM 300 #define IGNORE_MOD_TAP_INTERRUPT @@ -11,13 +11,13 @@ // Selection of RGBLIGHT MODE to use. #if defined(LED_ANIMATIONS) -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS +// # define RGBLIGHT_EFFECT_BREATHING +// # define RGBLIGHT_EFFECT_RAINBOW_MOOD +// # define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// # define RGBLIGHT_EFFECT_SNAKE +// # define RGBLIGHT_EFFECT_KNIGHT +// # define RGBLIGHT_EFFECT_CHRISTMAS # define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -#endif // LED_ANIMATIONS +// # define RGBLIGHT_EFFECT_RGB_TEST +// # define RGBLIGHT_EFFECT_ALTERNATING +#endif // LED_ANIMATIONS diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h index d7baf99376..335f968e2a 100644 --- a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h +++ b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/keebio/iris/keymaps/jhelvy/config.h b/keyboards/keebio/iris/keymaps/jhelvy/config.h index c019234732..7ec5b41761 100644 --- a/keyboards/keebio/iris/keymaps/jhelvy/config.h +++ b/keyboards/keebio/iris/keymaps/jhelvy/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . // Had to swap the master to get the right-side rotary encoder supported #define MASTER_RIGHT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #undef TAPPING_TERM #define TAPPING_TERM 200 #define AUTO_SHIFT_TIMEOUT 150 diff --git a/keyboards/keebio/iris/keymaps/osiris/config.h b/keyboards/keebio/iris/keymaps/osiris/config.h index 225a858131..eac14a7246 100644 --- a/keyboards/keebio/iris/keymaps/osiris/config.h +++ b/keyboards/keebio/iris/keymaps/osiris/config.h @@ -37,6 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 // #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #define PERMISSIVE_HOLD diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h index 7618683d10..a6a97d5b76 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h @@ -12,7 +12,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Mouse key speed and acceleration. #undef MOUSEKEY_DELAY diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h index cbadc54901..9d566d388d 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h @@ -23,7 +23,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Auto Shift #define NO_AUTO_SHIFT_ALPHA diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h index e464db1e36..c1f1a06a33 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h @@ -44,7 +44,7 @@ // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h index 6062ebbbbb..be172a8cf6 100644 --- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h +++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h @@ -29,7 +29,7 @@ // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h index c525cff819..3be7f6f0cb 100644 --- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h +++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h @@ -11,7 +11,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h b/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h index 09248850f2..e5d0aa6699 100644 --- a/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h +++ b/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h @@ -28,7 +28,7 @@ #define MASTER_LEFT // #define EE_HANDS - #define TAPPING_FORCE_HOLD + #define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/chuan/config.h b/keyboards/lily58/keymaps/chuan/config.h index 7d989ba42e..d952ce457b 100644 --- a/keyboards/lily58/keymaps/chuan/config.h +++ b/keyboards/lily58/keymaps/chuan/config.h @@ -32,7 +32,7 @@ along with this program. If not, see . // #define SSD1306OLED -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* define tapping term */ #define TAPPING_TERM 200 diff --git a/keyboards/lily58/keymaps/datadavd/config.h b/keyboards/lily58/keymaps/datadavd/config.h index 83bbfff11f..19b372e569 100644 --- a/keyboards/lily58/keymaps/datadavd/config.h +++ b/keyboards/lily58/keymaps/datadavd/config.h @@ -30,7 +30,7 @@ along with this program. If not, see . // #define SSD1306OLED -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 50 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h index 79b1314456..b16e63b6d7 100644 --- a/keyboards/lily58/keymaps/default/config.h +++ b/keyboards/lily58/keymaps/default/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/domnantas/config.h b/keyboards/lily58/keymaps/domnantas/config.h index f32a066c14..143a950ef2 100644 --- a/keyboards/lily58/keymaps/domnantas/config.h +++ b/keyboards/lily58/keymaps/domnantas/config.h @@ -30,5 +30,5 @@ along with this program. If not, see . // #define SSD1306OLED -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/lily58/keymaps/drasbeck/config.h b/keyboards/lily58/keymaps/drasbeck/config.h index f510f7f735..01ba4faf73 100644 --- a/keyboards/lily58/keymaps/drasbeck/config.h +++ b/keyboards/lily58/keymaps/drasbeck/config.h @@ -24,7 +24,7 @@ Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck #define ENCODERS_PAD_B { F5 } #define ENCODER_RESOLUTION 4 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/gaston/config.h b/keyboards/lily58/keymaps/gaston/config.h index 621a0a9295..988e3eb6f8 100644 --- a/keyboards/lily58/keymaps/gaston/config.h +++ b/keyboards/lily58/keymaps/gaston/config.h @@ -22,5 +22,5 @@ #define MASTER_LEFT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 /* ms */ diff --git a/keyboards/lily58/keymaps/gshmu/config.h b/keyboards/lily58/keymaps/gshmu/config.h index 08234a4d4b..84a79412da 100644 --- a/keyboards/lily58/keymaps/gshmu/config.h +++ b/keyboards/lily58/keymaps/gshmu/config.h @@ -17,7 +17,7 @@ #pragma once #define TAPPING_TERM 200 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define PERMISSIVE_HOLD #define DYNAMIC_TAPPING_TERM_INCREMENT 10 diff --git a/keyboards/lily58/keymaps/jhelvy/config.h b/keyboards/lily58/keymaps/jhelvy/config.h index 4d4df5b102..dbd058a8b5 100644 --- a/keyboards/lily58/keymaps/jhelvy/config.h +++ b/keyboards/lily58/keymaps/jhelvy/config.h @@ -30,7 +30,7 @@ along with this program. If not, see . #define SSD1306OLED -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #undef TAPPING_TERM #define TAPPING_TERM 200 diff --git a/keyboards/lily58/keymaps/mikefightsbears/config.h b/keyboards/lily58/keymaps/mikefightsbears/config.h index 454f52c868..084b95d52f 100644 --- a/keyboards/lily58/keymaps/mikefightsbears/config.h +++ b/keyboards/lily58/keymaps/mikefightsbears/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/muppetjones/config.h b/keyboards/lily58/keymaps/muppetjones/config.h index bee5ee45da..283a4ed890 100644 --- a/keyboards/lily58/keymaps/muppetjones/config.h +++ b/keyboards/lily58/keymaps/muppetjones/config.h @@ -35,7 +35,7 @@ along with this program. If not, see . #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h index e10c2bb380..a6fac1a58b 100644 --- a/keyboards/lily58/keymaps/narze/config.h +++ b/keyboards/lily58/keymaps/narze/config.h @@ -34,7 +34,7 @@ along with this program. If not, see . #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h index d67ac41a17..9c97dc9e3f 100644 --- a/keyboards/lily58/keymaps/ninjonas/config.h +++ b/keyboards/lily58/keymaps/ninjonas/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define OLED_FONT_H "keyboards/lily58/lib/glcdfont.c" #define OLED_DISABLE_TIMEOUT diff --git a/keyboards/lily58/keymaps/pttbx/config.h b/keyboards/lily58/keymaps/pttbx/config.h index 79b1314456..b16e63b6d7 100644 --- a/keyboards/lily58/keymaps/pttbx/config.h +++ b/keyboards/lily58/keymaps/pttbx/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/via/config.h b/keyboards/lily58/keymaps/via/config.h index a5dfe7c8d3..331521bcbf 100644 --- a/keyboards/lily58/keymaps/via/config.h +++ b/keyboards/lily58/keymaps/via/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 // Underglow diff --git a/keyboards/lily58/keymaps/yshrsmz/config.h b/keyboards/lily58/keymaps/yshrsmz/config.h index 454f52c868..084b95d52f 100644 --- a/keyboards/lily58/keymaps/yshrsmz/config.h +++ b/keyboards/lily58/keymaps/yshrsmz/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/lily58/keymaps/yuchi/config.h b/keyboards/lily58/keymaps/yuchi/config.h index 1335b805cd..8e07ec837f 100644 --- a/keyboards/lily58/keymaps/yuchi/config.h +++ b/keyboards/lily58/keymaps/yuchi/config.h @@ -30,5 +30,5 @@ along with this program. If not, see . //#define OLED_DRIVER -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/lyra/keymaps/default/config.h b/keyboards/malevolti/lyra/keymaps/default/config.h index 9c4bacd36d..3e8db641e1 100644 --- a/keyboards/malevolti/lyra/keymaps/default/config.h +++ b/keyboards/malevolti/lyra/keymaps/default/config.h @@ -26,5 +26,5 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/lyra/keymaps/via/config.h b/keyboards/malevolti/lyra/keymaps/via/config.h index 9c4bacd36d..3e8db641e1 100644 --- a/keyboards/malevolti/lyra/keymaps/via/config.h +++ b/keyboards/malevolti/lyra/keymaps/via/config.h @@ -26,5 +26,5 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/superlyra/keymaps/default/config.h b/keyboards/malevolti/superlyra/keymaps/default/config.h index bbdf47463f..7f20fea8be 100644 --- a/keyboards/malevolti/superlyra/keymaps/default/config.h +++ b/keyboards/malevolti/superlyra/keymaps/default/config.h @@ -22,5 +22,5 @@ along with this program. If not, see . -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/superlyra/keymaps/via/config.h b/keyboards/malevolti/superlyra/keymaps/via/config.h index bbdf47463f..7f20fea8be 100644 --- a/keyboards/malevolti/superlyra/keymaps/via/config.h +++ b/keyboards/malevolti/superlyra/keymaps/via/config.h @@ -22,5 +22,5 @@ along with this program. If not, see . -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h index 0cd6c2b994..0bb532c663 100644 --- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h +++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h @@ -10,9 +10,9 @@ // optional configuration: // #define CONVERT_TO_PROTON_C -// #define ONESHOT_TAP_TOGGLE 2 // not compatible with TAPPING_FORCE_HOLD +// #define ONESHOT_TAP_TOGGLE 2 // not compatible with QUICK_TAP_TERM 0 // #define PERMISSIVE_HOLD -// #define TAPPING_FORCE_HOLD // allows rapid mod use after tap event, but sacrifices double-tap to repeat +// #define QUICK_TAP_TERM 0 // allows rapid mod use after tap event, but sacrifices double-tap to repeat // #define MOUSEKEY_DELAY 0 // delay before cursor movement (high feels sluggish, low makes fine movement difficult) // #define MOUSEKEY_INTERVAL 20 // time between movement reports - low settings feel like high mouse speed diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h index 7dec786b79..8f06c0dd34 100644 --- a/keyboards/massdrop/alt/keymaps/b_/config.h +++ b/keyboards/massdrop/alt/keymaps/b_/config.h @@ -32,7 +32,7 @@ // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h index 90892cc802..83f0d13bd5 100644 --- a/keyboards/massdrop/alt/keymaps/pregame/config.h +++ b/keyboards/massdrop/alt/keymaps/pregame/config.h @@ -45,7 +45,7 @@ // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h index 1a7c77b90e..8584c07a5d 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h +++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h @@ -29,7 +29,7 @@ #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h index deb40efb7d..b975b7895b 100644 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h +++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h @@ -47,7 +47,7 @@ along with this program. If not, see . // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h index 767fbaffca..87db7fe8ea 100644 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h +++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h @@ -45,7 +45,7 @@ #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details // #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details -// #define TAPPING_FORCE_HOLD // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) +// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. diff --git a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h index 14ec0792b1..3e3ba7a401 100644 --- a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h +++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h @@ -36,4 +36,4 @@ along with this program. If not, see . #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/palette1202/keymaps/default/config.h b/keyboards/palette1202/keymaps/default/config.h index a5bb9bbfc8..3ec3b391d4 100644 --- a/keyboards/palette1202/keymaps/default/config.h +++ b/keyboards/palette1202/keymaps/default/config.h @@ -16,5 +16,5 @@ #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h index 7c9970c5a9..7049a692ed 100644 --- a/keyboards/pierce/keymaps/durken1/config.h +++ b/keyboards/pierce/keymaps/durken1/config.h @@ -23,7 +23,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define PERMISSIVE_HOLD diff --git a/keyboards/pinky/3/keymaps/default/config.h b/keyboards/pinky/3/keymaps/default/config.h index 63e8168b47..3671c13a38 100644 --- a/keyboards/pinky/3/keymaps/default/config.h +++ b/keyboards/pinky/3/keymaps/default/config.h @@ -24,6 +24,6 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RETRO_TAPPPING diff --git a/keyboards/pinky/3/keymaps/ninjonas/config.h b/keyboards/pinky/3/keymaps/ninjonas/config.h index 63e8168b47..3671c13a38 100644 --- a/keyboards/pinky/3/keymaps/ninjonas/config.h +++ b/keyboards/pinky/3/keymaps/ninjonas/config.h @@ -24,6 +24,6 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RETRO_TAPPPING diff --git a/keyboards/pinky/3/keymaps/via/config.h b/keyboards/pinky/3/keymaps/via/config.h index 63e8168b47..3671c13a38 100644 --- a/keyboards/pinky/3/keymaps/via/config.h +++ b/keyboards/pinky/3/keymaps/via/config.h @@ -24,6 +24,6 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RETRO_TAPPPING diff --git a/keyboards/pinky/4/keymaps/default/config.h b/keyboards/pinky/4/keymaps/default/config.h index 63e8168b47..3671c13a38 100644 --- a/keyboards/pinky/4/keymaps/default/config.h +++ b/keyboards/pinky/4/keymaps/default/config.h @@ -24,6 +24,6 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RETRO_TAPPPING diff --git a/keyboards/pinky/4/keymaps/via/config.h b/keyboards/pinky/4/keymaps/via/config.h index 63e8168b47..3671c13a38 100644 --- a/keyboards/pinky/4/keymaps/via/config.h +++ b/keyboards/pinky/4/keymaps/via/config.h @@ -24,6 +24,6 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RETRO_TAPPPING diff --git a/keyboards/planck/keymaps/adamtabrams/config.h b/keyboards/planck/keymaps/adamtabrams/config.h index 0c275f20c5..8ff86760b4 100644 --- a/keyboards/planck/keymaps/adamtabrams/config.h +++ b/keyboards/planck/keymaps/adamtabrams/config.h @@ -35,5 +35,5 @@ #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT #define IGNORE_MOD_TAP_INTERRUPT_PER_KEY -#define TAPPING_FORCE_HOLD -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM 0 +#define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c index 3d4aa46963..2203ecd30f 100644 --- a/keyboards/planck/keymaps/adamtabrams/keymap.c +++ b/keyboards/planck/keymaps/adamtabrams/keymap.c @@ -229,7 +229,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SHFTESC: case NUMSPAC: @@ -249,9 +249,9 @@ bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { case CTL__J: case CTL__T: case CTL__N: - return true; + return 0; default: - return false; + return QUICK_TAP_TERM; } } diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h index 3b34ddf832..bd34fca202 100644 --- a/keyboards/planck/keymaps/jweickm/config.h +++ b/keyboards/planck/keymaps/jweickm/config.h @@ -58,7 +58,7 @@ #define TAPPING_TERM_PER_KEY //#define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY // settings for LEADER key #define LEADER_PER_KEY_TIMING diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c index b2c317f039..1b8b8b28a8 100644 --- a/keyboards/planck/keymaps/jweickm/keymap.c +++ b/keyboards/planck/keymaps/jweickm/keymap.c @@ -1039,30 +1039,30 @@ bool music_mask_user(uint16_t keycode) { } } -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LSFT_T(KC_S): - return true; + return 0; case RSFT_T(KC_E): - return true; + return 0; case LSFT_T(KC_D): - return true; + return 0; case RSFT_T(KC_K): - return true; + return 0; case LSFT_T(KC_F): - return true; + return 0; case RSFT_T(KC_U): - return true; + return 0; case LT(_RAISE, KC_ENT): - return true; + return 0; case LT(_RAISE_DE, KC_ENT): - return true; + return 0; case LT(_LOWER, KC_BSPC): - return true; + return 0; case LT(_LOWER_DE, KC_BSPC): - return true; + return 0; default: - return false; + return QUICK_TAP_TERM; } } diff --git a/keyboards/planck/keymaps/muppetjones/config.h b/keyboards/planck/keymaps/muppetjones/config.h index 1046d21499..1a05bfc837 100644 --- a/keyboards/planck/keymaps/muppetjones/config.h +++ b/keyboards/planck/keymaps/muppetjones/config.h @@ -53,4 +53,4 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h index 4de638ce29..bdb5cea91b 100644 --- a/keyboards/planck/keymaps/rootiest/config.h +++ b/keyboards/planck/keymaps/rootiest/config.h @@ -117,7 +117,7 @@ * MACRO per-key options */ #define RETRO_TAPPING_PER_KEY // Control Retro-Tap individually by key -#define TAPPING_FORCE_HOLD_PER_KEY // Control Force-Hold individually by key +#define QUICK_TAP_TERM_PER_KEY // Control Quick-Tap individually by key #define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Control Mod-Tap-Interrupt individually by key #define PERMISSIVE_HOLD_PER_KEY // Control Permissive-Hold individually by key diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c index 097f313cca..cc43aff673 100644 --- a/keyboards/planck/keymaps/rootiest/keymap.c +++ b/keyboards/planck/keymaps/rootiest/keymap.c @@ -1376,11 +1376,11 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t* record) { return false; } } -// Handles per-key configuration of Tapping Force-Hold -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t* record) { +// Handles per-key configuration of Quick-Tap +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record) { switch (keycode) { default: - return false; + return QUICK_TAP_TERM; } } // Handles per-key configuration of Permissive-Hold diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h index 24adad94f3..52c1494a1d 100644 --- a/keyboards/planck/keymaps/tylerwince/config.h +++ b/keyboards/planck/keymaps/tylerwince/config.h @@ -12,7 +12,7 @@ Set any config.h overrides for your specific keymap here. See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT #define EECONFIG_RGB_MATRIX (uint32_t *)16 diff --git a/keyboards/projectcain/relic/keymaps/default/config.h b/keyboards/projectcain/relic/keymaps/default/config.h index 7756a8db2f..ebe839c4c4 100644 --- a/keyboards/projectcain/relic/keymaps/default/config.h +++ b/keyboards/projectcain/relic/keymaps/default/config.h @@ -19,5 +19,5 @@ #define ENCODER_RESOLUTION 2 #define COMBO_COUNT 6 #define COMBO_TERM 50 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define DISABLE_LEADER diff --git a/keyboards/projectcain/vault35/keymaps/default/config.h b/keyboards/projectcain/vault35/keymaps/default/config.h index 3022aa84c4..885d5ad9cb 100644 --- a/keyboards/projectcain/vault35/keymaps/default/config.h +++ b/keyboards/projectcain/vault35/keymaps/default/config.h @@ -18,4 +18,4 @@ #define COMBO_COUNT 2 #define COMBO_TERM 50 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/projectcain/vault45/keymaps/default/config.h b/keyboards/projectcain/vault45/keymaps/default/config.h index 2ca1e8f123..4a98bb89d4 100644 --- a/keyboards/projectcain/vault45/keymaps/default/config.h +++ b/keyboards/projectcain/vault45/keymaps/default/config.h @@ -18,4 +18,4 @@ #define COMBO_COUNT 2 #define COMBO_TERM 50 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h b/keyboards/rgbkb/mun/keymaps/xulkal2/config.h index 7e3fc2d908..c945db1417 100644 --- a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h +++ b/keyboards/rgbkb/mun/keymaps/xulkal2/config.h @@ -10,7 +10,7 @@ #pragma once // Xulkal custom stuff -#undef TAPPING_FORCE_HOLD +#undef QUICK_TAP_TERM #undef TAPPING_TERM #define TAPPING_TERM 175 diff --git a/keyboards/salicylic_acid3/7skb/keymaps/default/config.h b/keyboards/salicylic_acid3/7skb/keymaps/default/config.h index 4b3496d856..c2844a6775 100644 --- a/keyboards/salicylic_acid3/7skb/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/7skb/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h index cc4a3d4426..09bf50b6ab 100644 --- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 //#define MASTER_RIGHT diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h index 81ee8ef785..8a42af5127 100644 --- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/7splus/keymaps/via/config.h b/keyboards/salicylic_acid3/7splus/keymaps/via/config.h index 8a89da2eae..83e6f1b184 100644 --- a/keyboards/salicylic_acid3/7splus/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/7splus/keymaps/via/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h index 81ee8ef785..8a42af5127 100644 --- a/keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h index 81ee8ef785..8a42af5127 100644 --- a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h +++ b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h index 81ee8ef785..8a42af5127 100644 --- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h index 81ee8ef785..8a42af5127 100644 --- a/keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/getta25/keymaps/default/config.h b/keyboards/salicylic_acid3/getta25/keymaps/default/config.h index 8c4e1f5129..a79d62d614 100644 --- a/keyboards/salicylic_acid3/getta25/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/getta25/keymaps/default/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/getta25/keymaps/oled/config.h b/keyboards/salicylic_acid3/getta25/keymaps/oled/config.h index be988915c2..23f8b5343f 100644 --- a/keyboards/salicylic_acid3/getta25/keymaps/oled/config.h +++ b/keyboards/salicylic_acid3/getta25/keymaps/oled/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #define OLED_FONT_H "keyboards/getta25/keymaps/oled/glcdfont.c" diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h index 81ee8ef785..8a42af5127 100644 --- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/nafuda/keymaps/default/config.h b/keyboards/salicylic_acid3/nafuda/keymaps/default/config.h index e35fe2ccd7..1633dcc847 100644 --- a/keyboards/salicylic_acid3/nafuda/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/nafuda/keymaps/default/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h index 4f3a44d6bb..c3d26106ca 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h @@ -22,5 +22,5 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h index 4d52c01805..12d5784374 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h @@ -22,7 +22,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h index 7cb5d61e2b..392f2f97e8 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h @@ -22,7 +22,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h index e7016c4b78..b8a6b843ce 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h index 4d52c01805..12d5784374 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h @@ -22,7 +22,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h index 7cb5d61e2b..392f2f97e8 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h @@ -22,7 +22,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h index 8c11ad6078..1742af4c5c 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h @@ -5,5 +5,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/via/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h index 6106dc4e3d..21494a0dfd 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h +++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #ifdef RGBLED_NUM diff --git a/keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h b/keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h index d19e77f044..5cb4da0133 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h @@ -20,5 +20,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default/config.h index 4b3496d856..c2844a6775 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h index 603c9ab026..ed08dc121c 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h @@ -22,5 +22,5 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h index 603c9ab026..ed08dc121c 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h @@ -22,5 +22,5 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h index 4b3496d856..c2844a6775 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h index 603c9ab026..ed08dc121c 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h @@ -22,5 +22,5 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h index 603c9ab026..ed08dc121c 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h @@ -22,5 +22,5 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked60/keymaps/via/config.h b/keyboards/salicylic_acid3/naked60/keymaps/via/config.h index 32ec5281b2..f90e802882 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/naked60/keymaps/via/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default/config.h index 8c4e1f5129..a79d62d614 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/naked64/keymaps/default/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h index cba07919ff..73a3019540 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h @@ -22,7 +22,7 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h index 4b3496d856..c2844a6775 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h index 603c9ab026..ed08dc121c 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h +++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h @@ -22,5 +22,5 @@ // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h index 6f3b77b0de..d06aae947a 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h index fd96baa819..0e221d844d 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/setta21/keymaps/default/config.h b/keyboards/salicylic_acid3/setta21/keymaps/default/config.h index e35fe2ccd7..1633dcc847 100644 --- a/keyboards/salicylic_acid3/setta21/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/setta21/keymaps/default/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h index 26607eca89..540c819c2b 100644 --- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h @@ -18,7 +18,7 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h index c3694d1292..6564238bba 100644 --- a/keyboards/sofle/keymaps/devdev/config.h +++ b/keyboards/sofle/keymaps/devdev/config.h @@ -32,7 +32,7 @@ #define CUSTOM_LAYER_READ //if you remove this it causes issues - needs better guarding -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #ifdef TAPPING_TERM #undef TAPPING_TERM #define TAPPING_TERM 200 diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h index c3694d1292..6564238bba 100644 --- a/keyboards/sofle/keymaps/rgb_default/config.h +++ b/keyboards/sofle/keymaps/rgb_default/config.h @@ -32,7 +32,7 @@ #define CUSTOM_LAYER_READ //if you remove this it causes issues - needs better guarding -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #ifdef TAPPING_TERM #undef TAPPING_TERM #define TAPPING_TERM 200 diff --git a/keyboards/sparrow62/keymaps/74th/config.h b/keyboards/sparrow62/keymaps/74th/config.h index 15eb08ed7a..e1fae611ce 100644 --- a/keyboards/sparrow62/keymaps/74th/config.h +++ b/keyboards/sparrow62/keymaps/74th/config.h @@ -19,5 +19,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/sparrow62/keymaps/default/config.h b/keyboards/sparrow62/keymaps/default/config.h index 15eb08ed7a..e1fae611ce 100644 --- a/keyboards/sparrow62/keymaps/default/config.h +++ b/keyboards/sparrow62/keymaps/default/config.h @@ -19,5 +19,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/sparrow62/keymaps/via/config.h b/keyboards/sparrow62/keymaps/via/config.h index 15eb08ed7a..e1fae611ce 100644 --- a/keyboards/sparrow62/keymaps/via/config.h +++ b/keyboards/sparrow62/keymaps/via/config.h @@ -19,5 +19,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/config.h b/keyboards/splitkb/kyria/keymaps/jhelvy/config.h index 86f3d5b5c3..518c9378e4 100644 --- a/keyboards/splitkb/kyria/keymaps/jhelvy/config.h +++ b/keyboards/splitkb/kyria/keymaps/jhelvy/config.h @@ -22,7 +22,7 @@ #define ENCODER_RESOLUTION 2 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define AUTO_SHIFT_TIMEOUT 150 diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h index 92d495be4a..b6351869fe 100644 --- a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h +++ b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h @@ -43,7 +43,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Reduce firmware size // https://thomasbaart.nl/2018/12/01/reducing-firmware-size-in-qmk/ diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h index 238206a49e..4451ff731c 100644 --- a/keyboards/splitkb/kyria/keymaps/ohlin/config.h +++ b/keyboards/splitkb/kyria/keymaps/ohlin/config.h @@ -26,4 +26,4 @@ // Prevent normal rollover on alphas from accidentally triggering mods. #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD \ No newline at end of file +#define QUICK_TAP_TERM 0 diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h index 816dd16312..b4f3f32255 100644 --- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h +++ b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h @@ -44,7 +44,7 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Allows to use either side as the master. Look at the documentation for info: // https://docs.qmk.fm/#/config_options?id=setting-handedness #define EE_HANDS diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/config.h b/keyboards/splitkb/kyria/keymaps/winternebs/config.h index 1df48a1f49..f0632e90ae 100755 --- a/keyboards/splitkb/kyria/keymaps/winternebs/config.h +++ b/keyboards/splitkb/kyria/keymaps/winternebs/config.h @@ -27,5 +27,5 @@ #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION #define NO_ACTION_ONESHOT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h index b59e04474b..8c4e8dfece 100644 --- a/keyboards/splitkb/kyria/keymaps/zigotica/config.h +++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . #define TAPPING_TERM 350 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 300 diff --git a/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h index 4ba4a57165..4585f2230b 100644 --- a/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h +++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h @@ -3,7 +3,7 @@ // help for fast typist+dual function keys? #define PERMISSIVE_HOLD // Let me type `ls -l` more quickly. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // where is the cord plugged in? #define MASTER_RIGHT diff --git a/keyboards/yosino58/keymaps/default/config.h b/keyboards/yosino58/keymaps/default/config.h index 89778175c7..763b31aa10 100644 --- a/keyboards/yosino58/keymaps/default/config.h +++ b/keyboards/yosino58/keymaps/default/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/yosino58/keymaps/sakura/config.h b/keyboards/yosino58/keymaps/sakura/config.h index 001160d60e..a463ee1808 100644 --- a/keyboards/yosino58/keymaps/sakura/config.h +++ b/keyboards/yosino58/keymaps/sakura/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . #define OLED_DISPLAY_128X64 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h index 6d631ac32d..d9325aee19 100644 --- a/keyboards/yushakobo/navpad/10/config.h +++ b/keyboards/yushakobo/navpad/10/config.h @@ -72,6 +72,6 @@ along with this program. If not, see . //#define BOOTMAGIC_LITE_COLUMN 0 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 132 #define TAPPING_LAYER_TERM 90 diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 646cb59b63..3a5ba847b5 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -107,6 +107,6 @@ along with this program. If not, see . //#define BOOTMAGIC_LITE_COLUMN 0 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 132 #define TAPPING_LAYER_TERM 90 diff --git a/keyboards/z34/keymaps/zigotica/config.h b/keyboards/z34/keymaps/zigotica/config.h index 1b223cb71d..6f86fe803f 100644 --- a/keyboards/z34/keymaps/zigotica/config.h +++ b/keyboards/z34/keymaps/zigotica/config.h @@ -24,5 +24,5 @@ along with this program. If not, see . #define TAPPING_TERM 350 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index 0ef36d1f32..e43ad5e3ac 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h @@ -26,7 +26,7 @@ #undef USE_I2C #undef SSD1306OLED -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c index b5386a5e17..0350495ae5 100644 --- a/quantum/action_tapping.c +++ b/quantum/action_tapping.c @@ -25,6 +25,7 @@ # define IS_TAPPING_RECORD(r) (IS_TAPPING() && KEYEQ(tapping_key.event.key, (r->event.key)) && tapping_key.keycode == r->keycode) # endif # define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < GET_TAPPING_TERM(get_record_keycode(&tapping_key, false), &tapping_key)) +# define WITHIN_QUICK_TAP_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < GET_QUICK_TAP_TERM(get_record_keycode(&tapping_key, false), &tapping_key)) # ifdef DYNAMIC_TAPPING_TERM_ENABLE uint16_t g_tapping_term = TAPPING_TERM; @@ -40,9 +41,9 @@ __attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *r } # endif -# ifdef TAPPING_FORCE_HOLD_PER_KEY -__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - return false; +# ifdef QUICK_TAP_TERM_PER_KEY +__attribute__((weak)) uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + return QUICK_TAP_TERM; } # endif @@ -121,7 +122,7 @@ void action_tapping_process(keyrecord_t record) { * readable. The conditional definition of tapping_keycode and all the * conditional uses of it are hidden inside macros named TAP_... */ -# if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(TAPPING_FORCE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) +# if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(QUICK_TAP_TERM_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) # define TAP_DEFINE_KEYCODE uint16_t tapping_keycode = get_record_keycode(&tapping_key, false) # else # define TAP_DEFINE_KEYCODE @@ -169,14 +170,6 @@ void action_tapping_process(keyrecord_t record) { # define TAP_GET_IGNORE_MOD_TAP_INTERRUPT false # endif -# ifdef TAPPING_FORCE_HOLD_PER_KEY -# define TAP_GET_TAPPING_FORCE_HOLD get_tapping_force_hold(tapping_keycode, &tapping_key) -# elif defined(TAPPING_FORCE_HOLD) -# define TAP_GET_TAPPING_FORCE_HOLD true -# else -# define TAP_GET_TAPPING_FORCE_HOLD false -# endif - /** \brief Tapping * * Rule: Tap key is typed(pressed and released) within TAPPING_TERM. @@ -385,7 +378,7 @@ bool process_tapping(keyrecord_t *keyp) { if (WITHIN_TAPPING_TERM(event) || MAYBE_RETRO_SHIFTING(event)) { if (event.pressed) { if (IS_TAPPING_RECORD(keyp)) { - if (!TAP_GET_TAPPING_FORCE_HOLD && !tapping_key.tap.interrupted && tapping_key.tap.count > 0) { + if (WITHIN_QUICK_TAP_TERM(event) && !tapping_key.tap.interrupted && tapping_key.tap.count > 0) { // sequential tap. keyp->tap = tapping_key.tap; if (keyp->tap.count < 15) keyp->tap.count += 1; diff --git a/quantum/action_tapping.h b/quantum/action_tapping.h index bcccc7ac45..c078488c04 100644 --- a/quantum/action_tapping.h +++ b/quantum/action_tapping.h @@ -22,6 +22,11 @@ along with this program. If not, see . # define TAPPING_TERM 200 #endif +/* period of quick tap(ms) */ +#if !defined(QUICK_TAP_TERM) || QUICK_TAP_TERM > TAPPING_TERM +# define QUICK_TAP_TERM TAPPING_TERM +#endif + /* tap count needed for toggling a feature */ #ifndef TAPPING_TOGGLE # define TAPPING_TOGGLE 5 @@ -36,9 +41,9 @@ void action_tapping_process(keyrecord_t record); #endif uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record); +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record); bool get_permissive_hold(uint16_t keycode, keyrecord_t *record); bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record); -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record); bool get_retro_tapping(uint16_t keycode, keyrecord_t *record); bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record); @@ -53,3 +58,9 @@ extern uint16_t g_tapping_term; #else # define GET_TAPPING_TERM(keycode, record) (TAPPING_TERM) #endif + +#ifdef QUICK_TAP_TERM_PER_KEY +# define GET_QUICK_TAP_TERM(keycode, record) get_quick_tap_term(keycode, record) +#else +# define GET_QUICK_TAP_TERM(keycode, record) (QUICK_TAP_TERM) +#endif diff --git a/tests/tap_hold_configurations/quick_tap/config.h b/tests/tap_hold_configurations/quick_tap/config.h new file mode 100644 index 0000000000..cd82d3b5a5 --- /dev/null +++ b/tests/tap_hold_configurations/quick_tap/config.h @@ -0,0 +1,21 @@ +/* Copyright 2021 Stefan Kerkmann + * + * 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 2 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 . + */ + +#pragma once + +#include "test_common.h" + +#define QUICK_TAP_TERM 100 diff --git a/tests/tap_hold_configurations/quick_tap/test.mk b/tests/tap_hold_configurations/quick_tap/test.mk new file mode 100644 index 0000000000..efecca2c22 --- /dev/null +++ b/tests/tap_hold_configurations/quick_tap/test.mk @@ -0,0 +1,18 @@ +# Copyright 2021 Stefan Kerkmann +# +# 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 2 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 . + +# -------------------------------------------------------------------------------- +# Keep this file, even if it is empty, as a marker that this folder contains tests +# -------------------------------------------------------------------------------- diff --git a/tests/tap_hold_configurations/quick_tap/test_action_layer.cpp b/tests/tap_hold_configurations/quick_tap/test_action_layer.cpp new file mode 100644 index 0000000000..9c3b38050a --- /dev/null +++ b/tests/tap_hold_configurations/quick_tap/test_action_layer.cpp @@ -0,0 +1,82 @@ +/* Copyright 2021 Stefan Kerkmann + * + * 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 2 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 . + */ + +#include "keyboard_report_util.hpp" +#include "test_common.hpp" + +using testing::_; +using testing::InSequence; + +class ActionLayer : public TestFixture {}; + +TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) { + TestDriver driver; + KeymapKey layer_key = KeymapKey{0, 0, 0, TT(1)}; + + /* These keys must have the same position in the matrix, only the layer is different. */ + KeymapKey regular_key = KeymapKey{0, 1, 0, KC_A}; + set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}}); + + /* Tap TT five times . */ + /* TODO: Tapping Force Hold breaks TT */ + EXPECT_NO_REPORT(driver); + + layer_key.press(); + run_one_scan_loop(); + layer_key.release(); + run_one_scan_loop(); + expect_layer_state(0); + + idle_for(QUICK_TAP_TERM + 10); + + layer_key.press(); + run_one_scan_loop(); + layer_key.release(); + run_one_scan_loop(); + expect_layer_state(0); + + layer_key.press(); + run_one_scan_loop(); + layer_key.release(); + run_one_scan_loop(); + expect_layer_state(0); + + layer_key.press(); + run_one_scan_loop(); + layer_key.release(); + run_one_scan_loop(); + expect_layer_state(0); + + layer_key.press(); + run_one_scan_loop(); + layer_key.release(); + run_one_scan_loop(); + expect_layer_state(0); + + testing::Mock::VerifyAndClearExpectations(&driver); + + EXPECT_REPORT(driver, (KC_A)).Times(1); + regular_key.press(); + run_one_scan_loop(); + expect_layer_state(0); + testing::Mock::VerifyAndClearExpectations(&driver); + + EXPECT_EMPTY_REPORT(driver).Times(1); + regular_key.release(); + run_one_scan_loop(); + expect_layer_state(0); + testing::Mock::VerifyAndClearExpectations(&driver); +} diff --git a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp new file mode 100644 index 0000000000..be43f8e6c4 --- /dev/null +++ b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp @@ -0,0 +1,291 @@ +/* Copyright 2021 Stefan Kerkmann + * + * 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 2 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 . + */ + +#include "config.h" +#include "keyboard_report_util.hpp" +#include "keycode.h" +#include "test_common.hpp" +#include "action_tapping.h" +#include "test_fixture.hpp" +#include "test_keymap_key.hpp" + +using testing::_; +using testing::InSequence; + +class QuickTap : public TestFixture {}; + +TEST_F(QuickTap, tap_regular_key_while_mod_tap_key_is_held) { + TestDriver driver; + InSequence s; + auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); + auto regular_key = KeymapKey(0, 2, 0, KC_A); + + set_keymap({mod_tap_key, regular_key}); + + /* Press mod-tap key. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press regular key. */ + EXPECT_NO_REPORT(driver); + regular_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release regular key. */ + EXPECT_NO_REPORT(driver); + regular_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_REPORT(driver, (KC_LSFT)); + mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Idle for tapping term of mod tap hold key. */ + EXPECT_REPORT(driver, (KC_LSFT, KC_A)); + EXPECT_REPORT(driver, (KC_LSFT)); + EXPECT_EMPTY_REPORT(driver); + idle_for(TAPPING_TERM - 3); + testing::Mock::VerifyAndClearExpectations(&driver); +} + +TEST_F(QuickTap, tap_mod_tap_key_while_mod_tap_key_is_held) { + TestDriver driver; + InSequence s; + auto first_mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); + auto second_mod_tap_key = KeymapKey(0, 2, 0, RSFT_T(KC_A)); + + set_keymap({first_mod_tap_key, second_mod_tap_key}); + + /* Press first mod-tap key */ + EXPECT_NO_REPORT(driver); + first_mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press second mod-tap key */ + EXPECT_NO_REPORT(driver); + second_mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release second tap-hold key */ + EXPECT_NO_REPORT(driver); + second_mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release first mod-tap key */ + EXPECT_REPORT(driver, (KC_LSFT)); + first_mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Idle for tapping term of first mod-tap key. */ + EXPECT_REPORT(driver, (KC_LSFT, KC_A)); + EXPECT_REPORT(driver, (KC_LSFT)); + EXPECT_EMPTY_REPORT(driver); + idle_for(TAPPING_TERM - 3); + testing::Mock::VerifyAndClearExpectations(&driver); +} + +TEST_F(QuickTap, tap_regular_key_while_layer_tap_key_is_held) { + TestDriver driver; + InSequence s; + auto layer_tap_key = KeymapKey(0, 1, 0, LT(1, KC_P)); + auto regular_key = KeymapKey(0, 2, 0, KC_A); + auto layer_key = KeymapKey(1, 2, 0, KC_B); + + set_keymap({layer_tap_key, regular_key, layer_key}); + + /* Press layer-tap key */ + EXPECT_NO_REPORT(driver); + layer_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press regular key */ + EXPECT_NO_REPORT(driver); + regular_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release regular key */ + EXPECT_NO_REPORT(driver); + regular_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release layer-tap key */ + EXPECT_REPORT(driver, (KC_P)); + EXPECT_REPORT(driver, (KC_A, KC_P)); + EXPECT_REPORT(driver, (KC_P)); + EXPECT_EMPTY_REPORT(driver); + layer_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); +} + +TEST_F(QuickTap, tap_key_and_tap_again_before_quick_tap_term) { + TestDriver driver; + InSequence s; + auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); + + set_keymap({mod_tap_key}); + + /* Press mod-tap key. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_REPORT(driver, (KC_P)); + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + idle_for(QUICK_TAP_TERM - 10); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press and tap mod-tap key again. */ + EXPECT_REPORT(driver, (KC_P)); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); +} + +TEST_F(QuickTap, tap_key_and_hold_again_before_quick_tap_term) { + TestDriver driver; + InSequence s; + auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); + + set_keymap({mod_tap_key}); + + /* Press mod-tap key. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_REPORT(driver, (KC_P)); + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + idle_for(QUICK_TAP_TERM - 10); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press and hold mod-tap key again. */ + EXPECT_REPORT(driver, (KC_P)); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Wait until tapping term expired */ + EXPECT_NO_REPORT(driver); + idle_for(TAPPING_TERM); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); +} + + +TEST_F(QuickTap, tap_key_and_tap_again_after_quick_tap_term) { + TestDriver driver; + InSequence s; + auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); + + set_keymap({mod_tap_key}); + + /* Press mod-tap key. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_REPORT(driver, (KC_P)); + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + idle_for(QUICK_TAP_TERM + 10); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press mod-tap key again. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_REPORT(driver, (KC_P)); + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); +} + +TEST_F(QuickTap, tap_key_and_hold_again_after_quick_tap_term) { + TestDriver driver; + InSequence s; + auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); + + set_keymap({mod_tap_key}); + + /* Press mod-tap key. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_REPORT(driver, (KC_P)); + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + idle_for(QUICK_TAP_TERM + 10); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Press and hold mod-tap key again. */ + EXPECT_NO_REPORT(driver); + mod_tap_key.press(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Wait until tapping term expired */ + EXPECT_REPORT(driver, (KC_LSFT)); + idle_for(TAPPING_TERM); + testing::Mock::VerifyAndClearExpectations(&driver); + + /* Release mod-tap key. */ + EXPECT_EMPTY_REPORT(driver); + mod_tap_key.release(); + run_one_scan_loop(); + testing::Mock::VerifyAndClearExpectations(&driver); +} diff --git a/tests/tap_hold_configurations/tapping_force_hold/config.h b/tests/tap_hold_configurations/tapping_force_hold/config.h deleted file mode 100644 index 3b4646338a..0000000000 --- a/tests/tap_hold_configurations/tapping_force_hold/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#pragma once - -#include "test_common.h" - -#define TAPPING_FORCE_HOLD \ No newline at end of file diff --git a/tests/tap_hold_configurations/tapping_force_hold/test.mk b/tests/tap_hold_configurations/tapping_force_hold/test.mk deleted file mode 100644 index efecca2c22..0000000000 --- a/tests/tap_hold_configurations/tapping_force_hold/test.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021 Stefan Kerkmann -# -# 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 2 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 . - -# -------------------------------------------------------------------------------- -# Keep this file, even if it is empty, as a marker that this folder contains tests -# -------------------------------------------------------------------------------- diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp b/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp deleted file mode 100644 index 965c702d7a..0000000000 --- a/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#include "keyboard_report_util.hpp" -#include "test_common.hpp" - -using testing::_; -using testing::InSequence; - -class ActionLayer : public TestFixture {}; - -TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) { - TestDriver driver; - KeymapKey layer_key = KeymapKey{0, 0, 0, TT(1)}; - - /* These keys must have the same position in the matrix, only the layer is different. */ - KeymapKey regular_key = KeymapKey{0, 1, 0, KC_A}; - set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}}); - - /* Tap TT five times . */ - /* TODO: Tapping Force Hold breaks TT */ - EXPECT_NO_REPORT(driver); - - layer_key.press(); - run_one_scan_loop(); - layer_key.release(); - run_one_scan_loop(); - expect_layer_state(0); - - layer_key.press(); - run_one_scan_loop(); - layer_key.release(); - run_one_scan_loop(); - expect_layer_state(0); - - layer_key.press(); - run_one_scan_loop(); - layer_key.release(); - run_one_scan_loop(); - expect_layer_state(0); - - layer_key.press(); - run_one_scan_loop(); - layer_key.release(); - run_one_scan_loop(); - expect_layer_state(0); - - layer_key.press(); - run_one_scan_loop(); - layer_key.release(); - run_one_scan_loop(); - expect_layer_state(0); - - testing::Mock::VerifyAndClearExpectations(&driver); - - EXPECT_REPORT(driver, (KC_A)).Times(1); - regular_key.press(); - run_one_scan_loop(); - expect_layer_state(0); - testing::Mock::VerifyAndClearExpectations(&driver); - - EXPECT_EMPTY_REPORT(driver).Times(1); - regular_key.release(); - run_one_scan_loop(); - expect_layer_state(0); - testing::Mock::VerifyAndClearExpectations(&driver); -} diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp deleted file mode 100644 index 604f9a4a54..0000000000 --- a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp +++ /dev/null @@ -1,213 +0,0 @@ - -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#include "keyboard_report_util.hpp" -#include "keycode.h" -#include "test_common.hpp" -#include "action_tapping.h" -#include "test_fixture.hpp" -#include "test_keymap_key.hpp" - -using testing::_; -using testing::InSequence; - -class TappingForceHold : public TestFixture {}; - -TEST_F(TappingForceHold, tap_regular_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - - set_keymap({mod_tap_hold_key, regular_key}); - - /* Press mod-tap-hold key. */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press regular key. */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release regular key. */ - EXPECT_NO_REPORT(driver); - regular_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key. */ - EXPECT_REPORT(driver, (KC_LSFT)); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Idle for tapping term of mod tap hold key. */ - EXPECT_REPORT(driver, (KC_LSFT, KC_A)); - EXPECT_REPORT(driver, (KC_LSFT)); - EXPECT_EMPTY_REPORT(driver); - idle_for(TAPPING_TERM - 3); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(TappingForceHold, tap_mod_tap_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A)); - - set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key}); - - /* Press first mod-tap-hold key */ - EXPECT_NO_REPORT(driver); - first_mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press second tap-hold key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release second tap-hold key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release first mod-tap-hold key */ - EXPECT_REPORT(driver, (KC_LSFT)); - first_mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Idle for tapping term of first mod tap hold key. */ - EXPECT_REPORT(driver, (KC_LSFT, KC_A)); - EXPECT_REPORT(driver, (KC_LSFT)); - EXPECT_EMPTY_REPORT(driver); - idle_for(TAPPING_TERM - 3); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(TappingForceHold, tap_regular_key_while_layer_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - auto layer_key = KeymapKey(1, 2, 0, KC_B); - - set_keymap({layer_tap_hold_key, regular_key, layer_key}); - - /* Press layer-tap-hold key */ - EXPECT_NO_REPORT(driver); - layer_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press regular key */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release regular key */ - EXPECT_NO_REPORT(driver); - regular_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release layer-tap-hold key */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_REPORT(driver, (KC_A, KC_P)); - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - layer_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(TappingForceHold, tap_mod_tap_hold_key_two_times) { - TestDriver driver; - InSequence s; - auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - - set_keymap({mod_tap_hold_key}); - - /* Press mod-tap-hold key. */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key. */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press mod-tap-hold key again. */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key. */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(TappingForceHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) { - TestDriver driver; - InSequence s; - auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - - set_keymap({mod_tap_hold_key}); - - /* Press mod-tap-hold key. */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key. */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press mod-tap-hold key again. */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - idle_for(TAPPING_TERM); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key. */ - EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); - EXPECT_EMPTY_REPORT(driver); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} diff --git a/users/bcat/config.h b/users/bcat/config.h index 7bb5d71bae..b9eac74ff6 100644 --- a/users/bcat/config.h +++ b/users/bcat/config.h @@ -35,7 +35,7 @@ /* Turn off key repeat support of the tap keycode for tap-hold keys, enabling * holds to work correctly in quick succession after taps. */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #if defined(OLED_ENABLE) /* The built-in OLED timeout wakes the OLED screen every time the buffer is diff --git a/users/cwebster2/config.h b/users/cwebster2/config.h index 78733687cc..313e6d533f 100644 --- a/users/cwebster2/config.h +++ b/users/cwebster2/config.h @@ -18,7 +18,7 @@ #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 #define TAPPING_TERM_PER_KEY -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #undef PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT #define NO_ACTION_ONESHOT diff --git a/users/drashna/config.h b/users/drashna/config.h index 5c5c131e36..22c789b8c6 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -83,7 +83,7 @@ #if defined(PER_KEY_TAPPING) # define IGNORE_MOD_TAP_INTERRUPT_PER_KEY # define PERMISSIVE_HOLD_PER_KEY -# define TAPPING_FORCE_HOLD_PER_KEY +# define QUICK_TAP_TERM_PER_KEY # define HOLD_ON_OTHER_KEY # define RETRO_TAPPING_PER_KEY # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c index 7496610c2f..37945d2f67 100644 --- a/users/drashna/keyrecords/tapping.c +++ b/users/drashna/keyrecords/tapping.c @@ -57,14 +57,14 @@ __attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrec } #endif // IGNORE_MOD_TAP_INTERRUPT_PER_KEY -#ifdef TAPPING_FORCE_HOLD_PER_KEY -__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +#ifdef QUICK_TAP_TERM_PER_KEY +__attribute__((weak)) uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { default: - return false; + return QUICK_TAP_TERM; } } -#endif // TAPPING_FORCE_HOLD_PER_KEY +#endif // QUICK_TAP_TERM_PER_KEY #ifdef RETRO_TAPPING_PER_KEY __attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) { diff --git a/users/dshields/config.h b/users/dshields/config.h index 1420a9178f..279bcf217b 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h @@ -6,7 +6,7 @@ #define ONESHOT_TIMEOUT 3000 #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY #define TAPPING_TERM 200 #define BACKLIGHT_BREATHING #define DYNAMIC_MACRO_NO_NESTING diff --git a/users/dshields/dshields.c b/users/dshields/dshields.c index 46f0b33cd3..a8e1333104 100644 --- a/users/dshields/dshields.c +++ b/users/dshields/dshields.c @@ -29,7 +29,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case MT_A: case MT_S: @@ -39,9 +39,9 @@ bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { case MT_K: case MT_L: case MT_SCLN: - return true; + return 0; default: - return false; + return QUICK_TAP_TERM; } } @@ -55,4 +55,3 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { return false; } } - diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h index 9315f879ae..bc0fe67df8 100644 --- a/users/kuchosauronad0/config.h +++ b/users/kuchosauronad0/config.h @@ -70,7 +70,7 @@ // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #ifndef TAPPING_TOGGLE diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h index 920003598e..429e08493d 100644 --- a/users/manna-harbour_miryoku/config.h +++ b/users/manna-harbour_miryoku/config.h @@ -15,7 +15,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Auto Shift #define NO_AUTO_SHIFT_ALPHA @@ -40,4 +40,3 @@ #define COMBO_TERM 200 #define EXTRA_SHORT_COMBOS #endif - diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h index 3dd4d1b1b6..583567d4f3 100644 --- a/users/muppetjones/config.h +++ b/users/muppetjones/config.h @@ -34,7 +34,7 @@ # define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -# define TAPPING_FORCE_HOLD +# define QUICK_TAP_TERM 0 #endif diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h index 6501efe62f..291c4877e1 100644 --- a/users/ridingqwerty/config.h +++ b/users/ridingqwerty/config.h @@ -5,7 +5,7 @@ #define TAPPING_TERM 175 #define MACRO_TIMER 5 -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY // testing #define TAPPING_TERM_PER_KEY //#define IGNORE_MOD_TAP_INTERRUPT // rolling R3 "zxcv", etc... diff --git a/users/ridingqwerty/ridingqwerty.c b/users/ridingqwerty/ridingqwerty.c index 8934b9365b..639bb8d2b3 100644 --- a/users/ridingqwerty/ridingqwerty.c +++ b/users/ridingqwerty/ridingqwerty.c @@ -55,11 +55,11 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { } }; -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case NM(SCLN): - return true; - default: - return false; - } +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case NM(SCLN): + return 0; + default: + return QUICK_TAP_TERM; + } } diff --git a/users/uqs/config.h b/users/uqs/config.h index 4bb793532b..455aae9da8 100644 --- a/users/uqs/config.h +++ b/users/uqs/config.h @@ -15,7 +15,7 @@ #define TAPPING_TOGGLE 2 // number of taps for a toggle-on-tap #define TAPPING_TERM 170 // ms to trigger tap // https://precondition.github.io/home-row-mods -#define TAPPING_FORCE_HOLD // make tap-then-hold _not_ do key auto repeat +#define QUICK_TAP_TERM 0 // make tap-then-hold _not_ do key auto repeat #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD // I don't think this works for me, hence I rolled my own implementation. diff --git a/users/vosechu/config.h b/users/vosechu/config.h index 837cc60ff7..81d9305d50 100644 --- a/users/vosechu/config.h +++ b/users/vosechu/config.h @@ -6,7 +6,7 @@ // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #ifndef TAPPING_TOGGLE diff --git a/users/xulkal/config.h b/users/xulkal/config.h index 7f7782807e..bc175dda98 100644 --- a/users/xulkal/config.h +++ b/users/xulkal/config.h @@ -1,10 +1,11 @@ #pragma once -#undef TAPPING_FORCE_HOLD - #undef TAPPING_TERM #define TAPPING_TERM 175 +#undef QUICK_TAP_TERM +#define QUICK_TAP_TERM TAPPING_TERM + #define SPACE_CADET_MODIFIER_CARRYOVER #define LSPO_KEYS KC_LSFT, KC_TRNS, KC_LBRC #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h index 6d1bf83f0b..030872d3dd 100644 --- a/users/yet-another-developer/config.h +++ b/users/yet-another-developer/config.h @@ -31,7 +31,7 @@ // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #ifndef TAPPING_TOGGLE -- cgit v1.3.1 From 102f22f7e99d87989cd95e10370863c3f96ba7e2 Mon Sep 17 00:00:00 2001 From: jpe230 Date: Mon, 12 Dec 2022 14:51:14 -0600 Subject: [Core] Quantum Painter - LVGL Integration (#18499) Co-authored-by: Nick Brassel --- .gitmodules | 4 + Makefile | 2 + data/templates/config-overrides/chibios/board.h | 20 + data/templates/config-overrides/chibios/chconf.h | 20 + data/templates/config-overrides/chibios/halconf.h | 20 + data/templates/config-overrides/chibios/mcuconf.h | 21 + data/templates/config-overrides/common/lv_conf.h | 10 + docs/_summary.md | 1 + docs/quantum_painter_lvgl.md | 55 ++ keyboards/handwired/onekey/keymaps/lvgl/config.h | 15 + keyboards/handwired/onekey/keymaps/lvgl/halconf.h | 12 + keyboards/handwired/onekey/keymaps/lvgl/keymap.c | 50 ++ keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h | 9 + keyboards/handwired/onekey/keymaps/lvgl/rules.mk | 3 + lib/lvgl | 1 + .../boards/keyboard-config-templates/board.h | 20 - .../boards/keyboard-config-templates/chconf.h | 20 - .../boards/keyboard-config-templates/halconf.h | 20 - .../boards/keyboard-config-templates/mcuconf.h | 21 - platforms/lv_conf.h | 756 +++++++++++++++++++++ quantum/main.c | 6 +- quantum/painter/lvgl/qp_lvgl.c | 144 ++++ quantum/painter/lvgl/qp_lvgl.h | 25 + quantum/painter/lvgl/rules.mk | 24 + quantum/painter/qp.h | 7 + quantum/painter/qp_draw_image.c | 12 + quantum/painter/rules.mk | 6 + util/size_regression.sh | 1 + 28 files changed, 1221 insertions(+), 84 deletions(-) create mode 100644 data/templates/config-overrides/chibios/board.h create mode 100644 data/templates/config-overrides/chibios/chconf.h create mode 100644 data/templates/config-overrides/chibios/halconf.h create mode 100644 data/templates/config-overrides/chibios/mcuconf.h create mode 100644 data/templates/config-overrides/common/lv_conf.h create mode 100644 docs/quantum_painter_lvgl.md create mode 100644 keyboards/handwired/onekey/keymaps/lvgl/config.h create mode 100644 keyboards/handwired/onekey/keymaps/lvgl/halconf.h create mode 100644 keyboards/handwired/onekey/keymaps/lvgl/keymap.c create mode 100644 keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h create mode 100644 keyboards/handwired/onekey/keymaps/lvgl/rules.mk create mode 160000 lib/lvgl delete mode 100644 platforms/chibios/boards/keyboard-config-templates/board.h delete mode 100644 platforms/chibios/boards/keyboard-config-templates/chconf.h delete mode 100644 platforms/chibios/boards/keyboard-config-templates/halconf.h delete mode 100644 platforms/chibios/boards/keyboard-config-templates/mcuconf.h create mode 100644 platforms/lv_conf.h create mode 100644 quantum/painter/lvgl/qp_lvgl.c create mode 100644 quantum/painter/lvgl/qp_lvgl.h create mode 100644 quantum/painter/lvgl/rules.mk (limited to 'data') diff --git a/.gitmodules b/.gitmodules index 48c7035afa..7d8dbcb4ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,3 +21,7 @@ [submodule "lib/pico-sdk"] path = lib/pico-sdk url = https://github.com/qmk/pico-sdk.git +[submodule "lib/lvgl"] + path = lib/lvgl + url = https://github.com/qmk/lvgl.git + branch = release/v8.2 diff --git a/Makefile b/Makefile index 99339192e1..1585ae7c23 100644 --- a/Makefile +++ b/Makefile @@ -402,6 +402,7 @@ ifndef SKIP_GIT if [ ! -e lib/vusb ]; then git submodule sync lib/vusb && git submodule update --depth 50 --init lib/vusb; fi if [ ! -e lib/printf ]; then git submodule sync lib/printf && git submodule update --depth 50 --init lib/printf; fi if [ ! -e lib/pico-sdk ]; then git submodule sync lib/pico-sdk && git submodule update --depth 50 --init lib/pico-sdk; fi + if [ ! -e lib/lvgl ]; then git submodule sync lib/lvgl && git submodule update --depth 50 --init lib/lvgl; fi git submodule status --recursive 2>/dev/null | \ while IFS= read -r x; do \ case "$$x" in \ @@ -432,6 +433,7 @@ git-submodule: [ -e lib/ugfx ] && rm -rf lib/ugfx || true [ -e lib/pico-sdk ] && rm -rf lib/pico-sdk || true [ -e lib/chibios-contrib/ext/mcux-sdk ] && rm -rf lib/chibios-contrib/ext/mcux-sdk || true + [ -e lib/lvgl ] && rm -rf lib/lvgl || true git submodule sync --recursive git submodule update --init --recursive --progress 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 . + */ +#pragma once + +#include_next + +// #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 . + */ +#pragma once + +// #define CH_CFG_OPTIMIZE_SPEED TRUE + +#include_next 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 . + */ +#pragma once + +// #define HAL_USE_DAC TRUE + +#include_next 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 . + */ +#pragma once + +#include_next + +// #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 + +// #undef LV_COLOR_16_SWAP +// #define LV_COLOR_16_SWAP 0 diff --git a/docs/_summary.md b/docs/_summary.md index d388d08391..d2d4bb9b32 100644 --- a/docs/_summary.md +++ b/docs/_summary.md @@ -100,6 +100,7 @@ * Hardware Features * Displays * [Quantum Painter](quantum_painter.md) + * [Quantum Painter LVGL Integration](quantum_painter_lvgl.md) * [HD44780 LCD Driver](feature_hd44780.md) * [ST7565 LCD Driver](feature_st7565.md) * [OLED Driver](feature_oled_driver.md) diff --git a/docs/quantum_painter_lvgl.md b/docs/quantum_painter_lvgl.md new file mode 100644 index 0000000000..3edb37fbce --- /dev/null +++ b/docs/quantum_painter_lvgl.md @@ -0,0 +1,55 @@ +# Quantum Painter LVGL Integration :id=lvgl + +LVGL (Light and Versatile Graphics Library) is an open-source graphics library providing everything you need to create an embedded GUI for your board with easy-to-use graphical elements. + +LVGL integrates with [Quantum Painter's](quantum_painter.md) API and drivers to render to the display, the hardware supported by Quantum Painter is also supported by LVGL. + +?> Keep in mind that enabling the LVGL integration has a big impact in firmware size, it is recommeded to use a supported MCU with >256 kB of flash space. + +To learn more about LVGL and how to use it please take a look at their [official documentation](https://docs.lvgl.io/8.2/intro/) + +## Enabling LVGL :id=lvgl-enabling +To enable LVGL to be built into your firmware, add the following to `rules.mk`: + +```make +QUANTUM_PAINTER_ENABLE = yes +QUANTUM_PAINTER_DRIVERS = ...... +QUANTUM_PAINTER_LVGL_INTEGRATION = yes +``` +To configure the Quantum Painter Display Drivers please read the [Quantum Painter Display Drivers](quantum_painter.md#quantum-painter-drivers) section. + +## Quantum Painter LVGL API :id=lvgl-api + +### Quantum Painter LVGL Attach :id=lvgl-api-init + +```c +bool qp_lvgl_attach(painter_device_t device); +``` + +The `qp_lvgl_attach` function is used to set up LVGL with the supplied display, and requires an already configured display. + +```c +static painter_device_t display; +void keyboard_post_init_kb(void) { + display = qp_make_.......; // Create the display + qp_init(display, QP_ROTATION_0); // Initialise the display + + if (qp_lvgl_attach(display)) { // Attach LVGL to the display + ...Your code to draw // Run LVGL specific code to draw + } +} +``` +To init. the display please read the [Display Initialisation](quantum_painter.md#quantum-painter-api-init) section. + +!> Attaching LVGL to a display means LVGL subsequently "owns" the display. Using standard Quantum Painter drawing operations with the display after LVGL attachment will likely result in display artifacts. +### Quantum Painter LVGL Detach :id=lvgl-api-init + +```c +void qp_lvgl_detach() +``` + +The `qp_lvgl_detach` function stops the internal LVGL ticks and releases resources related to it. + +## Enabling/Disabling LVGL features :id=lvgl-configuring + +You can overwrite LVGL specific features in your `lv_conf.h` file. diff --git a/keyboards/handwired/onekey/keymaps/lvgl/config.h b/keyboards/handwired/onekey/keymaps/lvgl/config.h new file mode 100644 index 0000000000..38bb5d0cf3 --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/config.h @@ -0,0 +1,15 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* SPI pins */ +#define SPI_DRIVER SPID0 +#define SPI_SCK_PIN GP18 +#define SPI_MOSI_PIN GP19 +#define SPI_MISO_PIN GP20 + +/* LCD Configuration */ +#define LCD_RST_PIN GP0 +#define LCD_DC_PIN GP1 +#define LCD_CS_PIN GP2 diff --git a/keyboards/handwired/onekey/keymaps/lvgl/halconf.h b/keyboards/handwired/onekey/keymaps/lvgl/halconf.h new file mode 100644 index 0000000000..27646bb3f5 --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/halconf.h @@ -0,0 +1,12 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef HAL_USE_SPI +#define HAL_USE_SPI TRUE + +#undef SPI_USE_WAIT +#define SPI_USE_WAIT TRUE diff --git a/keyboards/handwired/onekey/keymaps/lvgl/keymap.c b/keyboards/handwired/onekey/keymaps/lvgl/keymap.c new file mode 100644 index 0000000000..be1ba48cf9 --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/keymap.c @@ -0,0 +1,50 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +#include "qp.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_ortho_1x1(JS_BUTTON0) +}; + +painter_device_t lcd; + +void lv_example_arc_2(void); + +void keyboard_post_init_user(void) { + lcd = qp_gc9a01_make_spi_device(240, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0); + qp_init(lcd, QP_ROTATION_0); + qp_rect(lcd, 0, 0, 239, 319, 0, 255, 255, true); + + if (qp_lvgl_attach(lcd)) { + lv_example_arc_2(); + } +} + +static void set_angle(void* obj, int32_t v) { + lv_arc_set_value(obj, v); +} + +/** + * Create an arc which acts as a loader. + */ +void lv_example_arc_2(void) { + /*Create an Arc*/ + lv_obj_t* arc = lv_arc_create(lv_scr_act()); + lv_arc_set_rotation(arc, 270); + lv_arc_set_bg_angles(arc, 0, 360); + lv_obj_remove_style(arc, NULL, LV_PART_KNOB); /*Be sure the knob is not displayed*/ + lv_obj_clear_flag(arc, LV_OBJ_FLAG_CLICKABLE); /*To not allow adjusting by click*/ + lv_obj_center(arc); + + static lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_var(&a, arc); + lv_anim_set_exec_cb(&a, set_angle); + lv_anim_set_time(&a, 1000); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); /*Just for the demo*/ + lv_anim_set_repeat_delay(&a, 500); + lv_anim_set_values(&a, 0, 100); + lv_anim_start(&a); +} diff --git a/keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h b/keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h new file mode 100644 index 0000000000..bff74867ff --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef RP_SPI_USE_SPI0 +#define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/handwired/onekey/keymaps/lvgl/rules.mk b/keyboards/handwired/onekey/keymaps/lvgl/rules.mk new file mode 100644 index 0000000000..872d12ad6f --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/rules.mk @@ -0,0 +1,3 @@ +QUANTUM_PAINTER_ENABLE = yes +QUANTUM_PAINTER_LVGL_INTEGRATION = yes +QUANTUM_PAINTER_DRIVERS = gc9a01_spi diff --git a/lib/lvgl b/lib/lvgl new file mode 160000 index 0000000000..e19410f8f8 --- /dev/null +++ b/lib/lvgl @@ -0,0 +1 @@ +Subproject commit e19410f8f8a256609da72cff549598e0df6fa4cf diff --git a/platforms/chibios/boards/keyboard-config-templates/board.h b/platforms/chibios/boards/keyboard-config-templates/board.h deleted file mode 100644 index 5b840c389c..0000000000 --- a/platforms/chibios/boards/keyboard-config-templates/board.h +++ /dev/null @@ -1,20 +0,0 @@ -/* 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 . - */ -#pragma once - -#include_next - -// #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/keyboard-config-templates/chconf.h b/platforms/chibios/boards/keyboard-config-templates/chconf.h deleted file mode 100644 index fca444747c..0000000000 --- a/platforms/chibios/boards/keyboard-config-templates/chconf.h +++ /dev/null @@ -1,20 +0,0 @@ -/* 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 . - */ -#pragma once - -// #define CH_CFG_OPTIMIZE_SPEED TRUE - -#include_next diff --git a/platforms/chibios/boards/keyboard-config-templates/halconf.h b/platforms/chibios/boards/keyboard-config-templates/halconf.h deleted file mode 100644 index 456020f16a..0000000000 --- a/platforms/chibios/boards/keyboard-config-templates/halconf.h +++ /dev/null @@ -1,20 +0,0 @@ -/* 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 . - */ -#pragma once - -// #define HAL_USE_DAC TRUE - -#include_next diff --git a/platforms/chibios/boards/keyboard-config-templates/mcuconf.h b/platforms/chibios/boards/keyboard-config-templates/mcuconf.h deleted file mode 100644 index c690b02f4b..0000000000 --- a/platforms/chibios/boards/keyboard-config-templates/mcuconf.h +++ /dev/null @@ -1,21 +0,0 @@ -/* 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 . - */ -#pragma once - -#include_next - -// #undef STM32_HSE_ENABLED -// #define STM32_HSE_ENABLED FALSE diff --git a/platforms/lv_conf.h b/platforms/lv_conf.h new file mode 100644 index 0000000000..d02d87bfc7 --- /dev/null +++ b/platforms/lv_conf.h @@ -0,0 +1,756 @@ +/** + * @file lv_conf.h + * Configuration file for v8.2.0 + */ + +/* + * Copy this file as `lv_conf.h` + * 1. simply next to the `lvgl` folder + * 2. or any other places and + * - define `LV_CONF_INCLUDE_SIMPLE` + * - add the path as include path + */ + +/* clang-format off */ +#if 1 /*Set it to "1" to enable content*/ + +#ifndef LV_CONF_H +#define LV_CONF_H + +#include + +/*==================== + COLOR SETTINGS + *====================*/ + +/*Color depth: 1 (1 byte per pixel), 8 (RGB332), 16 (RGB565), 32 (ARGB8888)*/ +#define LV_COLOR_DEPTH 16 + +/*Swap the 2 bytes of RGB565 color. Useful if the display has an 8-bit interface (e.g. SPI)*/ +#define LV_COLOR_16_SWAP 1 + +/*Enable more complex drawing routines to manage screens transparency. + *Can be used if the UI is above another layer, e.g. an OSD menu or video player. + *Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to non LV_OPA_COVER value*/ +#define LV_COLOR_SCREEN_TRANSP 0 + +/* Adjust color mix functions rounding. GPUs might calculate color mix (blending) differently. + * 0: round down, 64: round up from x.75, 128: round up from half, 192: round up from x.25, 254: round up */ +#define LV_COLOR_MIX_ROUND_OFS (LV_COLOR_DEPTH == 32 ? 0: 128) + +/*Images pixels with this color will not be drawn if they are chroma keyed)*/ +#define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /*pure green*/ + +/*========================= + MEMORY SETTINGS + *=========================*/ + +/*1: use custom malloc/free, 0: use the built-in `lv_mem_alloc()` and `lv_mem_free()`*/ +#ifndef LV_MEM_CUSTOM +#define LV_MEM_CUSTOM 1 +#endif // LV_MEM_CUSTOM +#if LV_MEM_CUSTOM == 0 + /*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/ + #define LV_MEM_SIZE (48U * 1024U) /*[bytes]*/ + + /*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/ + #define LV_MEM_ADR 0 /*0: unused*/ + /*Instead of an address give a memory allocator that will be called to get a memory pool for LVGL. E.g. my_malloc*/ + #if LV_MEM_ADR == 0 + //#define LV_MEM_POOL_INCLUDE your_alloc_library /* Uncomment if using an external allocator*/ + //#define LV_MEM_POOL_ALLOC your_alloc /* Uncomment if using an external allocator*/ + #endif + +#else /*LV_MEM_CUSTOM*/ + #define LV_MEM_CUSTOM_INCLUDE /*Header for the dynamic memory function*/ + #define LV_MEM_CUSTOM_ALLOC malloc + #define LV_MEM_CUSTOM_FREE free + #define LV_MEM_CUSTOM_REALLOC realloc +#endif /*LV_MEM_CUSTOM*/ + +/*Number of the intermediate memory buffer used during rendering and other internal processing mechanisms. + *You will see an error log message if there wasn't enough buffers. */ +#define LV_MEM_BUF_MAX_NUM 16 + +/*Use the standard `memcpy` and `memset` instead of LVGL's own functions. (Might or might not be faster).*/ +#define LV_MEMCPY_MEMSET_STD 0 + +/*==================== + HAL SETTINGS + *====================*/ + +/*Default display refresh period. LVG will redraw changed areas with this period time*/ +#define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/ + +/*Input device read period in milliseconds*/ +#define LV_INDEV_DEF_READ_PERIOD 30 /*[ms]*/ + +/*Use a custom tick source that tells the elapsed time in milliseconds. + *It removes the need to manually update the tick with `lv_tick_inc()`)*/ +#ifndef LV_TICK_CUSTOM +#define LV_TICK_CUSTOM 0 +#endif // LV_TICK_CUSTOM +#if LV_TICK_CUSTOM + #define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ + #define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ +#endif /*LV_TICK_CUSTOM*/ + +/*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings. + *(Not so important, you can adjust it to modify default sizes and spaces)*/ +#define LV_DPI_DEF 130 /*[px/inch]*/ + +/*======================= + * FEATURE CONFIGURATION + *=======================*/ + +/*------------- + * Drawing + *-----------*/ + +/*Enable complex draw engine. + *Required to draw shadow, gradient, rounded corners, circles, arc, skew lines, image transformations or any masks*/ +#ifndef LV_DRAW_COMPLEX +#define LV_DRAW_COMPLEX 1 +#endif // LV_DRAW_COMPLEX +#if LV_DRAW_COMPLEX != 0 + + /*Allow buffering some shadow calculation. + *LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius` + *Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/ + #define LV_SHADOW_CACHE_SIZE 0 + + /* Set number of maximally cached circle data. + * The circumference of 1/4 circle are saved for anti-aliasing + * radius * 4 bytes are used per circle (the most often used radiuses are saved) + * 0: to disable caching */ + #define LV_CIRCLE_CACHE_SIZE 4 +#endif /*LV_DRAW_COMPLEX*/ + +/*Default image cache size. Image caching keeps the images opened. + *If only the built-in image formats are used there is no real advantage of caching. (I.e. if no new image decoder is added) + *With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images. + *However the opened images might consume additional RAM. + *0: to disable caching*/ +#define LV_IMG_CACHE_DEF_SIZE 0 + +/*Number of stops allowed per gradient. Increase this to allow more stops. + *This adds (sizeof(lv_color_t) + 1) bytes per additional stop*/ +#define LV_GRADIENT_MAX_STOPS 2 + +/*Default gradient buffer size. + *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again. + *LV_GRAD_CACHE_DEF_SIZE sets the size of this cache in bytes. + *If the cache is too small the map will be allocated only while it's required for the drawing. + *0 mean no caching.*/ +#define LV_GRAD_CACHE_DEF_SIZE 0 + +/*Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display) + *LV_DITHER_GRADIENT implies allocating one or two more lines of the object's rendering surface + *The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */ +#ifndef LV_DITHER_GRADIENT +#define LV_DITHER_GRADIENT 0 +#endif +#if LV_DITHER_GRADIENT + /*Add support for error diffusion dithering. + *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing. + *The increase in memory consumption is (24 bits * object's width)*/ + #define LV_DITHER_ERROR_DIFFUSION 0 +#endif + +/*Maximum buffer size to allocate for rotation. + *Only used if software rotation is enabled in the display driver.*/ +#define LV_DISP_ROT_MAX_BUF (10*1024) + +/*------------- + * GPU + *-----------*/ + +/*Use STM32's DMA2D (aka Chrom Art) GPU*/ +#ifndef LV_USE_GPU_STM32_DMA2D +#define LV_USE_GPU_STM32_DMA2D 0 +#endif // LV_USE_GPU_STM32_DMA2D +#if LV_USE_GPU_STM32_DMA2D + /*Must be defined to include path of CMSIS header of target processor + e.g. "stm32f769xx.h" or "stm32f429xx.h"*/ + #define LV_GPU_DMA2D_CMSIS_INCLUDE +#endif + +/*Use NXP's PXP GPU iMX RTxxx platforms*/ +#ifndef LV_USE_GPU_NXP_PXP +#define LV_USE_GPU_NXP_PXP 0 +#endif // LV_USE_GPU_NXP_PXP +#if LV_USE_GPU_NXP_PXP + /*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c) + * and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS + * has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected. + *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init() + */ + #define LV_USE_GPU_NXP_PXP_AUTO_INIT 0 +#endif + +/*Use NXP's VG-Lite GPU iMX RTxxx platforms*/ +#define LV_USE_GPU_NXP_VG_LITE 0 + +/*Use SDL renderer API*/ +#ifndef LV_USE_GPU_SDL +#define LV_USE_GPU_SDL 0 +#endif // LV_USE_GPU_SDL +#if LV_USE_GPU_SDL + #define LV_GPU_SDL_INCLUDE_PATH + /*Texture cache size, 8MB by default*/ + #define LV_GPU_SDL_LRU_SIZE (1024 * 1024 * 8) + /*Custom blend mode for mask drawing, disable if you need to link with older SDL2 lib*/ + #define LV_GPU_SDL_CUSTOM_BLEND_MODE (SDL_VERSION_ATLEAST(2, 0, 6)) +#endif + +/*------------- + * Logging + *-----------*/ + +/*Enable the log module*/ +#ifndef LV_USE_LOG +#define LV_USE_LOG 0 +#endif // LV_USE_LOG +#if LV_USE_LOG + + /*How important log should be added: + *LV_LOG_LEVEL_TRACE A lot of logs to give detailed information + *LV_LOG_LEVEL_INFO Log important events + *LV_LOG_LEVEL_WARN Log if something unwanted happened but didn't cause a problem + *LV_LOG_LEVEL_ERROR Only critical issue, when the system may fail + *LV_LOG_LEVEL_USER Only logs added by the user + *LV_LOG_LEVEL_NONE Do not log anything*/ + #define LV_LOG_LEVEL LV_LOG_LEVEL_WARN + + /*1: Print the log with 'printf'; + *0: User need to register a callback with `lv_log_register_print_cb()`*/ + #define LV_LOG_PRINTF 0 + + /*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/ + #define LV_LOG_TRACE_MEM 1 + #define LV_LOG_TRACE_TIMER 1 + #define LV_LOG_TRACE_INDEV 1 + #define LV_LOG_TRACE_DISP_REFR 1 + #define LV_LOG_TRACE_EVENT 1 + #define LV_LOG_TRACE_OBJ_CREATE 1 + #define LV_LOG_TRACE_LAYOUT 1 + #define LV_LOG_TRACE_ANIM 1 + +#endif /*LV_USE_LOG*/ + +/*------------- + * Asserts + *-----------*/ + +/*Enable asserts if an operation is failed or an invalid data is found. + *If LV_USE_LOG is enabled an error message will be printed on failure*/ +#define LV_USE_ASSERT_NULL 1 /*Check if the parameter is NULL. (Very fast, recommended)*/ +#define LV_USE_ASSERT_MALLOC 1 /*Checks is the memory is successfully allocated or no. (Very fast, recommended)*/ +#define LV_USE_ASSERT_STYLE 0 /*Check if the styles are properly initialized. (Very fast, recommended)*/ +#define LV_USE_ASSERT_MEM_INTEGRITY 0 /*Check the integrity of `lv_mem` after critical operations. (Slow)*/ +#define LV_USE_ASSERT_OBJ 0 /*Check the object's type and existence (e.g. not deleted). (Slow)*/ + +/*Add a custom handler when assert happens e.g. to restart the MCU*/ +#define LV_ASSERT_HANDLER_INCLUDE +#define LV_ASSERT_HANDLER while(1); /*Halt by default*/ + +/*------------- + * Others + *-----------*/ + +/*1: Show CPU usage and FPS count*/ +#ifndef LV_USE_PERF_MONITOR +#define LV_USE_PERF_MONITOR 0 +#endif // LV_USE_PERF_MONITOR +#if LV_USE_PERF_MONITOR + #define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT +#endif + +/*1: Show the used memory and the memory fragmentation + * Requires LV_MEM_CUSTOM = 0*/ +#ifndef LV_USE_MEM_MONITOR +#define LV_USE_MEM_MONITOR 0 +#endif // LV_USE_MEM_MONITOR +#if LV_USE_MEM_MONITOR + #define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT +#endif + +/*1: Draw random colored rectangles over the redrawn areas*/ +#define LV_USE_REFR_DEBUG 0 + +/*Change the built in (v)snprintf functions*/ +#ifndef LV_SPRINTF_CUSTOM +#define LV_SPRINTF_CUSTOM 1 +#endif // LV_SPRINTF_CUSTOM +#if LV_SPRINTF_CUSTOM + #define LV_SPRINTF_INCLUDE + #define lv_snprintf snprintf + #define lv_vsnprintf vsnprintf +#else /*LV_SPRINTF_CUSTOM*/ + #define LV_SPRINTF_USE_FLOAT 0 +#endif /*LV_SPRINTF_CUSTOM*/ + +#define LV_USE_USER_DATA 1 + +/*Garbage Collector settings + *Used if lvgl is bound to higher level language and the memory is managed by that language*/ +#ifndef LV_ENABLE_GC +#define LV_ENABLE_GC 0 +#endif // LV_ENABLE_GC +#if LV_ENABLE_GC != 0 + #define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/ +#endif /*LV_ENABLE_GC*/ + +/*===================== + * COMPILER SETTINGS + *====================*/ + +/*For big endian systems set to 1*/ +#define LV_BIG_ENDIAN_SYSTEM 0 + +/*Define a custom attribute to `lv_tick_inc` function*/ +#define LV_ATTRIBUTE_TICK_INC + +/*Define a custom attribute to `lv_timer_handler` function*/ +#define LV_ATTRIBUTE_TIMER_HANDLER + +/*Define a custom attribute to `lv_disp_flush_ready` function*/ +#define LV_ATTRIBUTE_FLUSH_READY + +/*Required alignment size for buffers*/ +#define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1 + +/*Will be added where memories needs to be aligned (with -Os data might not be aligned to boundary by default). + * E.g. __attribute__((aligned(4)))*/ +#define LV_ATTRIBUTE_MEM_ALIGN + +/*Attribute to mark large constant arrays for example font's bitmaps*/ +#define LV_ATTRIBUTE_LARGE_CONST + +/*Compiler prefix for a big array declaration in RAM*/ +#define LV_ATTRIBUTE_LARGE_RAM_ARRAY + +/*Place performance critical functions into a faster memory (e.g RAM)*/ +#define LV_ATTRIBUTE_FAST_MEM + +/*Prefix variables that are used in GPU accelerated operations, often these need to be placed in RAM sections that are DMA accessible*/ +#define LV_ATTRIBUTE_DMA + +/*Export integer constant to binding. This macro is used with constants in the form of LV_ that + *should also appear on LVGL binding API such as Micropython.*/ +#define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ + +/*Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t*/ +#define LV_USE_LARGE_COORD 0 + +/*================== + * FONT USAGE + *===================*/ + +/*Montserrat fonts with ASCII range and some symbols using bpp = 4 + *https://fonts.google.com/specimen/Montserrat*/ +#define LV_FONT_MONTSERRAT_8 0 +#define LV_FONT_MONTSERRAT_10 0 +#define LV_FONT_MONTSERRAT_12 0 +#define LV_FONT_MONTSERRAT_14 1 +#define LV_FONT_MONTSERRAT_16 0 +#define LV_FONT_MONTSERRAT_18 0 +#define LV_FONT_MONTSERRAT_20 0 +#define LV_FONT_MONTSERRAT_22 0 +#define LV_FONT_MONTSERRAT_24 0 +#define LV_FONT_MONTSERRAT_26 0 +#define LV_FONT_MONTSERRAT_28 0 +#define LV_FONT_MONTSERRAT_30 0 +#define LV_FONT_MONTSERRAT_32 0 +#define LV_FONT_MONTSERRAT_34 0 +#define LV_FONT_MONTSERRAT_36 0 +#define LV_FONT_MONTSERRAT_38 0 +#define LV_FONT_MONTSERRAT_40 0 +#define LV_FONT_MONTSERRAT_42 0 +#define LV_FONT_MONTSERRAT_44 0 +#define LV_FONT_MONTSERRAT_46 0 +#define LV_FONT_MONTSERRAT_48 0 + +/*Demonstrate special features*/ +#define LV_FONT_MONTSERRAT_12_SUBPX 0 +#define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/ +#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, Persian letters and all their forms*/ +#define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/ + +/*Pixel perfect monospace fonts*/ +#define LV_FONT_UNSCII_8 0 +#define LV_FONT_UNSCII_16 0 + +/*Optionally declare custom fonts here. + *You can use these fonts as default font too and they will be available globally. + *E.g. #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) LV_FONT_DECLARE(my_font_2)*/ +#define LV_FONT_CUSTOM_DECLARE + +/*Always set a default font*/ +#define LV_FONT_DEFAULT &lv_font_montserrat_14 + +/*Enable handling large font and/or fonts with a lot of characters. + *The limit depends on the font size, font face and bpp. + *Compiler error will be triggered if a font needs it.*/ +#define LV_FONT_FMT_TXT_LARGE 0 + +/*Enables/disables support for compressed fonts.*/ +#define LV_USE_FONT_COMPRESSED 0 + +/*Enable subpixel rendering*/ +#ifndef LV_USE_FONT_SUBPX +#define LV_USE_FONT_SUBPX 0 +#endif // LV_USE_FONT_SUBPX +#if LV_USE_FONT_SUBPX + /*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/ + #define LV_FONT_SUBPX_BGR 0 /*0: RGB; 1:BGR order*/ +#endif + +/*================= + * TEXT SETTINGS + *=================*/ + +/** + * Select a character encoding for strings. + * Your IDE or editor should have the same character encoding + * - LV_TXT_ENC_UTF8 + * - LV_TXT_ENC_ASCII + */ +#define LV_TXT_ENC LV_TXT_ENC_UTF8 + +/*Can break (wrap) texts on these chars*/ +#define LV_TXT_BREAK_CHARS " ,.;:-_" + +/*If a word is at least this long, will break wherever "prettiest" + *To disable, set to a value <= 0*/ +#define LV_TXT_LINE_BREAK_LONG_LEN 0 + +/*Minimum number of characters in a long word to put on a line before a break. + *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/ +#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 + +/*Minimum number of characters in a long word to put on a line after a break. + *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/ +#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 + +/*The control character to use for signalling text recoloring.*/ +#define LV_TXT_COLOR_CMD "#" + +/*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts. + *The direction will be processed according to the Unicode Bidirectional Algorithm: + *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ +#ifndef LV_USE_BIDI +#define LV_USE_BIDI 0 +#endif // LV_USE_BIDI +#if LV_USE_BIDI + /*Set the default direction. Supported values: + *`LV_BASE_DIR_LTR` Left-to-Right + *`LV_BASE_DIR_RTL` Right-to-Left + *`LV_BASE_DIR_AUTO` detect texts base direction*/ + #define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO +#endif + +/*Enable Arabic/Persian processing + *In these languages characters should be replaced with an other form based on their position in the text*/ +#define LV_USE_ARABIC_PERSIAN_CHARS 0 + +/*================== + * WIDGET USAGE + *================*/ + +/*Documentation of the widgets: https://docs.lvgl.io/latest/en/html/widgets/index.html*/ + +#define LV_USE_ARC 1 + +#define LV_USE_ANIMIMG 1 + +#define LV_USE_BAR 1 + +#define LV_USE_BTN 1 + +#define LV_USE_BTNMATRIX 1 + +#define LV_USE_CANVAS 1 + +#define LV_USE_CHECKBOX 1 + +#define LV_USE_DROPDOWN 1 /*Requires: lv_label*/ + +#define LV_USE_IMG 1 /*Requires: lv_label*/ + +#ifndef LV_USE_LABEL +#define LV_USE_LABEL 1 +#endif // LV_USE_LABEL +#if LV_USE_LABEL + #define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/ + #define LV_LABEL_LONG_TXT_HINT 1 /*Store some extra info in labels to speed up drawing of very long texts*/ +#endif + +#define LV_USE_LINE 1 + +#ifndef LV_USE_ROLLER +#define LV_USE_ROLLER 1 /*Requires: lv_label*/ +#endif // LV_USE_ROLLER +#if LV_USE_ROLLER + #define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/ +#endif + +#define LV_USE_SLIDER 1 /*Requires: lv_bar*/ + +#define LV_USE_SWITCH 1 + +#ifndef LV_USE_TEXTAREA +#define LV_USE_TEXTAREA 1 /*Requires: lv_label*/ +#endif // LV_USE_TEXTAREA +#if LV_USE_TEXTAREA != 0 + #define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/ +#endif + +#define LV_USE_TABLE 1 + +/*================== + * EXTRA COMPONENTS + *==================*/ + +/*----------- + * Widgets + *----------*/ +#ifndef LV_USE_CALENDAR +#define LV_USE_CALENDAR 1 +#endif // LV_USE_CALENDAR +#if LV_USE_CALENDAR + #define LV_CALENDAR_WEEK_STARTS_MONDAY 0 + #if LV_CALENDAR_WEEK_STARTS_MONDAY + #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"} + #else + #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"} + #endif + + #define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"} + #define LV_USE_CALENDAR_HEADER_ARROW 1 + #define LV_USE_CALENDAR_HEADER_DROPDOWN 1 +#endif /*LV_USE_CALENDAR*/ + +#define LV_USE_CHART 1 + +#define LV_USE_COLORWHEEL 1 + +#define LV_USE_IMGBTN 1 + +#define LV_USE_KEYBOARD 1 + +#define LV_USE_LED 1 + +#define LV_USE_LIST 1 + +#define LV_USE_MENU 1 + +#define LV_USE_METER 1 + +#define LV_USE_MSGBOX 1 + +#define LV_USE_SPINBOX 1 + +#define LV_USE_SPINNER 1 + +#define LV_USE_TABVIEW 1 + +#define LV_USE_TILEVIEW 1 + +#define LV_USE_WIN 1 + +#ifndef LV_USE_SPAN +#define LV_USE_SPAN 1 +#endif // LV_USE_SPAN +#if LV_USE_SPAN + /*A line text can contain maximum num of span descriptor */ + #define LV_SPAN_SNIPPET_STACK_SIZE 64 +#endif + +/*----------- + * Themes + *----------*/ + +/*A simple, impressive and very complete theme*/ +#ifndef LV_USE_THEME_DEFAULT +#define LV_USE_THEME_DEFAULT 1 +#endif // LV_USE_THEME_DEFAULT +#if LV_USE_THEME_DEFAULT + + /*0: Light mode; 1: Dark mode*/ + #define LV_THEME_DEFAULT_DARK 0 + + /*1: Enable grow on press*/ + #define LV_THEME_DEFAULT_GROW 1 + + /*Default transition time in [ms]*/ + #define LV_THEME_DEFAULT_TRANSITION_TIME 80 +#endif /*LV_USE_THEME_DEFAULT*/ + +/*A very simple theme that is a good starting point for a custom theme*/ +#define LV_USE_THEME_BASIC 1 + +/*A theme designed for monochrome displays*/ +#define LV_USE_THEME_MONO 1 + +/*----------- + * Layouts + *----------*/ + +/*A layout similar to Flexbox in CSS.*/ +#define LV_USE_FLEX 1 + +/*A layout similar to Grid in CSS.*/ +#define LV_USE_GRID 1 + +/*--------------------- + * 3rd party libraries + *--------------------*/ + +/*File system interfaces for common APIs */ + +/*API for fopen, fread, etc*/ +#ifndef LV_USE_FS_STDIO +#define LV_USE_FS_STDIO 0 +#endif // LV_USE_FS_STDIO +#if LV_USE_FS_STDIO + #define LV_FS_STDIO_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_STDIO_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/ + #define LV_FS_STDIO_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*API for open, read, etc*/ +#ifndef LV_USE_FS_POSIX +#define LV_USE_FS_POSIX 0 +#endif // LV_USE_FS_POSIX +#if LV_USE_FS_POSIX + #define LV_FS_POSIX_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_POSIX_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/ + #define LV_FS_POSIX_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*API for CreateFile, ReadFile, etc*/ +#ifndef LV_USE_FS_WIN32 +#define LV_USE_FS_WIN32 0 +#endif // LV_USE_FS_WIN32 +#if LV_USE_FS_WIN32 + #define LV_FS_WIN32_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_WIN32_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/ + #define LV_FS_WIN32_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*API for FATFS (needs to be added separately). Uses f_open, f_read, etc*/ +#ifndef LV_USE_FS_FATFS +#define LV_USE_FS_FATFS 0 +#endif // LV_USE_FS_FATFS +#if LV_USE_FS_FATFS + #define LV_FS_FATFS_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/ + #define LV_FS_FATFS_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/ +#endif + +/*PNG decoder library*/ +#define LV_USE_PNG 0 + +/*BMP decoder library*/ +#define LV_USE_BMP 0 + +/* JPG + split JPG decoder library. + * Split JPG is a custom format optimized for embedded systems. */ +#define LV_USE_SJPG 0 + +/*GIF decoder library*/ +#define LV_USE_GIF 0 + +/*QR code library*/ +#define LV_USE_QRCODE 0 + +/*FreeType library*/ +#ifndef LV_USE_FREETYPE +#define LV_USE_FREETYPE 0 +#endif // LV_USE_FREETYPE +#if LV_USE_FREETYPE + /*Memory used by FreeType to cache characters [bytes] (-1: no caching)*/ + #define LV_FREETYPE_CACHE_SIZE (16 * 1024) + #if LV_FREETYPE_CACHE_SIZE >= 0 + /* 1: bitmap cache use the sbit cache, 0:bitmap cache use the image cache. */ + /* sbit cache:it is much more memory efficient for small bitmaps(font size < 256) */ + /* if font size >= 256, must be configured as image cache */ + #define LV_FREETYPE_SBIT_CACHE 0 + /* Maximum number of opened FT_Face/FT_Size objects managed by this cache instance. */ + /* (0:use system defaults) */ + #define LV_FREETYPE_CACHE_FT_FACES 0 + #define LV_FREETYPE_CACHE_FT_SIZES 0 + #endif +#endif + +/*Rlottie library*/ +#define LV_USE_RLOTTIE 0 + +/*FFmpeg library for image decoding and playing videos + *Supports all major image formats so do not enable other image decoder with it*/ +#ifndef LV_USE_FFMPEG +#define LV_USE_FFMPEG 0 +#endif // LV_USE_FFMPEG +#if LV_USE_FFMPEG + /*Dump input information to stderr*/ + #define LV_FFMPEG_AV_DUMP_FORMAT 0 +#endif + +/*----------- + * Others + *----------*/ + +/*1: Enable API to take snapshot for object*/ +#define LV_USE_SNAPSHOT 0 + +/*1: Enable Monkey test*/ +#define LV_USE_MONKEY 0 + +/*1: Enable grid navigation*/ +#define LV_USE_GRIDNAV 0 + +/*================== +* EXAMPLES +*==================*/ + +/*Enable the examples to be built with the library*/ +#define LV_BUILD_EXAMPLES 1 + +/*=================== + * DEMO USAGE + ====================*/ + +/*Show some widget. It might be required to increase `LV_MEM_SIZE` */ +#ifndef LV_USE_DEMO_WIDGETS +#define LV_USE_DEMO_WIDGETS 0 +#endif // LV_USE_DEMO_WIDGETS +#if LV_USE_DEMO_WIDGETS +#define LV_DEMO_WIDGETS_SLIDESHOW 0 +#endif + +/*Demonstrate the usage of encoder and keyboard*/ +#define LV_USE_DEMO_KEYPAD_AND_ENCODER 0 + +/*Benchmark your system*/ +#define LV_USE_DEMO_BENCHMARK 0 + +/*Stress test for LVGL*/ +#define LV_USE_DEMO_STRESS 0 + +/*Music player demo*/ +#ifndef LV_USE_DEMO_MUSIC +#define LV_USE_DEMO_MUSIC 0 +#endif // LV_USE_DEMO_MUSIC +#if LV_USE_DEMO_MUSIC +# define LV_DEMO_MUSIC_SQUARE 0 +# define LV_DEMO_MUSIC_LANDSCAPE 0 +# define LV_DEMO_MUSIC_ROUND 0 +# define LV_DEMO_MUSIC_LARGE 0 +# define LV_DEMO_MUSIC_AUTO_PLAY 0 +#endif + +/*--END OF LV_CONF_H--*/ + +#endif /*LV_CONF_H*/ + +#endif /*End of "Content enable"*/ diff --git a/quantum/main.c b/quantum/main.c index 2d5911b708..3b101c522c 100644 --- a/quantum/main.c +++ b/quantum/main.c @@ -60,9 +60,9 @@ int main(void) { protocol_task(); #ifdef QUANTUM_PAINTER_ENABLE - // Run Quantum Painter animations - void qp_internal_animation_tick(void); - qp_internal_animation_tick(); + // Run Quantum Painter task + void qp_internal_task(void); + qp_internal_task(); #endif #ifdef DEFERRED_EXEC_ENABLE diff --git a/quantum/painter/lvgl/qp_lvgl.c b/quantum/painter/lvgl/qp_lvgl.c new file mode 100644 index 0000000000..41ca3f98c2 --- /dev/null +++ b/quantum/painter/lvgl/qp_lvgl.c @@ -0,0 +1,144 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// Copyright 2022 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "qp_lvgl.h" +#include "timer.h" +#include "deferred_exec.h" +#include "lvgl.h" + +typedef struct lvgl_state_t { + uint8_t fnc_id; // Ideally this should be the pointer of the function to run + uint16_t delay_ms; + deferred_token defer_token; +} lvgl_state_t; + +static deferred_executor_t lvgl_executors[2] = {0}; // For lv_tick_inc and lv_task_handler +static lvgl_state_t lvgl_states[2] = {0}; // For lv_tick_inc and lv_task_handler + +painter_device_t selected_display = NULL; +void * color_buffer = NULL; + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter LVGL Integration Internal: qp_lvgl_flush + +void qp_lvgl_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p) { + if (selected_display) { + uint32_t number_pixels = (area->x2 - area->x1 + 1) * (area->y2 - area->y1 + 1); + qp_viewport(selected_display, area->x1, area->y1, area->x2, area->y2); + qp_pixdata(selected_display, (void *)color_p, number_pixels); + qp_flush(selected_display); + lv_disp_flush_ready(disp); + } +} + +static uint32_t tick_task_callback(uint32_t trigger_time, void *cb_arg) { + lvgl_state_t * state = (lvgl_state_t *)cb_arg; + static uint32_t last_tick = 0; + switch (state->fnc_id) { + case 0: { + uint32_t now = timer_read32(); + lv_tick_inc(TIMER_DIFF_32(now, last_tick)); + last_tick = now; + } break; + case 1: + lv_task_handler(); + break; + + default: + break; + } + + // The tasks should run indefinitely + return state->delay_ms; +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter LVGL Integration API: qp_lvgl_attach + +bool qp_lvgl_attach(painter_device_t device) { + qp_dprintf("qp_lvgl_start: entry\n"); + qp_lvgl_detach(); + + struct painter_driver_t *driver = (struct painter_driver_t *)device; + if (!driver->validate_ok) { + qp_dprintf("qp_lvgl_attach: fail (validation_ok == false)\n"); + qp_lvgl_detach(); + return false; + } + + // Setting up the tasks + lvgl_state_t *lv_tick_inc_state = &lvgl_states[0]; + lv_tick_inc_state->fnc_id = 0; + lv_tick_inc_state->delay_ms = 1; + lv_tick_inc_state->defer_token = defer_exec_advanced(lvgl_executors, 2, 1, tick_task_callback, lv_tick_inc_state); + + if (lv_tick_inc_state->defer_token == INVALID_DEFERRED_TOKEN) { + qp_dprintf("qp_lvgl_attach: fail (could not set up qp_lvgl executor)\n"); + qp_lvgl_detach(); + return false; + } + + lvgl_state_t *lv_task_handler_state = &lvgl_states[1]; + lv_task_handler_state->fnc_id = 1; + lv_task_handler_state->delay_ms = 5; + lv_task_handler_state->defer_token = defer_exec_advanced(lvgl_executors, 2, 5, tick_task_callback, lv_task_handler_state); + + if (lv_task_handler_state->defer_token == INVALID_DEFERRED_TOKEN) { + qp_dprintf("qp_lvgl_attach: fail (could not set up qp_lvgl executor)\n"); + qp_lvgl_detach(); + return false; + } + + // Init LVGL + lv_init(); + + // Set up lvgl display buffer + static lv_disp_draw_buf_t draw_buf; + // Allocate a buffer for 1/10 screen size + const size_t count_required = driver->panel_width * driver->panel_height / 10; + color_buffer = color_buffer ? realloc(color_buffer, sizeof(lv_color_t) * count_required) : malloc(sizeof(lv_color_t) * count_required); + if (!color_buffer) { + qp_dprintf("qp_lvgl_attach: fail (could not set up memory buffer)\n"); + qp_lvgl_detach(); + return false; + } + memset(color_buffer, 0, sizeof(lv_color_t) * count_required); + // Initialize the display buffer. + lv_disp_draw_buf_init(&draw_buf, color_buffer, NULL, count_required); + + selected_display = device; + + // Setting up display driver + static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ + lv_disp_drv_init(&disp_drv); /*Basic initialization*/ + disp_drv.flush_cb = qp_lvgl_flush; /*Set your driver function*/ + disp_drv.draw_buf = &draw_buf; /*Assign the buffer to the display*/ + disp_drv.hor_res = driver->panel_width; /*Set the horizontal resolution of the display*/ + disp_drv.ver_res = driver->panel_height; /*Set the vertical resolution of the display*/ + lv_disp_drv_register(&disp_drv); /*Finally register the driver*/ + + return true; +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter LVGL Integration API: qp_lvgl_detach + +void qp_lvgl_detach(void) { + for (int i = 0; i < 2; ++i) { + cancel_deferred_exec_advanced(lvgl_executors, 2, lvgl_states[i].defer_token); + } + if (color_buffer) { + free(color_buffer); + color_buffer = NULL; + } + selected_display = NULL; +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter LVGL Integration Internal: qp_lvgl_internal_tick + +void qp_lvgl_internal_tick(void) { + static uint32_t last_lvgl_exec = 0; + deferred_exec_advanced_task(lvgl_executors, 2, &last_lvgl_exec); +} diff --git a/quantum/painter/lvgl/qp_lvgl.h b/quantum/painter/lvgl/qp_lvgl.h new file mode 100644 index 0000000000..d9ad5e8df1 --- /dev/null +++ b/quantum/painter/lvgl/qp_lvgl.h @@ -0,0 +1,25 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// Copyright 2022 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "qp.h" +#include "lvgl.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter - LVGL External API + +/** + * Sets up LVGL with the supplied display. + * + * @param device[in] the handle of the device to control + * @return true if init. of LVGL succeeded + * @return false if init. of LVGL failed + */ +bool qp_lvgl_attach(painter_device_t device); + +/** + * Disconnects LVGL from any attached display + */ +void qp_lvgl_detach(void); diff --git a/quantum/painter/lvgl/rules.mk b/quantum/painter/lvgl/rules.mk new file mode 100644 index 0000000000..50226941b3 --- /dev/null +++ b/quantum/painter/lvgl/rules.mk @@ -0,0 +1,24 @@ +# LVGL Integration + +OPT_DEFS += -DQUANTUM_PAINTER_LVGL_INTEGRATION_ENABLE -DLV_CONF_INCLUDE_SIMPLE +DEFERRED_EXEC_ENABLE := yes + +LVGL_DIR_NAME = lvgl +LVGL_DIR = $(LIB_DIR) +LVGL_PATH = $(LVGL_DIR)/$(LVGL_DIR_NAME) + +COMMON_VPATH += $(PLATFORM_PATH) \ + $(QUANTUM_DIR)/painter/$(LVGL_DIR_NAME) \ + $(LVGL_PATH) + +include $(LVGL_PATH)/src/extra/extra.mk +include $(LVGL_PATH)/src/core/lv_core.mk +include $(LVGL_PATH)/src/draw/lv_draw.mk +include $(LVGL_PATH)/src/draw/sw/lv_draw_sw.mk +include $(LVGL_PATH)/src/font/lv_font.mk +include $(LVGL_PATH)/src/hal/lv_hal.mk +include $(LVGL_PATH)/src/misc/lv_misc.mk +include $(LVGL_PATH)/src/widgets/lv_widgets.mk + +SRC += qp_lvgl.c \ + $(CSRCS) diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h index 69bc435961..e5f595d71d 100644 --- a/quantum/painter/qp.h +++ b/quantum/painter/qp.h @@ -463,3 +463,10 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai #ifdef QUANTUM_PAINTER_SSD1351_ENABLE # include "qp_ssd1351.h" #endif // QUANTUM_PAINTER_SSD1351_ENABLE + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter Extras + +#ifdef QUANTUM_PAINTER_LVGL_INTEGRATION_ENABLE +# include "qp_lvgl.h" +#endif // QUANTUM_PAINTER_LVGL_INTEGRATION_ENABLE diff --git a/quantum/painter/qp_draw_image.c b/quantum/painter/qp_draw_image.c index e9b975f23a..943cbfef5b 100644 --- a/quantum/painter/qp_draw_image.c +++ b/quantum/painter/qp_draw_image.c @@ -399,3 +399,15 @@ void qp_internal_animation_tick(void) { static uint32_t last_anim_exec = 0; deferred_exec_advanced_task(animation_executors, QUANTUM_PAINTER_CONCURRENT_ANIMATIONS, &last_anim_exec); } + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Quantum Painter Core API: qp_internal_task + +void qp_internal_task(void) { + qp_internal_animation_tick(); +#ifdef QUANTUM_PAINTER_LVGL_INTEGRATION_ENABLE + // Run LVGL ticks + void qp_lvgl_internal_tick(void); + qp_lvgl_internal_tick(); +#endif +} diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk index 5ac374a96e..199e406dd6 100644 --- a/quantum/painter/rules.mk +++ b/quantum/painter/rules.mk @@ -2,6 +2,8 @@ QUANTUM_PAINTER_DRIVERS ?= QUANTUM_PAINTER_ANIMATIONS_ENABLE ?= yes +QUANTUM_PAINTER_LVGL_INTEGRATION ?= no + # The list of permissible drivers that can be listed in QUANTUM_PAINTER_DRIVERS VALID_QUANTUM_PAINTER_DRIVERS := \ rgb565_surface \ @@ -152,3 +154,7 @@ ifeq ($(strip $(QUANTUM_PAINTER_NEEDS_COMMS_SPI)), yes) endif endif +# Check if LVGL needs to be enabled +ifeq ($(strip $(QUANTUM_PAINTER_LVGL_INTEGRATION)), yes) + include $(QUANTUM_DIR)/painter/lvgl/rules.mk +endif diff --git a/util/size_regression.sh b/util/size_regression.sh index 6da2d360bb..96555c6519 100755 --- a/util/size_regression.sh +++ b/util/size_regression.sh @@ -64,6 +64,7 @@ fixup_submodules() { [ -e lib/ugfx ] && rm -rf lib/ugfx [ -e lib/pico-sdk ] && rm -rf lib/pico-sdk [ -e lib/chibios-contrib/ext/mcux-sdk ] && rm -rf lib/chibios-contrib/ext/mcux-sdk + [ -e lib/lvgl ] && rm -rf lib/lvgl make git-submodule } -- cgit v1.3.1 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 +- data/schemas/keyboard.jsonschema | 1 - docs/ChangeLog/20230226/PR15741.md | 43 +++++++ docs/config_options.md | 7 +- docs/feature_auto_shift.md | 11 +- docs/ja/config_options.md | 2 - docs/ja/tap_hold.md | 19 --- docs/tap_hold.md | 93 ++++++++++++-- keyboards/adm42/rev4/keymaps/default/config.h | 1 - keyboards/adm42/rev4/keymaps/default/keymap.c | 18 +-- .../bastardkb/scylla/keymaps/cykedev/config.h | 7 +- .../bastardkb/scylla/keymaps/cykedev/keymap.c | 13 +- .../converter/usb_usb/keymaps/chriskopher/config.h | 3 +- .../converter/usb_usb/keymaps/chriskopher/keymap.c | 10 +- keyboards/crkbd/keymaps/snowe/config.h | 1 - keyboards/crkbd/keymaps/snowe/keymap.c | 10 +- keyboards/ergodox_ez/keymaps/stamm/config.h | 4 +- keyboards/ergodox_ez/keymaps/stamm/keymap.c | 4 +- .../dactyl_manuform/5x6_5/keymaps/cykedev/config.h | 5 +- .../dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c | 12 +- keyboards/lily58/keymaps/cykedev/config.h | 2 +- keyboards/lily58/keymaps/cykedev/keymap.c | 4 +- keyboards/planck/keymaps/adamtabrams/config.h | 4 +- keyboards/planck/keymaps/adamtabrams/keymap.c | 4 +- keyboards/planck/keymaps/rootiest/config.h | 2 +- keyboards/planck/keymaps/rootiest/keymap.c | 6 +- keyboards/torn/keymaps/kinesish/config.h | 2 +- keyboards/torn/keymaps/kinesish/keymap.c | 12 +- quantum/action.c | 10 +- quantum/action_tapping.c | 14 ++- quantum/process_keycode/process_auto_shift.c | 41 +++---- .../default_mod_tap/config.h | 2 +- .../default_mod_tap/test_tap_hold.cpp | 2 +- .../ignore_mod_tap_interrupt/config.h | 21 ---- .../ignore_mod_tap_interrupt/test.mk | 18 --- .../ignore_mod_tap_interrupt/test_tap_hold.cpp | 136 --------------------- .../permissive_hold/test_tap_hold.cpp | 2 +- .../config.h | 22 ---- .../test.mk | 18 --- .../test_tap_hold.cpp | 133 -------------------- users/drashna/config.h | 1 - users/drashna/keyrecords/tapping.c | 15 --- 42 files changed, 224 insertions(+), 515 deletions(-) create mode 100644 docs/ChangeLog/20230226/PR15741.md delete mode 100644 tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h delete mode 100644 tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk delete mode 100644 tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp delete mode 100644 tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h delete mode 100644 tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk delete mode 100644 tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp (limited to 'data') 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"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 7844bfd579..513564a643 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -620,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/docs/ChangeLog/20230226/PR15741.md b/docs/ChangeLog/20230226/PR15741.md new file mode 100644 index 0000000000..385816d65b --- /dev/null +++ b/docs/ChangeLog/20230226/PR15741.md @@ -0,0 +1,43 @@ +`IGNORE_MOD_TAP_INTERRUPT_PER_KEY` has been removed and `IGNORE_MOD_TAP_INTERRUPT` deprecated as a stepping stone towards making `IGNORE_MOD_TAP_INTERRUPT` the new default behavior for mod-taps in the future. + +In place of the now removed `IGNORE_MOD_TAP_INTERRUPT_PER_KEY`, one must use the pre-existing `HOLD_ON_OTHER_KEY_PRESS` option. + +In most cases, updating `get_ignore_mod_tap_interrupt` to `get_hold_on_other_key_press` is simply a matter of renaming the function and swapping every `true` by `false` and vice versa. The one subtlety you may need to look out for is that the `get_ignore_mod_tap_interrupt` was only ever called with mod-taps passed in as the `keycode` argument, while the `keycode` argument of `get_hold_on_other_key_press` can be any dual-role key. This includes not only mod-taps, but also layer-taps, one shot keys, `TT(layer)` and more. This has an impact on the effect of the `default` case in a typical per-key configuration making use of a `switch(keycode)` statement. + +To illustrate, let's take the example of a configuration where we'd want all mod-taps to activate the modifier if another key is pressed while held with the exception of `LCTL_T(KC_A)`, which should ignore keys pressed while it is held and activate the modifier only if it has been held for longer than the tapping term. In addition, we would like to keep the default "ignore-interrupt" behavior of layer taps. + +An old way to do this would be via the following code: + +```c +bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + case LCTL_T(KC_A): + return true; + default: + return false; + } +} +``` + +The correct way to update this code without accidentally changing how the layer-taps work would be the following: + +```c +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + // Capture all mod-tap keycodes. + case QK_MOD_TAP ... QK_MOD_TAP_MAX: + if (keycode == LCTL_T(KC_A)) { + // Disable HOLD_ON_OTHER_KEY_PRESS for LCTL_T(KC_A) + // aka enable IGNORE_MOD_TAP_INTERRUPT for LCTL_T(KC_A). + return false; + } else { + // Enable HOLD_ON_OTHER_KEY_PRESS for every other mod-tap keycode. + return true; + } + default: + return false; + } +} +``` + +For more information, you are invited to read the sections on [IGNORE_MOD_TAP_INTERRUPT](tap_hold.md#ignore-mod-tap-interrupt) and [HOLD_ON_OTHER_KEY_PRESS](tap_hold.md#hold-on-other-key-press) in the page on [Tap-Hold configuration options](tap_hold.md). diff --git a/docs/config_options.md b/docs/config_options.md index edaa739201..7a91160bcd 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -169,8 +169,6 @@ If you define these options you will enable the associated feature, which may in * `#define IGNORE_MOD_TAP_INTERRUPT` * makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the `TAPPING_TERM` for both keys. * See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for details -* `#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY` - * enables handling for per key `IGNORE_MOD_TAP_INTERRUPT` settings * `#define QUICK_TAP_TERM 100` * tap-then-hold timing to use a dual role key to repeat keycode * See [Quick Tap Term](tap_hold.md#quick-tap-term) @@ -178,6 +176,11 @@ If you define these options you will enable the associated feature, which may in * Defaults to `TAPPING_TERM` if not defined * `#define QUICK_TAP_TERM_PER_KEY` * enables handling for per key `QUICK_TAP_TERM` settings +* `#define HOLD_ON_OTHER_KEY_PRESS` + * selects the hold action of a dual-role key as soon as the tap of the dual-role key is interrupted by the press of another key. + * See "[hold on other key press](tap_hold.md#hold-on-other-key-press)" for details +* `#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY` + * enables handling for per key `HOLD_ON_OTHER_KEY_PRESS` settings * `#define LEADER_TIMEOUT 300` * how long before the leader key times out * If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the `LEADER_PER_KEY_TIMING` option, which resets the timeout after each key is tapped. diff --git a/docs/feature_auto_shift.md b/docs/feature_auto_shift.md index d3437a9c60..1719807e26 100644 --- a/docs/feature_auto_shift.md +++ b/docs/feature_auto_shift.md @@ -281,16 +281,7 @@ Tap Hold Configurations work a little differently when using Retro Shift. Referencing `TAPPING_TERM` makes little sense, as holding longer would result in shifting one of the keys. -`IGNORE_MOD_TAP_INTERRUPT` changes *only* rolling from a mod tap (releasing it -first), sending both keys instead of the modifier on the second. Its effects on -nested presses are ignored. - -As nested taps were changed to act as though `PERMISSIVE_HOLD` is set unless only -`IGNORE_MOD_TAP_INTERRUPT` is (outside of Retro Shift), and Retro Shift ignores -`IGNORE_MOD_TAP_INTERRUPT`, `PERMISSIVE_HOLD` has no effect on Mod Taps. - -Nested taps will *always* act as though the `TAPPING_TERM` was exceeded for both -Mod and Layer Tap keys. +`RETRO_SHIFT` enables [`PERMISSIVE_HOLD`-like behaviour](tap_hold.md#permissive-hold) (even if not explicitly enabled) on all mod-taps for which `RETRO_SHIFT` applies. ## Using Auto Shift Setup diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md index c95753bd5d..6135721a42 100644 --- a/docs/ja/config_options.md +++ b/docs/ja/config_options.md @@ -162,8 +162,6 @@ QMK での全ての利用可能な設定にはデフォルトがあります。 * `#define IGNORE_MOD_TAP_INTERRUPT` * 両方のキーに `TAPPING_TERM` を適用することで、ホールド時に他のキーに変換するキーを使ってローリングコンボ (zx) をすることができるようにします * 詳細は [Ignore Mod Tap Interrupt](ja/tap_hold.md#ignore-mod-tap-interrupt) を見てください -* `#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY` - * キーごとの `IGNORE_MOD_TAP_INTERRUPT` 設定の処理を有効にします * `#define TAPPING_FORCE_HOLD` * タップされた直後に、デュアルロールキーを修飾子として使用できるようにします * [Tapping Force Hold](ja/tap_hold.md#tapping-force-hold)を見てください diff --git a/docs/ja/tap_hold.md b/docs/ja/tap_hold.md index 07242821a9..ac64fe6ce3 100644 --- a/docs/ja/tap_hold.md +++ b/docs/ja/tap_hold.md @@ -110,25 +110,6 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { ?> `許容ホールド`を有効にすると、これは両方がどのように動作するかを変更します。通常のキーには、最初のキーが最初に放された場合、あるいは両方のキーが `TAPPING_TERM` より長くホールドされた場合に、修飾キーが追加されます。 -この機能をより細かく制御するために、以下を `config.h` に追加することができます: - -```c -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY -``` - -そして、以下の関数をキーマップに追加します: - -```c -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case SFT_T(KC_SPC): - return true; - default: - return false; - } -} -``` - ## タッピング強制ホールド `タッピング強制ホールド` を有効にするには、以下を `config.h` に追加します: diff --git a/docs/tap_hold.md b/docs/tap_hold.md index fa6c6abc14..348e2655eb 100644 --- a/docs/tap_hold.md +++ b/docs/tap_hold.md @@ -118,7 +118,7 @@ The reason is that `TAPPING_TERM` is a macro that expands to a constant integer The code which decides between the tap and hold actions of dual-role keys supports three different modes, in increasing order of preference for the hold action: -1. The default mode selects the hold action only if the dual-role key is held down longer than the tapping term. In this mode pressing other keys while the dual-role key is held down does not influence the tap-or-hold decision. +1. The default mode selects the hold action only if the dual-role key is held down longer than the tapping term. In this mode pressing other keys while the dual-role key is held down does not influence the tap-or-hold decision. In other words, this mode ignores interrupts. 2. The “permissive hold” mode, in addition to the default behavior, immediately selects the hold action when another key is tapped (pressed and then released) while the dual-role key is held down, even if this happens earlier than the tapping term. If another key is just pressed, but then the dual-role key is released before that other key (and earlier than the tapping term), this mode will still select the tap action. @@ -126,6 +126,73 @@ The code which decides between the tap and hold actions of dual-role keys suppor Note that until the tap-or-hold decision completes (which happens when either the dual-role key is released, or the tapping term has expired, or the extra condition for the selected decision mode is satisfied), key events are delayed and not transmitted to the host immediately. The default mode gives the most delay (if the dual-role key is held down, this mode always waits for the whole tapping term), and the other modes may give less delay when other keys are pressed, because the hold action may be selected earlier. +### Comparison :id=comparison + +To better illustrate the tap-or-hold decision modes, let us compare the expected output of each decision mode in a handful of tapping scenarios involving a mod-tap key (`LSFT_T(KC_A)`) and a regular key (`KC_B`) with the `TAPPING_TERM` set to 200ms. + +By default, mod-taps behave like `HOLD_ON_OTHER_KEY_PRESS`, while layer-taps behave like "Ignore Interrupt" out of the box. If you want "Ignore Interrupt"-like behaviour for mod-taps, you must enable `IGNORE_MOD_TAP_INTERRUPT`, or return `false` in the `get_hold_on_other_key_press` function for all mod-taps. + +Note: "`kc` held" in the "Physical key event" column means that the key wasn't physically released yet at this point in time. + +#### Distinct taps (AABB) :id=distinct-taps + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 199 | `LSFT_T(KC_A)` up | a | a | a | +| 210 | `KC_B` down | ab | ab | ab | +| 220 | `KC_B` up | ab | ab | ab | + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 200 | `LSFT_T(KC_A)` held|Shift| Shift | Shift | +| 201 | `LSFT_T(KC_A)` up |Shift| Shift | Shift | +| 205 | `KC_B` down | b | b | b | +| 210 | `KC_B` up | b | b | b | + +#### Nested tap (ABBA) :id=nested-tap + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 110 | `KC_B` down | | | B | +| 120 | `KC_B` up | | B | B | +| 199 | `LSFT_T(KC_A)` up | ab | B | B | + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 110 | `KC_B` down | | | B | +| 120 | `KC_B` up | | B | B | +| 200 | `LSFT_T(KC_A)` held| B | B | B | +| 210 | `LSFT_T(KC_A)` up | B | B | B | + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 200 | `LSFT_T(KC_A)` held|Shift| Shift | Shift | +| 205 | `KC_B` down | B | B | B | +| 210 | `KC_B` up | B | B | B | +| 220 | `LSFT_T(KC_A)` up | B | B | B | + +#### Rolling keys (ABAB) :id=rolling-keys + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 110 | `KC_B` down | | | B | +| 130 | `LSFT_T(KC_A)` up | ab | ab | B | +| 140 | `KC_B` up | ab | ab | B | + +| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +|------|--------------------|----------------|-------------------|----------------------------| +| 0 | `LSFT_T(KC_A)` down| | | | +| 110 | `KC_B` down | | | B | +| 200 | `LSFT_T(KC_A)` held| B | B | B | +| 205 | `LSFT_T(KC_A)` up | B | B | B | +| 210 | `KC_B` up | B | B | B | + ### Default Mode Example sequence 1 (the `L` key is also mapped to `KC_RGHT` on layer 2): @@ -179,8 +246,6 @@ since `SFT_T(KC_A)` is NOT held longer than the `TAPPING_TERM`. However, the actual output would be capital `X` (`SHIFT` + `x`) due to reasons explained under [Ignore Mod Tap Interrupt](#ignore-mod-tap-interrupt). - - ### Permissive Hold The “permissive hold” mode can be enabled for all dual-role keys by adding the corresponding option to `config.h`: @@ -212,7 +277,7 @@ An example of a sequence that is affected by the “permissive hold” mode: +---------------------------|--------+ ``` -Normally, if you do all this within the `TAPPING_TERM` (default: 200ms), this will be registered as `al` by the firmware and host system. With the `PERMISSIVE_HOLD` option enabled, the Layer Tap key is considered as a layer switch if another key is tapped, and the above sequence would be registered as `KC_RGHT` (the mapping of `L` on layer 2). We could describe this sequence as a “nested press” (the modified key's key down and key up events are “nested” between the dual-role key's key down and key up events). +Normally, if you do all this within the `TAPPING_TERM` (default: 200ms), this will be registered as `al` by the firmware and host system. With the `PERMISSIVE_HOLD` option enabled, the Layer Tap key is considered as a layer switch if another key is tapped, and the above sequence would be registered as `KC_RGHT` (the mapping of `L` on layer 2). We could describe this sequence as a “nested tap” (the modified key's key down and key up events are “nested” between the dual-role key's key down and key up events). However, this slightly different sequence will not be affected by the “permissive hold” mode: @@ -235,7 +300,7 @@ However, this slightly different sequence will not be affected by the “permiss In the sequence above the dual-role key is released before the other key is released, and if that happens within the tapping term, the “permissive hold” mode will still choose the tap action for the dual-role key, and the sequence will be registered as `al` by the host. We could describe this as a “rolling press” (the two keys' key down and key up events behave as if you were rolling a ball across the two keys, first pressing each key down in sequence and then releasing them in the same order). -?> The `PERMISSIVE_HOLD` option also affects Mod Tap keys, but this may not be noticeable if you do not also enable the `IGNORE_MOD_TAP_INTERRUPT` option for those keys, because the default handler for Mod Tap keys also considers both the “nested press” and “rolling press” sequences like shown above as a modifier hold, not the tap action. If you do not enable `IGNORE_MOD_TAP_INTERRUPT`, the effect of `PERMISSIVE_HOLD` on Mod Tap keys would be limited to reducing the delay before the key events are made visible to the host. +?> The `PERMISSIVE_HOLD` option is not noticeable if you also enable `HOLD_ON_OTHER_KEY_PRESS` because the latter option considers both the “nested tap” and “rolling press” sequences like shown above as a hold action, not the tap action. `HOLD_ON_OTHER_KEY_PRESS` makes the Tap-Or-Hold decision earlier in the chain of key events, thus taking a precedence over `PERMISSIVE_HOLD`. This remark also applies to default mod-taps. For more granular control of this feature, you can add the following to your `config.h`: @@ -291,7 +356,7 @@ An example of a sequence that is affected by the “hold on other key press” m Normally, if you do all this within the `TAPPING_TERM` (default: 200ms), this will be registered as `al` by the firmware and host system. With the `HOLD_ON_OTHER_KEY_PRESS` option enabled, the Layer Tap key is considered as a layer switch if another key is pressed, and the above sequence would be registered as `KC_RGHT` (the mapping of `L` on layer 2). -?> The `HOLD_ON_OTHER_KEY_PRESS` option also affects Mod Tap keys, but this may not be noticeable if you do not also enable the `IGNORE_MOD_TAP_INTERRUPT` option for those keys, because the default handler for Mod Tap keys also considers the “rolling press” sequence like shown above as a modifier hold, not the tap action. If you do not enable `IGNORE_MOD_TAP_INTERRUPT`, the effect of `HOLD_ON_OTHER_KEY_PRESS` on Mod Tap keys would be limited to reducing the delay before the key events are made visible to the host. +?> The `HOLD_ON_OTHER_KEY_PRESS` option is essentially redundant with the default mod-tap behaviour. The only notable difference is that `HOLD_ON_OTHER_KEY_PRESS` reduces the delay before the key events are made visible to the host. For more granular control of this feature, you can add the following to your `config.h`: @@ -355,26 +420,32 @@ However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNO For more granular control of this feature, you can add the following to your `config.h`: ```c -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY ``` +?> This option affects *all* dual-role keys. + You can then add the following function to your keymap: ```c -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SFT_T(KC_SPC): // Do not force the mod-tap key press to be handled as a modifier // if any other key was pressed while the mod-tap key is held down. - return true; + return false; default: - // Force the mod-tap key press to be handled as a modifier if any + // Force the dual-role key press to be handled as a modifier if any // other key was pressed while the mod-tap key is held down. - return false; + return true; } } ``` +Note that you must return `false` in `get_hold_on_other_key_press` in order to apply `IGNORE_MOD_TAP_INTERRUPT` for a certain mod-tap key. + +?> `IGNORE_MOD_TAP_INTERRUPT[_PER_KEY]` is being progressively phased out to align the (default) behavior and configuration of mod-taps with the rest of dual-role keys. + ## Quick Tap Term When the user holds a key after tapping it, the tapping function is repeated by default, rather than activating the hold function. This allows keeping the ability to auto-repeat the tapping function of a dual-role key. `QUICK_TAP_TERM` enables fine tuning of that ability. If set to `0`, it will remove the auto-repeat ability and activate the hold function instead. diff --git a/keyboards/adm42/rev4/keymaps/default/config.h b/keyboards/adm42/rev4/keymaps/default/config.h index 4082d84a3a..abfaf9af78 100644 --- a/keyboards/adm42/rev4/keymaps/default/config.h +++ b/keyboards/adm42/rev4/keymaps/default/config.h @@ -1,3 +1,2 @@ #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #define QUICK_TAP_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c index 245a3bd4de..154073beb7 100644 --- a/keyboards/adm42/rev4/keymaps/default/keymap.c +++ b/keyboards/adm42/rev4/keymaps/default/keymap.c @@ -93,21 +93,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case RC_QUT: - return true; - default: +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { + // Special if-condition outside the switch because `RC_QUT` overlaps with + // the `QK_MOD_TAP ... QK_MOD_TAP_MAX` range. + if (keycode == RC_QUT) { return false; } -} - -bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case LLS_ESC: - case LLS_RALT: - case LLE_ENT: - case LLA_DEL: + case QK_MOD_TAP ... QK_MOD_TAP_MAX: + case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: return true; default: return false; diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h index 43037350f6..6119f2738b 100644 --- a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h +++ b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h @@ -28,15 +28,12 @@ #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -// #define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. // #define QUICK_TAP_TERM 0 // Apply the modifier on keys that are tapped during a short hold of a modtap // #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#define FORCE_NKRO \ No newline at end of file +#define FORCE_NKRO diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c index 9f497e2c14..a51f5b9d38 100644 --- a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c +++ b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c @@ -169,12 +169,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CM_SPAR: - return true; - default: - return false; +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { + if (keycode == CM_SPAR) { + return false; + } else if (QK_MOD_TAP <= keycode && keycode <= QK_MOD_TAP_MAX) { + return true; + } else { + return false; } } diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h index 7714f713bd..04066edc02 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h @@ -18,8 +18,7 @@ #define TAPPING_TERM 200 // Delay for tap modifiers until it is considered a hold -#define IGNORE_MOD_TAP_INTERRUPT // Enable ignore mod tap interrupt: https://docs.qmk.fm/#/tap_hold?id=ignore-mod-tap-interrupt -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Allows configuration of ignore mod tap interrupt per key in keymap.c +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Allows configuration of hold on other key press per key in keymap.c #define COMBO_COUNT 2 // Number of defined combos #define COMBO_TERM 20 // Delay for combo keys to be chained together diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c index 4113cdc67c..76cf311462 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c @@ -174,13 +174,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on -// Configure ignore mod tap interrupt per key -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +// Configure hold on other key press per key +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - // I don't like how mod tap interrupt feels with these keys specifically when I'm typing + // I don't like how ignore interrupt feels with these keys specifically when I'm typing case LCTL_T(KC_ESC): - return false; - default: return true; + default: + return false; } } diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h index b091cd7903..57a253428b 100644 --- a/keyboards/crkbd/keymaps/snowe/config.h +++ b/keyboards/crkbd/keymaps/snowe/config.h @@ -57,7 +57,6 @@ along with this program. If not, see . // fix for me putting alt under A and being a fast typist #define IGNORE_MOD_TAP_INTERRUPT -//#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY #define LAYER_STATE_8BIT #define SPLIT_WPM_ENABLE diff --git a/keyboards/crkbd/keymaps/snowe/keymap.c b/keyboards/crkbd/keymaps/snowe/keymap.c index 685491903e..91f0ceafeb 100644 --- a/keyboards/crkbd/keymaps/snowe/keymap.c +++ b/keyboards/crkbd/keymaps/snowe/keymap.c @@ -198,12 +198,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // } //} // -// bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +// bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { +// if (keycode == ALT_T(KC_A) || keycode == SH_BKSP) { +// return false; +// } // switch (keycode) { -// case ALT_T(KC_A): -// case SH_BKSP: +// case QK_MOD_TAP ... QK_MOD_TAP_MAX: // return true; // default: // return false; // } -//} \ No newline at end of file +//} diff --git a/keyboards/ergodox_ez/keymaps/stamm/config.h b/keyboards/ergodox_ez/keymaps/stamm/config.h index f9e89d276f..1262ce6559 100644 --- a/keyboards/ergodox_ez/keymaps/stamm/config.h +++ b/keyboards/ergodox_ez/keymaps/stamm/config.h @@ -29,8 +29,8 @@ #define PERMISSIVE_HOLD /* #define PERMISSIVE_HOLD_PER_KEY */ -#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #define QUICK_TAP_TERM 0 #define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c index aa9debfe57..8a3e30f5f6 100644 --- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c +++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c @@ -206,7 +206,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { return TAPPING_TERM; } } -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case E_NUMBERS: case R_MOUSE: @@ -219,7 +219,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { case RCTL_T(KC_L): case RSFT_T(KC_SEMICOLON): case ARROWS: - return true; + return false; default: return false; } diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h index 7b43dcb5d4..6a28251c6b 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h @@ -45,10 +45,7 @@ // Configure the global tapping term (default: 200ms) #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT -//#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c index 413fa70492..9687e77d88 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c @@ -195,18 +195,18 @@ layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SPC_L: - return false; - case SPC_R: return true; - case ENT_L: + case SPC_R: return false; + case ENT_L: + return true; case ENT_R: - return false; - default: return true; + default: + return false; } } diff --git a/keyboards/lily58/keymaps/cykedev/config.h b/keyboards/lily58/keymaps/cykedev/config.h index dac88dff77..d9e43606a4 100644 --- a/keyboards/lily58/keymaps/cykedev/config.h +++ b/keyboards/lily58/keymaps/cykedev/config.h @@ -17,4 +17,4 @@ #define MASTER_LEFT #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c index 94db33771a..88d9728469 100644 --- a/keyboards/lily58/keymaps/cykedev/keymap.c +++ b/keyboards/lily58/keymaps/cykedev/keymap.c @@ -96,9 +96,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SY_SPC: + return false; + case QK_MOD_TAP ... QK_MOD_TAP_MAX: return true; default: return false; diff --git a/keyboards/planck/keymaps/adamtabrams/config.h b/keyboards/planck/keymaps/adamtabrams/config.h index 8ff86760b4..d47e552434 100644 --- a/keyboards/planck/keymaps/adamtabrams/config.h +++ b/keyboards/planck/keymaps/adamtabrams/config.h @@ -33,7 +33,7 @@ // Tap-Hold Configs #define TAPPING_TERM 180 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #define QUICK_TAP_TERM 0 #define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c index 2203ecd30f..ce1acd437b 100644 --- a/keyboards/planck/keymaps/adamtabrams/keymap.c +++ b/keyboards/planck/keymaps/adamtabrams/keymap.c @@ -255,7 +255,7 @@ uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { } } -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case ALT__A: case ALTSCLN: @@ -272,7 +272,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { case CTL__J: case CTL__T: case CTL__N: - return true; + return false; default: return false; } diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h index bdb5cea91b..1cca7e5ba9 100644 --- a/keyboards/planck/keymaps/rootiest/config.h +++ b/keyboards/planck/keymaps/rootiest/config.h @@ -118,7 +118,7 @@ */ #define RETRO_TAPPING_PER_KEY // Control Retro-Tap individually by key #define QUICK_TAP_TERM_PER_KEY // Control Quick-Tap individually by key -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Control Mod-Tap-Interrupt individually by key +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Control Hold-on-Other-Key-Press individually by key #define PERMISSIVE_HOLD_PER_KEY // Control Permissive-Hold individually by key #define MK_KINETIC_SPEED // Use kinetic acceleration for mouse-keys diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c index cc43aff673..9b6bc9cc18 100644 --- a/keyboards/planck/keymaps/rootiest/keymap.c +++ b/keyboards/planck/keymaps/rootiest/keymap.c @@ -1369,9 +1369,11 @@ bool get_retro_tapping(uint16_t keycode, keyrecord_t* record) { return false; } } -// Handles per-key configuration of Mod-Tap-Interrupt -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t* record) { +// Handles per-key configuration of Hold-on-Other-Key-Press +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t* record) { switch (keycode) { + case QK_MOD_TAP ... QK_MOD_TAP_MAX: + return true; default: return false; } diff --git a/keyboards/torn/keymaps/kinesish/config.h b/keyboards/torn/keymaps/kinesish/config.h index 734512e6cd..5c4de67989 100644 --- a/keyboards/torn/keymaps/kinesish/config.h +++ b/keyboards/torn/keymaps/kinesish/config.h @@ -17,5 +17,5 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #define PERMISSIVE_HOLD_PER_KEY diff --git a/keyboards/torn/keymaps/kinesish/keymap.c b/keyboards/torn/keymaps/kinesish/keymap.c index 13f3304068..9ddbac3601 100644 --- a/keyboards/torn/keymaps/kinesish/keymap.c +++ b/keyboards/torn/keymaps/kinesish/keymap.c @@ -133,18 +133,18 @@ layer_state_t layer_state_set_user(layer_state_t state) { } /* - * Enable `IGNORE_MOD_TAP_INTERRUPT` for all modifiers except `Shift`. - * For more info see `IGNORE_MOD_TAP_INTERRUPT_PER_KEY` in `docs/tap_hold.md`. + * Enable `HOLD_ON_OTHER_KEY_PRESS` only for `Shift`. + * For more info see `HOLD_ON_OTHER_KEY_PRESS_PER_KEY` in `docs/tap_hold.md`. */ -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case S_EQL: - return false; + return true; case S_MINS: - return false; - default: return true; + default: + return false; } } diff --git a/quantum/action.c b/quantum/action.c index abf9834d2f..ea6a24ea5c 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -55,8 +55,8 @@ int retro_tapping_counter = 0; # include "process_auto_shift.h" #endif -#ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY -__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +#ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY +__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { return false; } #endif @@ -484,10 +484,10 @@ void process_action(keyrecord_t *record, action_t action) { default: if (event.pressed) { if (tap_count > 0) { -# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY) +# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) if ( -# ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY - !get_ignore_mod_tap_interrupt(get_event_keycode(record->event, false), record) && +# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY + get_hold_on_other_key_press(get_event_keycode(record->event, false), record) && # endif record->tap.interrupted) { dprint("mods_tap: tap: cancel: add_mods\n"); diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c index 0350495ae5..ca0f31f12e 100644 --- a/quantum/action_tapping.c +++ b/quantum/action_tapping.c @@ -15,6 +15,14 @@ #ifndef NO_ACTION_TAPPING +# if defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY) +# error "IGNORE_MOD_TAP_INTERRUPT_PER_KEY has been removed; the code needs to be ported to use HOLD_ON_OTHER_KEY_PRESS_PER_KEY instead." +# elif !defined(IGNORE_MOD_TAP_INTERRUPT) +# if !defined(PERMISSIVE_HOLD) && !defined(PERMISSIVE_HOLD_PER_KEY) && !defined(HOLD_ON_OTHER_KEY_PRESS) && !defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) +# pragma message "The default behavior of mod-taps will change to mimic IGNORE_MOD_TAP_INTERRUPT in the future.\nIf you wish to keep the old default behavior of mod-taps, please use HOLD_ON_OTHER_KEY_PRESS." +# endif +# endif + # define IS_TAPPING() !IS_NOEVENT(tapping_key.event) # define IS_TAPPING_PRESSED() (IS_TAPPING() && tapping_key.event.pressed) # define IS_TAPPING_RELEASED() (IS_TAPPING() && !tapping_key.event.pressed) @@ -162,9 +170,7 @@ void action_tapping_process(keyrecord_t record) { # define TAP_GET_HOLD_ON_OTHER_KEY_PRESS false # endif -# ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY -# define TAP_GET_IGNORE_MOD_TAP_INTERRUPT get_ignore_mod_tap_interrupt(tapping_keycode, &tapping_key) -# elif defined(IGNORE_MOD_TAP_INTERRUPT) +# if defined(IGNORE_MOD_TAP_INTERRUPT) # define TAP_GET_IGNORE_MOD_TAP_INTERRUPT true # else # define TAP_GET_IGNORE_MOD_TAP_INTERRUPT false @@ -216,7 +222,7 @@ bool process_tapping(keyrecord_t *keyp) { // Rolled over the two keys. (tapping_key.tap.interrupted == true && ( (TAP_IS_LT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS) || - (TAP_IS_MT && !TAP_GET_IGNORE_MOD_TAP_INTERRUPT) + (TAP_IS_MT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS) ) ) // Makes Retro Shift ignore [IGNORE_MOD_TAP_INTERRUPT's diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c index 35d4851ee5..b7ac449198 100644 --- a/quantum/process_keycode/process_auto_shift.c +++ b/quantum/process_keycode/process_auto_shift.c @@ -397,8 +397,17 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { break; # endif } - // If Retro Shift is disabled, possible custom actions shouldn't happen. - // clang-format off + // If Retro Shift is disabled, possible custom actions shouldn't happen. + // clang-format off +# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) +# if defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) + const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record); +# elif defined(IGNORE_MOD_TAP_INTERRUPT) + const bool is_hold_on_interrupt = false; +# else + const bool is_hold_on_interrupt = IS_MT(keycode); +# endif +# endif if (IS_RETRO(keycode) # if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) // Not tapped or #defines mean that rolls should use hold action. @@ -407,27 +416,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { # ifdef RETRO_TAPPING_PER_KEY || !get_retro_tapping(keycode, record) # endif - || (record->tap.interrupted && (IS_LT(keycode) -# if defined(HOLD_ON_OTHER_KEY_PRESS) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) -# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY - ? get_hold_on_other_key_press(keycode, record) -# else - ? true -# endif -# else - ? false -# endif -# if defined(IGNORE_MOD_TAP_INTERRUPT) || defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY) -# ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY - : !get_ignore_mod_tap_interrupt(keycode, record) -# else - : false -# endif -# else - : true -# endif - )) - ) + || (record->tap.interrupted && is_hold_on_interrupt)) # endif ) { // clang-format on @@ -454,10 +443,10 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { # endif ) { // Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set. -# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY) +# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) if (autoshift_flags.in_progress -# ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY - && !get_ignore_mod_tap_interrupt(keycode, record) +# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY + && get_hold_on_other_key_press(keycode, record) # endif ) { autoshift_end(KC_NO, now, false, &autoshift_lastrecord); diff --git a/tests/tap_hold_configurations/default_mod_tap/config.h b/tests/tap_hold_configurations/default_mod_tap/config.h index 5955b8600a..f22448845e 100644 --- a/tests/tap_hold_configurations/default_mod_tap/config.h +++ b/tests/tap_hold_configurations/default_mod_tap/config.h @@ -18,4 +18,4 @@ #include "test_common.h" -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file +#define IGNORE_MOD_TAP_INTERRUPT diff --git a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp index b70efe4aed..01943c10d2 100644 --- a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp +++ b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp @@ -66,7 +66,7 @@ TEST_F(DefaultTapHold, tap_regular_key_while_mod_tap_key_is_held) { testing::Mock::VerifyAndClearExpectations(&driver); } -TEST_F(DefaultTapHold, tap_mod_tap_key_while_mod_tap_key_is_held) { +TEST_F(DefaultTapHold, tap_a_mod_tap_key_while_another_mod_tap_key_is_held) { TestDriver driver; InSequence s; auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); diff --git a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h b/tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h deleted file mode 100644 index 5955b8600a..0000000000 --- a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#pragma once - -#include "test_common.h" - -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk b/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk deleted file mode 100644 index efecca2c22..0000000000 --- a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021 Stefan Kerkmann -# -# 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 2 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 . - -# -------------------------------------------------------------------------------- -# Keep this file, even if it is empty, as a marker that this folder contains tests -# -------------------------------------------------------------------------------- diff --git a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp b/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp deleted file mode 100644 index 319de61070..0000000000 --- a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#include "keyboard_report_util.hpp" -#include "keycode.h" -#include "test_common.hpp" -#include "action_tapping.h" -#include "test_fixture.hpp" -#include "test_keymap_key.hpp" - -using testing::_; -using testing::InSequence; - -class IgnoreModTapInterrupt : public TestFixture {}; - -TEST_F(IgnoreModTapInterrupt, tap_regular_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - - set_keymap({mod_tap_hold_key, regular_key}); - - /* Press mod-tap-hold key */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press regular key */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release regular key */ - EXPECT_NO_REPORT(driver); - regular_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_REPORT(driver, (KC_A, KC_P)); - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(IgnoreModTapInterrupt, tap_mod_tap_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A)); - - set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key}); - - /* Press first mod-tap-hold key */ - EXPECT_NO_REPORT(driver); - first_mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press second tap-hold key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release second tap-hold key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release first mod-tap-hold key */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_REPORT(driver, (KC_A, KC_P)); - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - first_mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(IgnoreModTapInterrupt, tap_regular_key_while_layer_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - auto layer_key = KeymapKey(1, 2, 0, KC_B); - - set_keymap({layer_tap_hold_key, regular_key, layer_key}); - - /* Press layer-tap-hold key */ - EXPECT_NO_REPORT(driver); - layer_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press regular key */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release regular key */ - EXPECT_NO_REPORT(driver); - regular_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release layer-tap-hold key */ - EXPECT_REPORT(driver, (KC_P)); - EXPECT_REPORT(driver, (KC_P, regular_key.report_code)); - EXPECT_REPORT(driver, (KC_P)); - EXPECT_EMPTY_REPORT(driver); - layer_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} diff --git a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp index 74e81f347f..e6ecc86401 100644 --- a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp +++ b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp @@ -60,7 +60,7 @@ TEST_F(PermissiveHold, tap_regular_key_while_mod_tap_key_is_held) { testing::Mock::VerifyAndClearExpectations(&driver); } -TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) { +TEST_F(PermissiveHold, tap_a_mod_tap_key_while_another_mod_tap_key_is_held) { TestDriver driver; InSequence s; auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h deleted file mode 100644 index a6abd50bbe..0000000000 --- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#pragma once - -#include "test_common.h" - -#define IGNORE_MOD_TAP_INTERRUPT -#define PERMISSIVE_HOLD \ No newline at end of file diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk deleted file mode 100644 index efecca2c22..0000000000 --- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021 Stefan Kerkmann -# -# 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 2 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 . - -# -------------------------------------------------------------------------------- -# Keep this file, even if it is empty, as a marker that this folder contains tests -# -------------------------------------------------------------------------------- diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp deleted file mode 100644 index ee7e707c94..0000000000 --- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp +++ /dev/null @@ -1,133 +0,0 @@ - -/* Copyright 2021 Stefan Kerkmann - * - * 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 2 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 . - */ - -#include "keyboard_report_util.hpp" -#include "keycode.h" -#include "test_common.hpp" -#include "action_tapping.h" -#include "test_fixture.hpp" -#include "test_keymap_key.hpp" - -using testing::_; -using testing::InSequence; - -class PermissiveHold_IgnoreModTapInterrupt : public TestFixture {}; - -TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_regular_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - - set_keymap({mod_tap_hold_key, regular_key}); - - /* Press mod-tap-hold key */ - EXPECT_NO_REPORT(driver); - mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press regular key */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release regular key */ - EXPECT_REPORT(driver, (KC_LSFT)); - EXPECT_REPORT(driver, (KC_LSFT, KC_A)); - EXPECT_REPORT(driver, (KC_LSFT)); - regular_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release mod-tap-hold key */ - EXPECT_EMPTY_REPORT(driver); - mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_mod_tap_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A)); - - set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key}); - - /* Press first mod-tap-hold key */ - EXPECT_NO_REPORT(driver); - first_mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press second tap-hold key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release second tap-hold key */ - EXPECT_REPORT(driver, (KC_LSFT)); - EXPECT_REPORT(driver, (KC_LSFT, KC_A)); - EXPECT_REPORT(driver, (KC_LSFT)); - second_mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release first mod-tap-hold key */ - EXPECT_EMPTY_REPORT(driver); - first_mod_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} - -TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_regular_key_while_layer_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - auto layer_key = KeymapKey(1, 2, 0, KC_B); - - set_keymap({layer_tap_hold_key, regular_key, layer_key}); - - /* Press layer-tap-hold key */ - EXPECT_NO_REPORT(driver); - layer_tap_hold_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Press regular key */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release regular key */ - EXPECT_REPORT(driver, (KC_B)); - EXPECT_EMPTY_REPORT(driver); - regular_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); - - /* Release layer-tap-hold key */ - EXPECT_NO_REPORT(driver); - layer_tap_hold_key.release(); - run_one_scan_loop(); - testing::Mock::VerifyAndClearExpectations(&driver); -} diff --git a/users/drashna/config.h b/users/drashna/config.h index 22c789b8c6..9edbfff56b 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -81,7 +81,6 @@ #endif // !ONESHOT_TIMEOUT #if defined(PER_KEY_TAPPING) -# define IGNORE_MOD_TAP_INTERRUPT_PER_KEY # define PERMISSIVE_HOLD_PER_KEY # define QUICK_TAP_TERM_PER_KEY # define HOLD_ON_OTHER_KEY diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c index 37945d2f67..6a26a02aca 100644 --- a/users/drashna/keyrecords/tapping.c +++ b/users/drashna/keyrecords/tapping.c @@ -42,21 +42,6 @@ __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyreco } #endif // HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY -__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - // Do not force the mod-tap key press to be handled as a modifier - // if any other key was pressed while the mod-tap key is held down. - // return true; - // Force the mod-tap key press to be handled as a modifier if any - // other key was pressed while the mod-tap key is held down. - // return false; - switch (keycode) { - default: - return true; - } -} -#endif // IGNORE_MOD_TAP_INTERRUPT_PER_KEY - #ifdef QUICK_TAP_TERM_PER_KEY __attribute__((weak)) uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { -- cgit v1.3.1 From e5721bbd37fcb0372fd007caae5a3f2aed060479 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 21 Dec 2022 23:35:23 +0000 Subject: Remaining DD keymap_extras migration (#19110) * Parse headers to data * Regen headers from data --- .../keycodes/extras/keycodes_belgian_0.0.1.hjson | 375 +++++++++++ .../keycodes/extras/keycodes_bepo_0.0.1.hjson | 632 +++++++++++++++++++ .../extras/keycodes_brazilian_abnt2_0.0.1.hjson | 379 ++++++++++++ .../keycodes_canadian_multilingual_0.0.1.hjson | 641 +++++++++++++++++++ .../keycodes/extras/keycodes_colemak_0.0.1.hjson | 302 +++++++++ .../keycodes/extras/keycodes_croatian_0.0.1.hjson | 403 ++++++++++++ .../keycodes/extras/keycodes_czech_0.0.1.hjson | 435 +++++++++++++ .../keycodes/extras/keycodes_danish_0.0.1.hjson | 359 +++++++++++ .../keycodes/extras/keycodes_dvorak_0.0.1.hjson | 302 +++++++++ .../keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson | 317 ++++++++++ .../extras/keycodes_dvorak_programmer_0.0.1.hjson | 302 +++++++++ .../keycodes/extras/keycodes_estonian_0.0.1.hjson | 367 +++++++++++ .../keycodes/extras/keycodes_finnish_0.0.1.hjson | 359 +++++++++++ .../keycodes/extras/keycodes_french_0.0.1.hjson | 367 +++++++++++ .../extras/keycodes_french_afnor_0.0.1.hjson | 623 +++++++++++++++++++ .../extras/keycodes_french_mac_iso_0.0.1.hjson | 676 ++++++++++++++++++++ .../keycodes/extras/keycodes_german_0.0.1.hjson | 359 +++++++++++ .../extras/keycodes_german_mac_iso_0.0.1.hjson | 656 ++++++++++++++++++++ .../keycodes/extras/keycodes_greek_0.0.1.hjson | 391 ++++++++++++ .../keycodes/extras/keycodes_hebrew_0.0.1.hjson | 347 +++++++++++ .../keycodes/extras/keycodes_hungarian_0.0.1.hjson | 435 +++++++++++++ .../keycodes/extras/keycodes_icelandic_0.0.1.hjson | 355 +++++++++++ .../keycodes/extras/keycodes_irish_0.0.1.hjson | 355 +++++++++++ .../keycodes/extras/keycodes_italian_0.0.1.hjson | 364 +++++++++++ .../extras/keycodes_italian_mac_ansi_0.0.1.hjson | 684 ++++++++++++++++++++ .../extras/keycodes_italian_mac_iso_0.0.1.hjson | 688 +++++++++++++++++++++ .../keycodes/extras/keycodes_japanese_0.0.1.hjson | 330 ++++++++++ .../keycodes/extras/keycodes_korean_0.0.1.hjson | 310 ++++++++++ .../keycodes/extras/keycodes_latvian_0.0.1.hjson | 440 +++++++++++++ .../extras/keycodes_lithuanian_azerty_0.0.1.hjson | 375 +++++++++++ .../extras/keycodes_lithuanian_qwerty_0.0.1.hjson | 368 +++++++++++ .../keycodes/extras/keycodes_neo2_0.0.1.hjson | 217 +++++++ .../keycodes/extras/keycodes_nordic_0.0.1.hjson | 116 ++++ .../keycodes/extras/keycodes_norman_0.0.1.hjson | 302 +++++++++ .../keycodes/extras/keycodes_norwegian_0.0.1.hjson | 355 +++++++++++ .../keycodes/extras/keycodes_plover_0.0.1.hjson | 86 +++ .../extras/keycodes_plover_dvorak_0.0.1.hjson | 73 +++ .../keycodes/extras/keycodes_polish_0.0.1.hjson | 355 +++++++++++ .../extras/keycodes_portuguese_0.0.1.hjson | 355 +++++++++++ .../extras/keycodes_portuguese_mac_iso_0.0.1.hjson | 620 +++++++++++++++++++ .../keycodes/extras/keycodes_romanian_0.0.1.hjson | 444 +++++++++++++ .../keycodes/extras/keycodes_russian_0.0.1.hjson | 291 +++++++++ .../keycodes/extras/keycodes_serbian_0.0.1.hjson | 307 +++++++++ .../extras/keycodes_serbian_latin_0.0.1.hjson | 407 ++++++++++++ .../keycodes/extras/keycodes_slovak_0.0.1.hjson | 443 +++++++++++++ .../keycodes/extras/keycodes_slovenian_0.0.1.hjson | 403 ++++++++++++ .../keycodes/extras/keycodes_spanish_0.0.1.hjson | 359 +++++++++++ .../extras/keycodes_spanish_dvorak_0.0.1.hjson | 359 +++++++++++ .../keycodes/extras/keycodes_steno_0.0.1.hjson | 4 + .../keycodes/extras/keycodes_swedish_0.0.1.hjson | 359 +++++++++++ .../extras/keycodes_swedish_mac_ansi_0.0.1.hjson | 642 +++++++++++++++++++ .../extras/keycodes_swedish_mac_iso_0.0.1.hjson | 640 +++++++++++++++++++ .../keycodes_swedish_pro_mac_ansi_0.0.1.hjson | 642 +++++++++++++++++++ .../keycodes_swedish_pro_mac_iso_0.0.1.hjson | 640 +++++++++++++++++++ .../keycodes/extras/keycodes_swiss_de_0.0.1.hjson | 379 ++++++++++++ .../keycodes/extras/keycodes_swiss_fr_0.0.1.hjson | 379 ++++++++++++ .../keycodes/extras/keycodes_turkish_f_0.0.1.hjson | 480 ++++++++++++++ .../keycodes/extras/keycodes_turkish_q_0.0.1.hjson | 375 +++++++++++ .../keycodes/extras/keycodes_ukrainian_0.0.1.hjson | 295 +++++++++ .../extras/keycodes_us_extended_0.0.1.hjson | 588 ++++++++++++++++++ .../extras/keycodes_us_international_0.0.1.hjson | 508 +++++++++++++++ .../keycodes_us_international_linux_0.0.1.hjson | 576 +++++++++++++++++ .../keycodes/extras/keycodes_workman_0.0.1.hjson | 302 +++++++++ .../extras/keycodes_workman_zxcvm_0.0.1.hjson | 302 +++++++++ lib/python/qmk/cli/generate/keycodes.py | 7 +- quantum/keymap_extras/keymap_belgian.h | 95 +-- quantum/keymap_extras/keymap_bepo.h | 126 +--- quantum/keymap_extras/keymap_brazilian_abnt2.h | 96 +-- .../keymap_extras/keymap_canadian_multilingual.h | 131 +--- quantum/keymap_extras/keymap_colemak.h | 77 +-- quantum/keymap_extras/keymap_croatian.h | 93 +-- quantum/keymap_extras/keymap_czech.h | 95 +-- quantum/keymap_extras/keymap_danish.h | 94 +-- quantum/keymap_extras/keymap_dvorak.h | 77 +-- quantum/keymap_extras/keymap_dvorak_fr.h | 83 +-- quantum/keymap_extras/keymap_dvorak_programmer.h | 77 +-- quantum/keymap_extras/keymap_estonian.h | 94 +-- quantum/keymap_extras/keymap_finnish.h | 94 +-- quantum/keymap_extras/keymap_french.h | 97 +-- quantum/keymap_extras/keymap_french_afnor.h | 143 +---- quantum/keymap_extras/keymap_french_mac_iso.h | 113 +--- quantum/keymap_extras/keymap_german.h | 94 +-- quantum/keymap_extras/keymap_german_mac_iso.h | 113 +--- quantum/keymap_extras/keymap_greek.h | 95 +-- quantum/keymap_extras/keymap_hebrew.h | 95 +-- quantum/keymap_extras/keymap_hungarian.h | 93 +-- quantum/keymap_extras/keymap_icelandic.h | 95 +-- quantum/keymap_extras/keymap_irish.h | 94 +-- quantum/keymap_extras/keymap_italian.h | 108 +--- quantum/keymap_extras/keymap_italian_mac_ansi.h | 113 +--- quantum/keymap_extras/keymap_italian_mac_iso.h | 113 +--- quantum/keymap_extras/keymap_japanese.h | 84 +-- quantum/keymap_extras/keymap_korean.h | 78 +-- quantum/keymap_extras/keymap_latvian.h | 113 +--- quantum/keymap_extras/keymap_lithuanian_azerty.h | 93 +-- quantum/keymap_extras/keymap_lithuanian_qwerty.h | 108 +--- quantum/keymap_extras/keymap_neo2.h | 60 +- quantum/keymap_extras/keymap_nordic.h | 83 ++- quantum/keymap_extras/keymap_norman.h | 77 +-- quantum/keymap_extras/keymap_norwegian.h | 94 +-- quantum/keymap_extras/keymap_plover.h | 102 ++- quantum/keymap_extras/keymap_plover_dvorak.h | 92 +-- quantum/keymap_extras/keymap_polish.h | 114 ++-- quantum/keymap_extras/keymap_portuguese.h | 93 +-- quantum/keymap_extras/keymap_portuguese_mac_iso.h | 113 +--- quantum/keymap_extras/keymap_romanian.h | 111 +--- quantum/keymap_extras/keymap_russian.h | 93 +-- quantum/keymap_extras/keymap_serbian.h | 90 +-- quantum/keymap_extras/keymap_serbian_latin.h | 93 +-- quantum/keymap_extras/keymap_slovak.h | 95 +-- quantum/keymap_extras/keymap_slovenian.h | 93 +-- quantum/keymap_extras/keymap_spanish.h | 94 +-- quantum/keymap_extras/keymap_spanish_dvorak.h | 94 +-- quantum/keymap_extras/keymap_steno.h | 141 +---- quantum/keymap_extras/keymap_swedish.h | 97 +-- quantum/keymap_extras/keymap_swedish_mac_ansi.h | 114 +--- quantum/keymap_extras/keymap_swedish_mac_iso.h | 115 +--- .../keymap_extras/keymap_swedish_pro_mac_ansi.h | 114 +--- quantum/keymap_extras/keymap_swedish_pro_mac_iso.h | 115 +--- quantum/keymap_extras/keymap_swiss_de.h | 100 +-- quantum/keymap_extras/keymap_swiss_fr.h | 100 +-- quantum/keymap_extras/keymap_turkish_f.h | 111 +--- quantum/keymap_extras/keymap_turkish_q.h | 93 +-- quantum/keymap_extras/keymap_uk.h | 2 - quantum/keymap_extras/keymap_ukrainian.h | 93 +-- quantum/keymap_extras/keymap_us.h | 1 - quantum/keymap_extras/keymap_us_extended.h | 120 +--- quantum/keymap_extras/keymap_us_international.h | 113 +--- .../keymap_extras/keymap_us_international_linux.h | 120 +--- quantum/keymap_extras/keymap_workman.h | 77 +-- quantum/keymap_extras/keymap_workman_zxcvm.h | 77 +-- util/lang_conv.py | 65 ++ util/lang_gen.sh | 8 + 133 files changed, 27668 insertions(+), 4679 deletions(-) create mode 100644 data/constants/keycodes/extras/keycodes_belgian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_bepo_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_brazilian_abnt2_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_canadian_multilingual_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_colemak_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_croatian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_czech_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_danish_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_dvorak_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_dvorak_programmer_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_estonian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_finnish_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_french_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_french_afnor_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_french_mac_iso_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_german_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_german_mac_iso_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_greek_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_hebrew_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_hungarian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_icelandic_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_irish_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_italian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_italian_mac_ansi_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_italian_mac_iso_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_japanese_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_korean_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_latvian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_lithuanian_azerty_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_lithuanian_qwerty_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_neo2_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_nordic_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_norman_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_norwegian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_plover_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_plover_dvorak_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_polish_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_portuguese_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_portuguese_mac_iso_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_romanian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_russian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_serbian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_serbian_latin_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_slovak_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_slovenian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_spanish_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_spanish_dvorak_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swedish_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swedish_mac_ansi_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swedish_mac_iso_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swedish_pro_mac_ansi_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swedish_pro_mac_iso_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swiss_de_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_swiss_fr_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_turkish_f_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_turkish_q_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_ukrainian_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_us_extended_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_us_international_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_us_international_linux_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_workman_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_workman_zxcvm_0.0.1.hjson create mode 100644 util/lang_conv.py create mode 100755 util/lang_gen.sh (limited to 'data') diff --git a/data/constants/keycodes/extras/keycodes_belgian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_belgian_0.0.1.hjson new file mode 100644 index 0000000000..d2b8c1d7d9 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_belgian_0.0.1.hjson @@ -0,0 +1,375 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ² │ & │ é │ " │ ' │ ( │ § │ è │ ! │ ç │ à │ ) │ - │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ µ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ = │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "BE_SUP2", + "label": "²", + } + "KC_1": { + "key": "BE_AMPR", + "label": "&", + } + "KC_2": { + "key": "BE_EACU", + "label": "é", + } + "KC_3": { + "key": "BE_DQUO", + "label": "\"", + } + "KC_4": { + "key": "BE_QUOT", + "label": "'", + } + "KC_5": { + "key": "BE_LPRN", + "label": "(", + } + "KC_6": { + "key": "BE_SECT", + "label": "§", + } + "KC_7": { + "key": "BE_EGRV", + "label": "è", + } + "KC_8": { + "key": "BE_EXLM", + "label": "!", + } + "KC_9": { + "key": "BE_CCED", + "label": "ç", + } + "KC_0": { + "key": "BE_AGRV", + "label": "à", + } + "KC_MINS": { + "key": "BE_RPRN", + "label": ")", + } + "KC_EQL": { + "key": "BE_MINS", + "label": "-", + } + "KC_Q": { + "key": "BE_A", + "label": "A", + } + "KC_W": { + "key": "BE_Z", + "label": "Z", + } + "KC_E": { + "key": "BE_E", + "label": "E", + } + "KC_R": { + "key": "BE_R", + "label": "R", + } + "KC_T": { + "key": "BE_T", + "label": "T", + } + "KC_Y": { + "key": "BE_Y", + "label": "Y", + } + "KC_U": { + "key": "BE_U", + "label": "U", + } + "KC_I": { + "key": "BE_I", + "label": "I", + } + "KC_O": { + "key": "BE_O", + "label": "O", + } + "KC_P": { + "key": "BE_P", + "label": "P", + } + "KC_LBRC": { + "key": "BE_DCIR", + "label": "^ (dead)", + } + "KC_RBRC": { + "key": "BE_DLR", + "label": "$", + } + "KC_A": { + "key": "BE_Q", + "label": "Q", + } + "KC_S": { + "key": "BE_S", + "label": "S", + } + "KC_D": { + "key": "BE_D", + "label": "D", + } + "KC_F": { + "key": "BE_F", + "label": "F", + } + "KC_G": { + "key": "BE_G", + "label": "G", + } + "KC_H": { + "key": "BE_H", + "label": "H", + } + "KC_J": { + "key": "BE_J", + "label": "J", + } + "KC_K": { + "key": "BE_K", + "label": "K", + } + "KC_L": { + "key": "BE_L", + "label": "L", + } + "KC_SCLN": { + "key": "BE_M", + "label": "M", + } + "KC_QUOT": { + "key": "BE_UGRV", + "label": "ù", + } + "KC_NUHS": { + "key": "BE_MICR", + "label": "µ", + } + "KC_NUBS": { + "key": "BE_LABK", + "label": "<", + } + "KC_Z": { + "key": "BE_W", + "label": "W", + } + "KC_X": { + "key": "BE_X", + "label": "X", + } + "KC_C": { + "key": "BE_C", + "label": "C", + } + "KC_V": { + "key": "BE_V", + "label": "V", + } + "KC_B": { + "key": "BE_B", + "label": "B", + } + "KC_N": { + "key": "BE_N", + "label": "N", + } + "KC_M": { + "key": "BE_COMM", + "label": ",", + } + "KC_COMM": { + "key": "BE_SCLN", + "label": ";", + } + "KC_DOT": { + "key": "BE_COLN", + "label": ":", + } + "KC_SLSH": { + "key": "BE_EQL", + "label": "=", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ³ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ _ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ % │ £ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ ? │ . │ / │ + │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(BE_SUP2)": { + "key": "BE_SUP3", + "label": "³", + } + "S(BE_AMPR)": { + "key": "BE_1", + "label": "1", + } + "S(BE_EACU)": { + "key": "BE_2", + "label": "2", + } + "S(BE_DQUO)": { + "key": "BE_3", + "label": "3", + } + "S(BE_QUOT)": { + "key": "BE_4", + "label": "4", + } + "S(BE_LPRN)": { + "key": "BE_5", + "label": "5", + } + "S(BE_SECT)": { + "key": "BE_6", + "label": "6", + } + "S(BE_EGRV)": { + "key": "BE_7", + "label": "7", + } + "S(BE_EXLM)": { + "key": "BE_8", + "label": "8", + } + "S(BE_CCED)": { + "key": "BE_9", + "label": "9", + } + "S(BE_AGRV)": { + "key": "BE_0", + "label": "0", + } + "S(BE_RPRN)": { + "key": "BE_DEG", + "label": "°", + } + "S(BE_MINS)": { + "key": "BE_UNDS", + "label": "_", + } + "S(BE_DCIR)": { + "key": "BE_DIAE", + "label": "¨ (dead)", + } + "S(BE_DLR)": { + "key": "BE_ASTR", + "label": "*", + } + "S(BE_UGRV)": { + "key": "BE_PERC", + "label": "%", + } + "S(BE_MICR)": { + "key": "BE_PND", + "label": "£", + } + "S(BE_LABK)": { + "key": "BE_RABK", + "label": ">", + } + "S(BE_COMM)": { + "key": "BE_QUES", + "label": "?", + } + "S(BE_SCLN)": { + "key": "BE_DOT", + "label": ".", + } + "S(BE_COLN)": { + "key": "BE_SLSH", + "label": "/", + } + "S(BE_EQL)": { + "key": "BE_PLUS", + "label": "+", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ | │ @ │ # │ │ │ ^ │ │ │ { │ } │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ´ │ ` │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ \ │ │ │ │ │ │ │ │ │ │ ~ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(BE_AMPR)": { + "key": "BE_PIPE", + "label": "|", + } + "ALGR(BE_EACU)": { + "key": "BE_AT", + "label": "@", + } + "ALGR(BE_DQUO)": { + "key": "BE_HASH", + "label": "#", + } + "ALGR(BE_SECT)": { + "key": "BE_CIRC", + "label": "^", + } + "ALGR(BE_CCED)": { + "key": "BE_LCBR", + "label": "{", + } + "ALGR(BE_AGRV)": { + "key": "BE_RCBR", + "label": "}", + } + "ALGR(BE_E)": { + "key": "BE_EURO", + "label": "€", + } + "ALGR(BE_DCIR)": { + "key": "BE_LBRC", + "label": "[", + } + "ALGR(BE_DLR)": { + "key": "BE_RBRC", + "label": "]", + } + "ALGR(BE_UGRV)": { + "key": "BE_ACUT", + "label": "´ (dead)", + } + "ALGR(BE_MICR)": { + "key": "BE_GRV", + "label": "` (dead)", + } + "ALGR(BE_LABK)": { + "key": "BE_BSLS", + "label": "\\", + } + "ALGR(BE_EQL)": { + "key": "BE_TILD", + "label": "~", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_bepo_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_bepo_0.0.1.hjson new file mode 100644 index 0000000000..713f3f2829 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_bepo_0.0.1.hjson @@ -0,0 +1,632 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ $ │ " │ « │ » │ ( │ ) │ @ │ + │ - │ / │ * │ = │ % │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ B │ É │ P │ O │ È │ ^ │ V │ D │ L │ J │ Z │ W │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ U │ I │ E │ , │ C │ T │ S │ R │ N │ M │ Ç │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ Ê │ À │ Y │ X │ . │ K │ ' │ Q │ G │ H │ F │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "BP_DLR", + "label": "$", + } + "KC_1": { + "key": "BP_DQUO", + "label": "\"", + } + "KC_2": { + "key": "BP_LDAQ", + "label": "«", + } + "KC_3": { + "key": "BP_RDAQ", + "label": "»", + } + "KC_4": { + "key": "BP_LPRN", + "label": "(", + } + "KC_5": { + "key": "BP_RPRN", + "label": ")", + } + "KC_6": { + "key": "BP_AT", + "label": "@", + } + "KC_7": { + "key": "BP_PLUS", + "label": "+", + } + "KC_8": { + "key": "BP_MINS", + "label": "-", + } + "KC_9": { + "key": "BP_SLSH", + "label": "/", + } + "KC_0": { + "key": "BP_ASTR", + "label": "*", + } + "KC_MINS": { + "key": "BP_EQL", + "label": "=", + } + "KC_EQL": { + "key": "BP_PERC", + "label": "%", + } + "KC_Q": { + "key": "BP_B", + "label": "B", + } + "KC_W": { + "key": "BP_EACU", + "label": "É", + } + "KC_E": { + "key": "BP_P", + "label": "P", + } + "KC_R": { + "key": "BP_O", + "label": "O", + } + "KC_T": { + "key": "BP_EGRV", + "label": "È", + } + "KC_Y": { + "key": "BP_DCIR", + "label": "^ (dead)", + } + "KC_U": { + "key": "BP_V", + "label": "V", + } + "KC_I": { + "key": "BP_D", + "label": "D", + } + "KC_O": { + "key": "BP_L", + "label": "L", + } + "KC_P": { + "key": "BP_J", + "label": "J", + } + "KC_LBRC": { + "key": "BP_Z", + "label": "Z", + } + "KC_RBRC": { + "key": "BP_W", + "label": "W", + } + "KC_A": { + "key": "BP_A", + "label": "A", + } + "KC_S": { + "key": "BP_U", + "label": "U", + } + "KC_D": { + "key": "BP_I", + "label": "I", + } + "KC_F": { + "key": "BP_E", + "label": "E", + } + "KC_G": { + "key": "BP_COMM", + "label": ",", + } + "KC_H": { + "key": "BP_C", + "label": "C", + } + "KC_J": { + "key": "BP_T", + "label": "T", + } + "KC_K": { + "key": "BP_S", + "label": "S", + } + "KC_L": { + "key": "BP_R", + "label": "R", + } + "KC_SCLN": { + "key": "BP_N", + "label": "N", + } + "KC_QUOT": { + "key": "BP_M", + "label": "M", + } + "KC_BSLS": { + "key": "BP_CCED", + "label": "Ç", + } + "KC_NUBS": { + "key": "BP_ECIR", + "label": "Ê", + } + "KC_Z": { + "key": "BP_AGRV", + "label": "À", + } + "KC_X": { + "key": "BP_Y", + "label": "Y", + } + "KC_C": { + "key": "BP_X", + "label": "X", + } + "KC_V": { + "key": "BP_DOT", + "label": ".", + } + "KC_B": { + "key": "BP_K", + "label": "K", + } + "KC_N": { + "key": "BP_QUOT", + "label": "'", + } + "KC_M": { + "key": "BP_Q", + "label": "Q", + } + "KC_COMM": { + "key": "BP_G", + "label": "G", + } + "KC_DOT": { + "key": "BP_H", + "label": "H", + } + "KC_SLSH": { + "key": "BP_F", + "label": "F", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ ! │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ ; │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ : │ │ ? │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(BP_DLR)": { + "key": "BP_HASH", + "label": "#", + } + "S(BP_DQUO)": { + "key": "BP_1", + "label": "1", + } + "S(BP_LDAQ)": { + "key": "BP_2", + "label": "2", + } + "S(BP_RDAQ)": { + "key": "BP_3", + "label": "3", + } + "S(BP_LPRN)": { + "key": "BP_4", + "label": "4", + } + "S(BP_RPRN)": { + "key": "BP_5", + "label": "5", + } + "S(BP_AT)": { + "key": "BP_6", + "label": "6", + } + "S(BP_PLUS)": { + "key": "BP_7", + "label": "7", + } + "S(BP_MINS)": { + "key": "BP_8", + "label": "8", + } + "S(BP_SLSH)": { + "key": "BP_9", + "label": "9", + } + "S(BP_ASTR)": { + "key": "BP_0", + "label": "0", + } + "S(BP_EQL)": { + "key": "BP_DEG", + "label": "°", + } + "S(BP_PERC)": { + "key": "BP_GRV", + "label": "`", + } + "S(BP_DCIR)": { + "key": "BP_EXLM", + "label": "!", + } + "S(BP_COMM)": { + "key": "BP_SCLN", + "label": ";", + } + "S(BP_DOT)": { + "key": "BP_COLN", + "label": ":", + } + "S(BP_QUOT)": { + "key": "BP_QUES", + "label": "?", + } + "S(KC_SPC)": { + "key": "BP_NBSP", + "label": "(non-breaking space)", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ – │ — │ < │ > │ [ │ ] │ ^ │ ± │ − │ ÷ │ × │ ≠ │ ‰ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ | │ ´ │ & │ Œ │ ` │ ¡ │ ˇ │ Ð │ / │ IJ │ Ə │ ˘ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Æ │ Ù │ ¨ │ € │ │ © │ Þ │ ẞ │ ® │ ~ │ ¯ │ ¸ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ \ │ { │ } │ … │ ~ │ ¿ │ ° │ │ † │ ˛ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ _ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(BP_DLR)": { + "key": "BP_NDSH", + "label": "–", + } + "ALGR(BP_DQUO)": { + "key": "BP_MDSH", + "label": "—", + } + "ALGR(BP_LDAQ)": { + "key": "BP_LABK", + "label": "<", + } + "ALGR(BP_RDAQ)": { + "key": "BP_RABK", + "label": ">", + } + "ALGR(BP_LPRN)": { + "key": "BP_LBRC", + "label": "[", + } + "ALGR(BP_RPRN)": { + "key": "BP_RBRC", + "label": "]", + } + "ALGR(BP_AT)": { + "key": "BP_CIRC", + "label": "^", + } + "ALGR(BP_PLUS)": { + "key": "BP_PLMN", + "label": "±", + } + "ALGR(BP_MINS)": { + "key": "BP_MMNS", + "label": "−", + } + "ALGR(BP_SLSH)": { + "key": "BP_DIV", + "label": "÷", + } + "ALGR(BP_ASTR)": { + "key": "BP_MUL", + "label": "×", + } + "ALGR(BP_EQL)": { + "key": "BP_NEQL", + "label": "≠", + } + "ALGR(BP_PERC)": { + "key": "BP_PERM", + "label": "‰", + } + "ALGR(BP_B)": { + "key": "BP_PIPE", + "label": "|", + } + "ALGR(BP_EACU)": { + "key": "BP_ACUT", + "label": "´ (dead)", + } + "ALGR(BP_P)": { + "key": "BP_AMPR", + "label": "&", + } + "ALGR(BP_O)": { + "key": "BP_OE", + "label": "Œ", + } + "ALGR(BP_EGRV)": { + "key": "BP_DGRV", + "label": "` (dead)", + } + "ALGR(BP_DCIR)": { + "key": "BP_IEXL", + "label": "¡", + } + "ALGR(BP_V)": { + "key": "BP_CARN", + "label": "ˇ (dead)", + } + "ALGR(BP_D)": { + "key": "BP_ETH", + "label": "Ð", + } + "ALGR(BP_L)": { + "key": "BP_DSLS", + "label": "/ (dead)", + } + "ALGR(BP_J)": { + "key": "BP_IJ", + "label": "IJ", + } + "ALGR(BP_Z)": { + "key": "BP_SCHW", + "label": "Ə", + } + "ALGR(BP_W)": { + "key": "BP_BREV", + "label": "˘ (dead)", + } + "ALGR(BP_A)": { + "key": "BP_AE", + "label": "Æ", + } + "ALGR(BP_U)": { + "key": "BP_UGRV", + "label": "Ù", + } + "ALGR(BP_I)": { + "key": "BP_DIAE", + "label": "¨ (dead)", + } + "ALGR(BP_E)": { + "key": "BP_EURO", + "label": "€", + } + "ALGR(BP_C)": { + "key": "BP_COPY", + "label": "©", + } + "ALGR(BP_T)": { + "key": "BP_THRN", + "label": "Þ", + } + "ALGR(BP_S)": { + "key": "BP_SS", + "label": "ẞ", + } + "ALGR(BP_R)": { + "key": "BP_REGD", + "label": "®", + } + "ALGR(BP_N)": { + "key": "BP_DTIL", + "label": "~ (dead)", + } + "ALGR(BP_M)": { + "key": "BP_MACR", + "label": "¯ (dead)", + } + "ALGR(BP_CCED)": { + "key": "BP_CEDL", + "label": "¸ (dead)", + } + "ALGR(BP_AGRV)": { + "key": "BP_BSLS", + "label": "\\", + } + "ALGR(BP_Y)": { + "key": "BP_LCBR", + "label": "{", + } + "ALGR(BP_X)": { + "key": "BP_RCBR", + "label": "}", + } + "ALGR(BP_DOT)": { + "key": "BP_ELLP", + "label": "…", + } + "ALGR(BP_K)": { + "key": "BP_TILD", + "label": "~", + } + "ALGR(BP_QUES)": { + "key": "BP_IQUE", + "label": "¿", + } + "ALGR(BP_Q)": { + "key": "BP_RNGA", + "label": "° (dead)", + } + "ALGR(BP_G)": { + "key": "BP_DGRK", + "label": "µ (dead Greek key)", + } + "ALGR(BP_H)": { + "key": "BP_DAGG", + "label": "†", + } + "ALGR(BP_F)": { + "key": "BP_OGON", + "label": "˛ (dead)", + } + "ALGR(KC_SPC)": { + "key": "BP_UNDS", + "label": "_", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¶ │ „ │ “ │ ” │ ≤ │ ≥ │ │ ¬ │ ¼ │ ½ │ ¾ │ ′ │ ″ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ ¦ │ ˝ │ § │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ ˙ │ ¤ │ ̛ │ ſ │ │ │ ™ │ │ º │ , │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ ‘ │ ’ │ · │ ⌨ │ ̉ │ ̣ │ │ ‡ │ ª │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(BP_DLR))": { + "key": "BP_PARA", + "label": "¶", + } + "S(ALGR(BP_DQUO))": { + "key": "BP_DLQU", + "label": "„", + } + "S(ALGR(BP_LDAQ))": { + "key": "BP_LDQU", + "label": "“", + } + "S(ALGR(BP_RDAQ))": { + "key": "BP_RDQU", + "label": "”", + } + "S(ALGR(BP_LPRN))": { + "key": "BP_LEQL", + "label": "≤", + } + "S(ALGR(BP_RPRN))": { + "key": "BP_GEQL", + "label": "≥", + } + "S(ALGR(BP_PLUS))": { + "key": "BP_NOT", + "label": "¬", + } + "S(ALGR(BP_MINS))": { + "key": "BP_QRTR", + "label": "¼", + } + "S(ALGR(BP_SLSH))": { + "key": "BP_HALF", + "label": "½", + } + "S(ALGR(BP_ASTR))": { + "key": "BP_TQTR", + "label": "¾", + } + "S(ALGR(BP_EQL))": { + "key": "BP_PRIM", + "label": "′", + } + "S(ALGR(BP_PERC))": { + "key": "BP_DPRM", + "label": "″", + } + "S(ALGR(BP_B))": { + "key": "BP_BRKP", + "label": "¦", + } + "S(ALGR(BP_EACU))": { + "key": "BP_DACU", + "label": "˝ (dead)", + } + "S(ALGR(BP_P))": { + "key": "BP_SECT", + "label": "§", + } + "S(ALGR(BP_I))": { + "key": "BP_DOTA", + "label": "˙ (dead)", + } + "S(ALGR(BP_E))": { + "key": "BP_CURR", + "label": "¤ (dead)", + } + "S(ALGR(BP_COMM))": { + "key": "BP_HORN", + "label": "̛ (dead)", + } + "S(ALGR(BP_C))": { + "key": "BP_LNGS", + "label": "ſ", + } + "S(ALGR(BP_R))": { + "key": "BP_TM", + "label": "™", + } + "S(ALGR(BP_M))": { + "key": "BP_MORD", + "label": "º", + } + "S(ALGR(BP_CCED))": { + "key": "BP_DCMM", + "label": ", (dead)", + } + "S(ALGR(BP_Y))": { + "key": "BP_LSQU", + "label": "‘", + } + "S(ALGR(BP_X))": { + "key": "BP_RSQU", + "label": "’", + } + "S(ALGR(BP_DOT))": { + "key": "BP_MDDT", + "label": "·", + } + "S(ALGR(BP_K))": { + "key": "BP_KEYB", + "label": "⌨", + } + "S(ALGR(BP_QUOT))": { + "key": "BP_HOKA", + "label": "̉ (dead)", + } + "S(ALGR(BP_Q))": { + "key": "BP_DOTB", + "label": "̣ (dead)", + } + "S(ALGR(BP_H))": { + "key": "BP_DDAG", + "label": "‡", + } + "S(ALGR(BP_F))": { + "key": "BP_FORD", + "label": "ª", + } + "S(ALGR(KC_SPC))": { + "key": "BP_NNBS", + "label": "(narrow non-breaking space)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_brazilian_abnt2_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_brazilian_abnt2_0.0.1.hjson new file mode 100644 index 0000000000..17006a64df --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_brazilian_abnt2_0.0.1.hjson @@ -0,0 +1,379 @@ +{ + "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": "BR_QUOT", + "label": "'", + } + "KC_1": { + "key": "BR_1", + "label": "1", + } + "KC_2": { + "key": "BR_2", + "label": "2", + } + "KC_3": { + "key": "BR_3", + "label": "3", + } + "KC_4": { + "key": "BR_4", + "label": "4", + } + "KC_5": { + "key": "BR_5", + "label": "5", + } + "KC_6": { + "key": "BR_6", + "label": "6", + } + "KC_7": { + "key": "BR_7", + "label": "7", + } + "KC_8": { + "key": "BR_8", + "label": "8", + } + "KC_9": { + "key": "BR_9", + "label": "9", + } + "KC_0": { + "key": "BR_0", + "label": "0", + } + "KC_MINS": { + "key": "BR_MINS", + "label": "-", + } + "KC_EQL": { + "key": "BR_EQL", + "label": "=", + } + "KC_Q": { + "key": "BR_Q", + "label": "Q", + } + "KC_W": { + "key": "BR_W", + "label": "W", + } + "KC_E": { + "key": "BR_E", + "label": "E", + } + "KC_R": { + "key": "BR_R", + "label": "R", + } + "KC_T": { + "key": "BR_T", + "label": "T", + } + "KC_Y": { + "key": "BR_Y", + "label": "Y", + } + "KC_U": { + "key": "BR_U", + "label": "U", + } + "KC_I": { + "key": "BR_I", + "label": "I", + } + "KC_O": { + "key": "BR_O", + "label": "O", + } + "KC_P": { + "key": "BR_P", + "label": "P", + } + "KC_LBRC": { + "key": "BR_ACUT", + "label": "´ (dead)", + } + "KC_RBRC": { + "key": "BR_LBRC", + "label": "[", + } + "KC_A": { + "key": "BR_A", + "label": "A", + } + "KC_S": { + "key": "BR_S", + "label": "S", + } + "KC_D": { + "key": "BR_D", + "label": "D", + } + "KC_F": { + "key": "BR_F", + "label": "F", + } + "KC_G": { + "key": "BR_G", + "label": "G", + } + "KC_H": { + "key": "BR_H", + "label": "H", + } + "KC_J": { + "key": "BR_J", + "label": "J", + } + "KC_K": { + "key": "BR_K", + "label": "K", + } + "KC_L": { + "key": "BR_L", + "label": "L", + } + "KC_SCLN": { + "key": "BR_CCED", + "label": "Ç", + } + "KC_QUOT": { + "key": "BR_TILD", + "label": "~ (dead)", + } + "KC_BSLS": { + "key": "BR_RBRC", + "label": "]", + } + "KC_NUBS": { + "key": "BR_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "BR_Z", + "label": "Z", + } + "KC_X": { + "key": "BR_X", + "label": "X", + } + "KC_C": { + "key": "BR_C", + "label": "C", + } + "KC_V": { + "key": "BR_V", + "label": "V", + } + "KC_B": { + "key": "BR_B", + "label": "B", + } + "KC_N": { + "key": "BR_N", + "label": "N", + } + "KC_M": { + "key": "BR_M", + "label": "M", + } + "KC_COMM": { + "key": "BR_COMM", + "label": ",", + } + "KC_DOT": { + "key": "BR_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "BR_SCLN", + "label": ";", + } + "KC_INT1": { + "key": "BR_SLSH", + "label": "/", + } + "KC_PCMM": { + "key": "BR_PDOT", + "label": ".", + } + "KC_PDOT": { + "key": "BR_PCMM", + "label": ",", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ " │ ! │ @ │ # │ $ │ % │ ¨ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ` │ { │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ } │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ + * │ │ | │ │ │ │ │ │ │ │ < │ > │ : │ ? │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(BR_QUOT)": { + "key": "BR_DQUO", + "label": "\"", + } + "S(BR_1)": { + "key": "BR_EXLM", + "label": "!", + } + "S(BR_2)": { + "key": "BR_AT", + "label": "@", + } + "S(BR_3)": { + "key": "BR_HASH", + "label": "#", + } + "S(BR_4)": { + "key": "BR_DLR", + "label": "$", + } + "S(BR_5)": { + "key": "BR_PERC", + "label": "%", + } + "S(BR_6)": { + "key": "BR_DIAE", + "label": "¨ (dead)", + } + "S(BR_7)": { + "key": "BR_AMPR", + "label": "&", + } + "S(BR_8)": { + "key": "BR_ASTR", + "label": "*", + } + "S(BR_9)": { + "key": "BR_LPRN", + "label": "(", + } + "S(BR_0)": { + "key": "BR_RPRN", + "label": ")", + } + "S(BR_MINS)": { + "key": "BR_UNDS", + "label": "_", + } + "S(BR_EQL)": { + "key": "BR_PLUS", + "label": "+", + } + "S(BR_ACUT)": { + "key": "BR_GRV", + "label": "` (dead)", + } + "S(BR_LBRC)": { + "key": "BR_LCBR", + "label": "{", + } + "S(BR_TILD)": { + "key": "BR_CIRC", + "label": "^ (dead)", + } + "S(BR_RBRC)": { + "key": "BR_RCBR", + "label": "}", + } + "S(BR_BSLS)": { + "key": "BR_PIPE", + "label": "|", + } + "S(BR_COMM)": { + "key": "BR_LABK", + "label": "<", + } + "S(BR_DOT)": { + "key": "BR_RABK", + "label": ">", + } + "S(BR_SCLN)": { + "key": "BR_COLN", + "label": ":", + } + "S(BR_SLSH)": { + "key": "BR_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ¹ │ ² │ ³ │ £ │ ¢ │ ¬ │ │ │ │ │ │ § │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ ° │ │ │ │ │ │ │ │ │ ª │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ º │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ + * │ │ │ │ │ ₢ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(BR_1)": { + "key": "BR_SUP1", + "label": "¹", + } + "ALGR(BR_2)": { + "key": "BR_SUP2", + "label": "²", + } + "ALGR(BR_3)": { + "key": "BR_SUP3", + "label": "³", + } + "ALGR(BR_4)": { + "key": "BR_PND", + "label": "£", + } + "ALGR(BR_5)": { + "key": "BR_CENT", + "label": "¢", + } + "ALGR(BR_6)": { + "key": "BR_NOT", + "label": "¬", + } + "ALGR(BR_EQL)": { + "key": "BR_SECT", + "label": "§", + } + "ALGR(BR_E)": { + "key": "BR_DEG", + "label": "°", + } + "ALGR(BR_LBRC)": { + "key": "BR_FORD", + "label": "ª", + } + "ALGR(BR_RBRC)": { + "key": "BR_MORD", + "label": "º", + } + "ALGR(BR_C)": { + "key": "BR_CRUZ", + "label": "₢", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_canadian_multilingual_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_canadian_multilingual_0.0.1.hjson new file mode 100644 index 0000000000..bfe5d5b54c --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_canadian_multilingual_0.0.1.hjson @@ -0,0 +1,641 @@ +{ + "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": "CA_SLSH", + "label": "/", + } + "KC_1": { + "key": "CA_1", + "label": "1", + } + "KC_2": { + "key": "CA_2", + "label": "2", + } + "KC_3": { + "key": "CA_3", + "label": "3", + } + "KC_4": { + "key": "CA_4", + "label": "4", + } + "KC_5": { + "key": "CA_5", + "label": "5", + } + "KC_6": { + "key": "CA_6", + "label": "6", + } + "KC_7": { + "key": "CA_7", + "label": "7", + } + "KC_8": { + "key": "CA_8", + "label": "8", + } + "KC_9": { + "key": "CA_9", + "label": "9", + } + "KC_0": { + "key": "CA_0", + "label": "0", + } + "KC_MINS": { + "key": "CA_MINS", + "label": "-", + } + "KC_EQL": { + "key": "CA_EQL", + "label": "=", + } + "KC_Q": { + "key": "CA_Q", + "label": "Q", + } + "KC_W": { + "key": "CA_W", + "label": "W", + } + "KC_E": { + "key": "CA_E", + "label": "E", + } + "KC_R": { + "key": "CA_R", + "label": "R", + } + "KC_T": { + "key": "CA_T", + "label": "T", + } + "KC_Y": { + "key": "CA_Y", + "label": "Y", + } + "KC_U": { + "key": "CA_U", + "label": "U", + } + "KC_I": { + "key": "CA_I", + "label": "I", + } + "KC_O": { + "key": "CA_O", + "label": "O", + } + "KC_P": { + "key": "CA_P", + "label": "P", + } + "KC_LBRC": { + "key": "CA_CIRC", + "label": "^ (dead)", + } + "KC_RBRC": { + "key": "CA_CCED", + "label": "Ç", + } + "KC_A": { + "key": "CA_A", + "label": "A", + } + "KC_S": { + "key": "CA_S", + "label": "S", + } + "KC_D": { + "key": "CA_D", + "label": "D", + } + "KC_F": { + "key": "CA_F", + "label": "F", + } + "KC_G": { + "key": "CA_G", + "label": "G", + } + "KC_H": { + "key": "CA_H", + "label": "H", + } + "KC_J": { + "key": "CA_J", + "label": "J", + } + "KC_K": { + "key": "CA_K", + "label": "K", + } + "KC_L": { + "key": "CA_L", + "label": "L", + } + "KC_SCLN": { + "key": "CA_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "CA_EGRV", + "label": "É", + } + "KC_NUHS": { + "key": "CA_AGRV", + "label": "À", + } + "KC_NUBS": { + "key": "CA_UGRV", + "label": "Ù", + } + "KC_Z": { + "key": "CA_Z", + "label": "Z", + } + "KC_X": { + "key": "CA_X", + "label": "X", + } + "KC_C": { + "key": "CA_C", + "label": "C", + } + "KC_V": { + "key": "CA_V", + "label": "V", + } + "KC_B": { + "key": "CA_B", + "label": "B", + } + "KC_N": { + "key": "CA_N", + "label": "N", + } + "KC_M": { + "key": "CA_M", + "label": "M", + } + "KC_COMM": { + "key": "CA_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CA_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CA_EACU", + "label": "É", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ \ │ ! │ @ │ # │ $ │ % │ ? │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ : │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ ' │ " │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(CA_SLSH)": { + "key": "CA_BSLS", + "label": "\\", + } + "S(CA_1)": { + "key": "CA_EXLM", + "label": "!", + } + "S(CA_2)": { + "key": "CA_AT", + "label": "@", + } + "S(CA_3)": { + "key": "CA_HASH", + "label": "#", + } + "S(CA_4)": { + "key": "CA_DLR", + "label": "$", + } + "S(CA_5)": { + "key": "CA_PERC", + "label": "%", + } + "S(CA_6)": { + "key": "CA_QUES", + "label": "?", + } + "S(CA_7)": { + "key": "CA_AMPR", + "label": "&", + } + "S(CA_8)": { + "key": "CA_ASTR", + "label": "*", + } + "S(CA_9)": { + "key": "CA_LPRN", + "label": "(", + } + "S(CA_0)": { + "key": "CA_RPRN", + "label": ")", + } + "S(CA_MINS)": { + "key": "CA_UNDS", + "label": "_", + } + "S(CA_EQL)": { + "key": "CA_PLUS", + "label": "+", + } + "S(CA_CIRC)": { + "key": "CA_DIAE", + "label": "¨ (dead)", + } + "S(CA_SCLN)": { + "key": "CA_COLN", + "label": ":", + } + "S(CA_COMM)": { + "key": "CA_QUOT", + "label": "'", + } + "S(CA_DOT)": { + "key": "CA_DQUO", + "label": "\"", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ | │ │ │ │ ¤ │ │ │ { │ } │ [ │ ] │ │ ¬ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ ` │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ ° │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ « │ » │ │ │ │ │ │ < │ > │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(CA_SLSH)": { + "key": "CA_PIPE", + "label": "|", + } + "ALGR(CA_4)": { + "key": "CA_CURR", + "label": "¤", + } + "ALGR(CA_7)": { + "key": "CA_LCBR", + "label": "{", + } + "ALGR(CA_8)": { + "key": "CA_RCBR", + "label": "}", + } + "ALGR(CA_9)": { + "key": "CA_LBRC", + "label": "[", + } + "ALGR(CA_0)": { + "key": "CA_RBRC", + "label": "]", + } + "ALGR(CA_EQL)": { + "key": "CA_NOT", + "label": "¬", + } + "ALGR(CA_E)": { + "key": "CA_EURO", + "label": "€", + } + "ALGR(CA_CIRC)": { + "key": "CA_GRV", + "label": "` (dead)", + } + "ALGR(CA_CCED)": { + "key": "CA_DTIL", + "label": "~ (dead)", + } + "ALGR(CA_SCLN)": { + "key": "CA_DEG", + "label": "°", + } + "ALGR(CA_Z)": { + "key": "CA_LDAQ", + "label": "«", + } + "ALGR(CA_X)": { + "key": "CA_RDAQ", + "label": "»", + } + "ALGR(CA_COMM)": { + "key": "CA_LABK", + "label": "<", + } + "ALGR(CA_DOT)": { + "key": "CA_RABK", + "label": ">", + } +/* Right Ctrl symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ¹ │ ² │ ³ │ ¼ │ ½ │ ¾ │ │ │ │ │ │ ¸ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Ω │ Ł │ Œ │ ¶ │ Ŧ │ ← │ ↓ │ → │ Ø │ Þ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Æ │ ß │ Ð │ │ Ŋ │ Ħ │ IJ │ ĸ │ Ŀ │ ´ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ ¢ │ “ │ ” │ ʼn │ μ │ ― │ ˙ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "RCTL(CA_1)": { + "key": "CA_SUP1", + "label": "¹", + } + "RCTL(CA_2)": { + "key": "CA_SUP2", + "label": "²", + } + "RCTL(CA_3)": { + "key": "CA_SUP3", + "label": "³", + } + "RCTL(CA_4)": { + "key": "CA_QRTR", + "label": "¼", + } + "RCTL(CA_5)": { + "key": "CA_HALF", + "label": "½", + } + "RCTL(CA_6)": { + "key": "CA_TQTR", + "label": "¾", + } + "RCTL(CA_EQL)": { + "key": "CA_CEDL", + "label": "¸ (dead)", + } + "RCTL(CA_Q)": { + "key": "CA_OMEG", + "label": "Ω", + } + "RCTL(CA_W)": { + "key": "CA_LSTR", + "label": "Ł", + } + "RCTL(CA_E)": { + "key": "CA_OE", + "label": "Œ", + } + "RCTL(CA_R)": { + "key": "CA_PARA", + "label": "¶", + } + "RCTL(CA_T)": { + "key": "CA_TSTR", + "label": "Ŧ", + } + "RCTL(CA_Y)": { + "key": "CA_LARR", + "label": "←", + } + "RCTL(CA_U)": { + "key": "CA_DARR", + "label": "↓", + } + "RCTL(CA_I)": { + "key": "CA_RARR", + "label": "→", + } + "RCTL(CA_O)": { + "key": "CA_OSTR", + "label": "Ø", + } + "RCTL(CA_P)": { + "key": "CA_THRN", + "label": "Þ", + } + "RCTL(CA_CCED)": { + "key": "CA_TILD", + "label": "~", + } + "RCTL(CA_A)": { + "key": "CA_AE", + "label": "Æ", + } + "RCTL(CA_S)": { + "key": "CA_SS", + "label": "ß", + } + "RCTL(CA_D)": { + "key": "CA_ETH", + "label": "Ð", + } + "RCTL(CA_G)": { + "key": "CA_ENG", + "label": "Ŋ", + } + "RCTL(CA_H)": { + "key": "CA_HSTR", + "label": "Ħ", + } + "RCTL(CA_J)": { + "key": "CA_IJ", + "label": "IJ", + } + "RCTL(CA_K)": { + "key": "CA_KRA", + "label": "ĸ", + } + "RCTL(CA_L)": { + "key": "CA_LMDT", + "label": "Ŀ", + } + "RCTL(CA_SCLN)": { + "key": "CA_ACUT", + "label": "´ (dead)", + } + "RCTL(CA_C)": { + "key": "CA_CENT", + "label": "¢", + } + "RCTL(CA_V)": { + "key": "CA_LDQU", + "label": "“", + } + "RCTL(CA_B)": { + "key": "CA_RDQU", + "label": "”", + } + "RCTL(CA_N)": { + "key": "CA_APSN", + "label": "ʼn", + } + "RCTL(CA_M)": { + "key": "CA_MICR", + "label": "μ", + } + "RCTL(CA_COMM)": { + "key": "CA_HRZB", + "label": "―", + } + "RCTL(CA_DOT)": { + "key": "CA_DOTA", + "label": "˙ (dead)", + } +/* Shift+Right Ctrl symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ - │ ¡ │ │ £ │ │ ⅜ │ ⅝ │ ⅞ │ ™ │ ± │ │ ¿ │ ˛ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ ® │ │ ¥ │ ↑ │ ı │ │ │ ° │ ¯ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ § │ │ ª │ │ │ │ │ │ ˝ │ ˇ │ ˘ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ ¦ │ │ │ © │ ‘ │ ’ │ ♪ │ º │ × │ ÷ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "RCTL(S(CA_SLSH))": { + "key": "CA_SHYP", + "label": "­ (soft hyphen)", + } + "RCTL(S(CA_1))": { + "key": "CA_IEXL", + "label": "¡", + } + "RCTL(S(CA_3))": { + "key": "CA_PND", + "label": "£", + } + "RCTL(S(CA_5))": { + "key": "CA_TEIG", + "label": "⅜", + } + "RCTL(S(CA_6))": { + "key": "CA_FEIG", + "label": "⅝", + } + "RCTL(S(CA_7))": { + "key": "CA_SEIG", + "label": "⅞", + } + "RCTL(S(CA_8))": { + "key": "CA_TM", + "label": "™", + } + "RCTL(S(CA_9))": { + "key": "CA_PLMN", + "label": "±", + } + "RCTL(S(CA_MINS))": { + "key": "CA_IQUE", + "label": "¿", + } + "RCTL(S(CA_EQL))": { + "key": "CA_OGON", + "label": "˛ (dead)", + } + "RCTL(S(CA_R))": { + "key": "CA_REGD", + "label": "®", + } + "RCTL(S(CA_Y))": { + "key": "CA_YEN", + "label": "¥", + } + "RCTL(S(CA_U))": { + "key": "CA_UARR", + "label": "↑", + } + "RCTL(S(CA_I))": { + "key": "CA_DLSI", + "label": "ı", + } + "RCTL(S(CA_CIRC))": { + "key": "CA_RNGA", + "label": "° (dead)", + } + "RCTL(S(CA_CCED))": { + "key": "CA_MACR", + "label": "¯ (dead)", + } + "RCTL(S(CA_S))": { + "key": "CA_SECT", + "label": "§", + } + "RCTL(S(CA_F))": { + "key": "CA_FORD", + "label": "ª", + } + "RCTL(S(CA_SCLN))": { + "key": "CA_DACU", + "label": "˝ (dead)", + } + "RCTL(S(CA_EGRV))": { + "key": "CA_CARN", + "label": "ˇ (dead)", + } + "RCTL(S(CA_AGRV))": { + "key": "CA_BREV", + "label": "˘ (dead)", + } + "RCTL(S(CA_UGRV))": { + "key": "CA_BRKP", + "label": "¦", + } + "RCTL(S(CA_C))": { + "key": "CA_COPY", + "label": "©", + } + "RCTL(S(CA_V))": { + "key": "CA_LSQU", + "label": "‘", + } + "RCTL(S(CA_B))": { + "key": "CA_RSQU", + "label": "’", + } + "RCTL(S(CA_N))": { + "key": "CA_ENOT", + "label": "♪", + } + "RCTL(S(CA_M))": { + "key": "CA_MORD", + "label": "º", + } + "RCTL(S(CA_COMM))": { + "key": "CA_MUL", + "label": "×", + } + "RCTL(S(CA_DOT))": { + "key": "CA_DIV", + "label": "÷", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_colemak_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_colemak_0.0.1.hjson new file mode 100644 index 0000000000..1dc091584b --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_colemak_0.0.1.hjson @@ -0,0 +1,302 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ F │ P │ G │ J │ L │ U │ Y │ ; │ [ │ ] │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ A │ R │ S │ T │ D │ H │ N │ E │ I │ O │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Z │ X │ C │ V │ B │ K │ M │ , │ . │ / │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "CM_GRV", + "label": "`", + } + "KC_1": { + "key": "CM_1", + "label": "1", + } + "KC_2": { + "key": "CM_2", + "label": "2", + } + "KC_3": { + "key": "CM_3", + "label": "3", + } + "KC_4": { + "key": "CM_4", + "label": "4", + } + "KC_5": { + "key": "CM_5", + "label": "5", + } + "KC_6": { + "key": "CM_6", + "label": "6", + } + "KC_7": { + "key": "CM_7", + "label": "7", + } + "KC_8": { + "key": "CM_8", + "label": "8", + } + "KC_9": { + "key": "CM_9", + "label": "9", + } + "KC_0": { + "key": "CM_0", + "label": "0", + } + "KC_MINS": { + "key": "CM_MINS", + "label": "-", + } + "KC_EQL": { + "key": "CM_EQL", + "label": "=", + } + "KC_Q": { + "key": "CM_Q", + "label": "Q", + } + "KC_W": { + "key": "CM_W", + "label": "W", + } + "KC_E": { + "key": "CM_F", + "label": "F", + } + "KC_R": { + "key": "CM_P", + "label": "P", + } + "KC_T": { + "key": "CM_G", + "label": "G", + } + "KC_Y": { + "key": "CM_J", + "label": "J", + } + "KC_U": { + "key": "CM_L", + "label": "L", + } + "KC_I": { + "key": "CM_U", + "label": "U", + } + "KC_O": { + "key": "CM_Y", + "label": "Y", + } + "KC_P": { + "key": "CM_SCLN", + "label": ";", + } + "KC_LBRC": { + "key": "CM_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "CM_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "CM_BSLS", + "label": "\\", + } + "KC_A": { + "key": "CM_A", + "label": "A", + } + "KC_S": { + "key": "CM_R", + "label": "R", + } + "KC_D": { + "key": "CM_S", + "label": "S", + } + "KC_F": { + "key": "CM_T", + "label": "T", + } + "KC_G": { + "key": "CM_D", + "label": "D", + } + "KC_H": { + "key": "CM_H", + "label": "H", + } + "KC_J": { + "key": "CM_N", + "label": "N", + } + "KC_K": { + "key": "CM_E", + "label": "E", + } + "KC_L": { + "key": "CM_I", + "label": "I", + } + "KC_SCLN": { + "key": "CM_O", + "label": "O", + } + "KC_QUOT": { + "key": "CM_QUOT", + "label": "'", + } + "KC_Z": { + "key": "CM_Z", + "label": "Z", + } + "KC_X": { + "key": "CM_X", + "label": "X", + } + "KC_C": { + "key": "CM_C", + "label": "C", + } + "KC_V": { + "key": "CM_V", + "label": "V", + } + "KC_B": { + "key": "CM_B", + "label": "B", + } + "KC_N": { + "key": "CM_K", + "label": "K", + } + "KC_M": { + "key": "CM_M", + "label": "M", + } + "KC_COMM": { + "key": "CM_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CM_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CM_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(CM_GRV)": { + "key": "CM_TILD", + "label": "~", + } + "S(CM_1)": { + "key": "CM_EXLM", + "label": "!", + } + "S(CM_2)": { + "key": "CM_AT", + "label": "@", + } + "S(CM_3)": { + "key": "CM_HASH", + "label": "#", + } + "S(CM_4)": { + "key": "CM_DLR", + "label": "$", + } + "S(CM_5)": { + "key": "CM_PERC", + "label": "%", + } + "S(CM_6)": { + "key": "CM_CIRC", + "label": "^", + } + "S(CM_7)": { + "key": "CM_AMPR", + "label": "&", + } + "S(CM_8)": { + "key": "CM_ASTR", + "label": "*", + } + "S(CM_9)": { + "key": "CM_LPRN", + "label": "(", + } + "S(CM_0)": { + "key": "CM_RPRN", + "label": ")", + } + "S(CM_MINS)": { + "key": "CM_UNDS", + "label": "_", + } + "S(CM_EQL)": { + "key": "CM_PLUS", + "label": "+", + } + "S(CM_SCLN)": { + "key": "CM_COLN", + "label": ":", + } + "S(CM_LBRC)": { + "key": "CM_LCBR", + "label": "{", + } + "S(CM_RBRC)": { + "key": "CM_RCBR", + "label": "}", + } + "S(CM_BSLS)": { + "key": "CM_PIPE", + "label": "|", + } + "S(CM_QUOT)": { + "key": "CM_DQUO", + "label": "\"", + } + "S(CM_COMM)": { + "key": "CM_LABK", + "label": "<", + } + "S(CM_DOT)": { + "key": "CM_RABK", + "label": ">", + } + "S(CM_SLSH)": { + "key": "CM_QUES", + "label": "?", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_croatian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_croatian_0.0.1.hjson new file mode 100644 index 0000000000..82632aa637 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_croatian_0.0.1.hjson @@ -0,0 +1,403 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¸ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "HR_CEDL", + "label": "¸ (dead)", + } + "KC_1": { + "key": "HR_1", + "label": "1", + } + "KC_2": { + "key": "HR_2", + "label": "2", + } + "KC_3": { + "key": "HR_3", + "label": "3", + } + "KC_4": { + "key": "HR_4", + "label": "4", + } + "KC_5": { + "key": "HR_5", + "label": "5", + } + "KC_6": { + "key": "HR_6", + "label": "6", + } + "KC_7": { + "key": "HR_7", + "label": "7", + } + "KC_8": { + "key": "HR_8", + "label": "8", + } + "KC_9": { + "key": "HR_9", + "label": "9", + } + "KC_0": { + "key": "HR_0", + "label": "0", + } + "KC_MINS": { + "key": "HR_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "HR_PLUS", + "label": "+", + } + "KC_Q": { + "key": "HR_Q", + "label": "Q", + } + "KC_W": { + "key": "HR_W", + "label": "W", + } + "KC_E": { + "key": "HR_E", + "label": "E", + } + "KC_R": { + "key": "HR_R", + "label": "R", + } + "KC_T": { + "key": "HR_T", + "label": "T", + } + "KC_Y": { + "key": "HR_Z", + "label": "Z", + } + "KC_U": { + "key": "HR_U", + "label": "U", + } + "KC_I": { + "key": "HR_I", + "label": "I", + } + "KC_O": { + "key": "HR_O", + "label": "O", + } + "KC_P": { + "key": "HR_P", + "label": "P", + } + "KC_LBRC": { + "key": "HR_SCAR", + "label": "Š", + } + "KC_RBRC": { + "key": "HR_DSTR", + "label": "Đ", + } + "KC_A": { + "key": "HR_A", + "label": "A", + } + "KC_S": { + "key": "HR_S", + "label": "S", + } + "KC_D": { + "key": "HR_D", + "label": "D", + } + "KC_F": { + "key": "HR_F", + "label": "F", + } + "KC_G": { + "key": "HR_G", + "label": "G", + } + "KC_H": { + "key": "HR_H", + "label": "H", + } + "KC_J": { + "key": "HR_J", + "label": "J", + } + "KC_K": { + "key": "HR_K", + "label": "K", + } + "KC_L": { + "key": "HR_L", + "label": "L", + } + "KC_SCLN": { + "key": "HR_CCAR", + "label": "Č", + } + "KC_QUOT": { + "key": "HR_CACU", + "label": "Ć", + } + "KC_NUHS": { + "key": "HR_ZCAR", + "label": "Ž", + } + "KC_NUBS": { + "key": "HR_LABK", + "label": "<", + } + "KC_Z": { + "key": "HR_Y", + "label": "Y", + } + "KC_X": { + "key": "HR_X", + "label": "X", + } + "KC_C": { + "key": "HR_C", + "label": "C", + } + "KC_V": { + "key": "HR_V", + "label": "V", + } + "KC_B": { + "key": "HR_B", + "label": "B", + } + "KC_N": { + "key": "HR_N", + "label": "N", + } + "KC_M": { + "key": "HR_M", + "label": "M", + } + "KC_COMM": { + "key": "HR_COMM", + "label": ",", + } + "KC_DOT": { + "key": "HR_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "HR_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(HR_CEDL)": { + "key": "HR_DIAE", + "label": "¨ (dead)", + } + "S(HR_1)": { + "key": "HR_EXLM", + "label": "!", + } + "S(HR_2)": { + "key": "HR_DQUO", + "label": "\"", + } + "S(HR_3)": { + "key": "HR_HASH", + "label": "#", + } + "S(HR_4)": { + "key": "HR_DLR", + "label": "$", + } + "S(HR_5)": { + "key": "HR_PERC", + "label": "%", + } + "S(HR_6)": { + "key": "HR_AMPR", + "label": "&", + } + "S(HR_7)": { + "key": "HR_SLSH", + "label": "/", + } + "S(HR_8)": { + "key": "HR_LPRN", + "label": "(", + } + "S(HR_9)": { + "key": "HR_RPRN", + "label": ")", + } + "S(HR_0)": { + "key": "HR_EQL", + "label": "=", + } + "S(HR_QUOT)": { + "key": "HR_QUES", + "label": "?", + } + "S(HR_PLUS)": { + "key": "HR_ASTR", + "label": "*", + } + "S(HR_LABK)": { + "key": "HR_RABK", + "label": ">", + } + "S(HR_COMM)": { + "key": "HR_SCLN", + "label": ";", + } + "S(HR_DOT)": { + "key": "HR_COLN", + "label": ":", + } + "S(HR_MINS)": { + "key": "HR_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(HR_1)": { + "key": "HR_TILD", + "label": "~", + } + "ALGR(HR_2)": { + "key": "HR_CARN", + "label": "ˇ (dead)", + } + "ALGR(HR_3)": { + "key": "HR_CIRC", + "label": "^ (dead)", + } + "ALGR(HR_4)": { + "key": "HR_BREV", + "label": "˘ (dead)", + } + "ALGR(HR_5)": { + "key": "HR_RNGA", + "label": "° (dead)", + } + "ALGR(HR_6)": { + "key": "HR_OGON", + "label": "˛ (dead)", + } + "ALGR(HR_7)": { + "key": "HR_GRV", + "label": "`", + } + "ALGR(HR_8)": { + "key": "HR_DOTA", + "label": "˙ (dead)", + } + "ALGR(HR_9)": { + "key": "HR_ACUT", + "label": "´ (dead)", + } + "ALGR(HR_0)": { + "key": "HR_DACU", + "label": "˝ (dead)", + } + "ALGR(HR_Q)": { + "key": "HR_BSLS", + "label": "\\", + } + "ALGR(HR_W)": { + "key": "HR_PIPE", + "label": "|", + } + "ALGR(HR_E)": { + "key": "HR_EURO", + "label": "€", + } + "ALGR(HR_SCAR)": { + "key": "HR_DIV", + "label": "÷", + } + "ALGR(HR_DSTR)": { + "key": "HR_MUL", + "label": "×", + } + "ALGR(HR_F)": { + "key": "HR_LBRC", + "label": "[", + } + "ALGR(HR_G)": { + "key": "HR_RBRC", + "label": "]", + } + "ALGR(HR_K)": { + "key": "HR_LLST", + "label": "ł", + } + "ALGR(HR_L)": { + "key": "HR_CLST", + "label": "Ł", + } + "ALGR(HR_CACU)": { + "key": "HR_SS", + "label": "ß", + } + "ALGR(HR_ZCAR)": { + "key": "HR_CURR", + "label": "¤", + } + "ALGR(HR_V)": { + "key": "HR_AT", + "label": "@", + } + "ALGR(HR_B)": { + "key": "HR_LCBR", + "label": "{", + } + "ALGR(HR_N)": { + "key": "HR_RCBR", + "label": "}", + } + "ALGR(HR_M)": { + "key": "HR_SECT", + "label": "§", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_czech_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_czech_0.0.1.hjson new file mode 100644 index 0000000000..9cfb88c489 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_czech_0.0.1.hjson @@ -0,0 +1,435 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ; │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ´ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "CZ_SCLN", + "label": ";", + } + "KC_1": { + "key": "CZ_PLUS", + "label": "+", + } + "KC_2": { + "key": "CZ_ECAR", + "label": "ě", + } + "KC_3": { + "key": "CZ_SCAR", + "label": "š", + } + "KC_4": { + "key": "CZ_CCAR", + "label": "č", + } + "KC_5": { + "key": "CZ_RCAR", + "label": "ř", + } + "KC_6": { + "key": "CZ_ZCAR", + "label": "ž", + } + "KC_7": { + "key": "CZ_YACU", + "label": "ý", + } + "KC_8": { + "key": "CZ_AACU", + "label": "á", + } + "KC_9": { + "key": "CZ_IACU", + "label": "í", + } + "KC_0": { + "key": "CZ_EACU", + "label": "é", + } + "KC_MINS": { + "key": "CZ_EQL", + "label": "=", + } + "KC_EQL": { + "key": "CZ_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "CZ_Q", + "label": "Q", + } + "KC_W": { + "key": "CZ_W", + "label": "W", + } + "KC_E": { + "key": "CZ_E", + "label": "E", + } + "KC_R": { + "key": "CZ_R", + "label": "R", + } + "KC_T": { + "key": "CZ_T", + "label": "T", + } + "KC_Y": { + "key": "CZ_Z", + "label": "Z", + } + "KC_U": { + "key": "CZ_U", + "label": "U", + } + "KC_I": { + "key": "CZ_I", + "label": "I", + } + "KC_O": { + "key": "CZ_O", + "label": "O", + } + "KC_P": { + "key": "CZ_P", + "label": "P", + } + "KC_LBRC": { + "key": "CZ_UACU", + "label": "ú", + } + "KC_RBRC": { + "key": "CZ_RPRN", + "label": ")", + } + "KC_A": { + "key": "CZ_A", + "label": "A", + } + "KC_S": { + "key": "CZ_S", + "label": "S", + } + "KC_D": { + "key": "CZ_D", + "label": "D", + } + "KC_F": { + "key": "CZ_F", + "label": "F", + } + "KC_G": { + "key": "CZ_G", + "label": "G", + } + "KC_H": { + "key": "CZ_H", + "label": "H", + } + "KC_J": { + "key": "CZ_J", + "label": "J", + } + "KC_K": { + "key": "CZ_K", + "label": "K", + } + "KC_L": { + "key": "CZ_L", + "label": "L", + } + "KC_SCLN": { + "key": "CZ_URNG", + "label": "ů", + } + "KC_QUOT": { + "key": "CZ_SECT", + "label": "§", + } + "KC_NUHS": { + "key": "CZ_DIAE", + "label": "¨ (dead)", + } + "KC_NUBS": { + "key": "CZ_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "CZ_Y", + "label": "Y", + } + "KC_X": { + "key": "CZ_X", + "label": "X", + } + "KC_C": { + "key": "CZ_C", + "label": "C", + } + "KC_V": { + "key": "CZ_V", + "label": "V", + } + "KC_B": { + "key": "CZ_B", + "label": "B", + } + "KC_N": { + "key": "CZ_N", + "label": "N", + } + "KC_M": { + "key": "CZ_M", + "label": "M", + } + "KC_COMM": { + "key": "CZ_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CZ_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CZ_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ " │ ! │ ' │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ │ ? │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(CZ_SCLN)": { + "key": "CZ_RNGA", + "label": "° (dead)", + } + "S(CZ_PLUS)": { + "key": "CZ_1", + "label": "1", + } + "S(CZ_ECAR)": { + "key": "CZ_2", + "label": "2", + } + "S(CZ_SCAR)": { + "key": "CZ_3", + "label": "3", + } + "S(CZ_CCAR)": { + "key": "CZ_4", + "label": "4", + } + "S(CZ_RCAR)": { + "key": "CZ_5", + "label": "5", + } + "S(CZ_ZCAR)": { + "key": "CZ_6", + "label": "6", + } + "S(CZ_YACU)": { + "key": "CZ_7", + "label": "7", + } + "S(CZ_AACU)": { + "key": "CZ_8", + "label": "8", + } + "S(CZ_IACU)": { + "key": "CZ_9", + "label": "9", + } + "S(CZ_EACU)": { + "key": "CZ_0", + "label": "0", + } + "S(CZ_EQL)": { + "key": "CZ_PERC", + "label": "%", + } + "S(CZ_ACUT)": { + "key": "CZ_CARN", + "label": "ˇ (dead)", + } + "S(CZ_UACU)": { + "key": "CZ_SLSH", + "label": "/", + } + "S(CZ_RPRN)": { + "key": "CZ_LPRN", + "label": "(", + } + "S(CZ_URNG)": { + "key": "CZ_DQUO", + "label": "\"", + } + "S(CZ_SECT)": { + "key": "CZ_EXLM", + "label": "!", + } + "S(CZ_DIAE)": { + "key": "CZ_QUOT", + "label": "'", + } + "S(CZ_BSLS)": { + "key": "CZ_PIPE", + "label": "|", + } + "S(CZ_COMM)": { + "key": "CZ_QUES", + "label": "?", + } + "S(CZ_DOT)": { + "key": "CZ_COLN", + "label": ":", + } + "S(CZ_MINS)": { + "key": "CZ_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ~ │ │ ^ │ ˘ │ │ ˛ │ ` │ ˙ │ │ ˝ │ │ ¸ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ # │ & │ @ │ { │ } │ │ < │ > │ * │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(CZ_PLUS)": { + "key": "CZ_TILD", + "label": "~", + } + "ALGR(CZ_SCAR)": { + "key": "CZ_CIRC", + "label": "^ (dead)", + } + "ALGR(CZ_CCAR)": { + "key": "CZ_BREV", + "label": "˘ (dead)", + } + "ALGR(CZ_ZCAR)": { + "key": "CZ_OGON", + "label": "˛ (dead)", + } + "ALGR(CZ_YACU)": { + "key": "CZ_GRV", + "label": "` (dead)", + } + "ALGR(CZ_AACU)": { + "key": "CZ_DOTA", + "label": "˙ (dead)", + } + "ALGR(CZ_EACU)": { + "key": "CZ_DACU", + "label": "˝ (dead)", + } + "ALGR(CZ_ACUT)": { + "key": "CZ_CEDL", + "label": "¸ (dead)", + } + "ALGR(CZ_E)": { + "key": "CZ_EURO", + "label": "€", + } + "ALGR(CZ_UACU)": { + "key": "CZ_DIV", + "label": "÷", + } + "ALGR(CZ_RPRN)": { + "key": "CZ_MUL", + "label": "×", + } + "ALGR(CZ_S)": { + "key": "CZ_LDST", + "label": "đ", + } + "ALGR(CZ_D)": { + "key": "CZ_CDST", + "label": "Đ", + } + "ALGR(CZ_F)": { + "key": "CZ_LBRC", + "label": "[", + } + "ALGR(CZ_G)": { + "key": "CZ_RBRC", + "label": "]", + } + "ALGR(CZ_K)": { + "key": "CZ_LLST", + "label": "ł", + } + "ALGR(CZ_L)": { + "key": "CZ_CLST", + "label": "Ł", + } + "ALGR(CZ_URNG)": { + "key": "CZ_DLR", + "label": "$", + } + "ALGR(CZ_SECT)": { + "key": "CZ_SS", + "label": "ß", + } + "ALGR(CZ_DIAE)": { + "key": "CZ_CURR", + "label": "¤", + } + "ALGR(CZ_X)": { + "key": "CZ_HASH", + "label": "#", + } + "ALGR(CZ_C)": { + "key": "CZ_AMPR", + "label": "&", + } + "ALGR(CZ_V)": { + "key": "CZ_AT", + "label": "@", + } + "ALGR(CZ_B)": { + "key": "CZ_LCBR", + "label": "{", + } + "ALGR(CZ_N)": { + "key": "CZ_RCBR", + "label": "}", + } + "ALGR(CZ_COMM)": { + "key": "CZ_LABK", + "label": "<", + } + "ALGR(CZ_DOT)": { + "key": "CZ_RABK", + "label": ">", + } + "ALGR(CZ_MINS)": { + "key": "CZ_ASTR", + "label": "*", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_danish_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_danish_0.0.1.hjson new file mode 100644 index 0000000000..fffcd9f9ad --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_danish_0.0.1.hjson @@ -0,0 +1,359 @@ +{ + "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": "DK_HALF", + "label": "½", + } + "KC_1": { + "key": "DK_1", + "label": "1", + } + "KC_2": { + "key": "DK_2", + "label": "2", + } + "KC_3": { + "key": "DK_3", + "label": "3", + } + "KC_4": { + "key": "DK_4", + "label": "4", + } + "KC_5": { + "key": "DK_5", + "label": "5", + } + "KC_6": { + "key": "DK_6", + "label": "6", + } + "KC_7": { + "key": "DK_7", + "label": "7", + } + "KC_8": { + "key": "DK_8", + "label": "8", + } + "KC_9": { + "key": "DK_9", + "label": "9", + } + "KC_0": { + "key": "DK_0", + "label": "0", + } + "KC_MINS": { + "key": "DK_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "DK_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "DK_Q", + "label": "Q", + } + "KC_W": { + "key": "DK_W", + "label": "W", + } + "KC_E": { + "key": "DK_E", + "label": "E", + } + "KC_R": { + "key": "DK_R", + "label": "R", + } + "KC_T": { + "key": "DK_T", + "label": "T", + } + "KC_Y": { + "key": "DK_Y", + "label": "Y", + } + "KC_U": { + "key": "DK_U", + "label": "U", + } + "KC_I": { + "key": "DK_I", + "label": "I", + } + "KC_O": { + "key": "DK_O", + "label": "O", + } + "KC_P": { + "key": "DK_P", + "label": "P", + } + "KC_LBRC": { + "key": "DK_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "DK_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "DK_A", + "label": "A", + } + "KC_S": { + "key": "DK_S", + "label": "S", + } + "KC_D": { + "key": "DK_D", + "label": "D", + } + "KC_F": { + "key": "DK_F", + "label": "F", + } + "KC_G": { + "key": "DK_G", + "label": "G", + } + "KC_H": { + "key": "DK_H", + "label": "H", + } + "KC_J": { + "key": "DK_J", + "label": "J", + } + "KC_K": { + "key": "DK_K", + "label": "K", + } + "KC_L": { + "key": "DK_L", + "label": "L", + } + "KC_SCLN": { + "key": "DK_AE", + "label": "Æ", + } + "KC_QUOT": { + "key": "DK_OSTR", + "label": "Ø", + } + "KC_NUHS": { + "key": "DK_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "DK_LABK", + "label": "<", + } + "KC_Z": { + "key": "DK_Z", + "label": "Z", + } + "KC_X": { + "key": "DK_X", + "label": "X", + } + "KC_C": { + "key": "DK_C", + "label": "C", + } + "KC_V": { + "key": "DK_V", + "label": "V", + } + "KC_B": { + "key": "DK_B", + "label": "B", + } + "KC_N": { + "key": "DK_N", + "label": "N", + } + "KC_M": { + "key": "DK_M", + "label": "M", + } + "KC_COMM": { + "key": "DK_COMM", + "label": ",", + } + "KC_DOT": { + "key": "DK_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "DK_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ § │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(DK_HALF)": { + "key": "DK_SECT", + "label": "§", + } + "S(DK_1)": { + "key": "DK_EXLM", + "label": "!", + } + "S(DK_2)": { + "key": "DK_DQUO", + "label": "\"", + } + "S(DK_3)": { + "key": "DK_HASH", + "label": "#", + } + "S(DK_4)": { + "key": "DK_CURR", + "label": "¤", + } + "S(DK_5)": { + "key": "DK_PERC", + "label": "%", + } + "S(DK_6)": { + "key": "DK_AMPR", + "label": "&", + } + "S(DK_7)": { + "key": "DK_SLSH", + "label": "/", + } + "S(DK_8)": { + "key": "DK_LPRN", + "label": "(", + } + "S(DK_9)": { + "key": "DK_RPRN", + "label": ")", + } + "S(DK_0)": { + "key": "DK_EQL", + "label": "=", + } + "S(DK_PLUS)": { + "key": "DK_QUES", + "label": "?", + } + "S(DK_ACUT)": { + "key": "DK_GRV", + "label": "` (dead)", + } + "S(DK_DIAE)": { + "key": "DK_CIRC", + "label": "^ (dead)", + } + "S(DK_QUOT)": { + "key": "DK_ASTR", + "label": "*", + } + "S(DK_LABK)": { + "key": "DK_RABK", + "label": ">", + } + "S(DK_COMM)": { + "key": "DK_SCLN", + "label": ";", + } + "S(DK_DOT)": { + "key": "DK_COLN", + "label": ":", + } + "S(DK_MINS)": { + "key": "DK_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ │ | │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ \ │ │ │ │ │ │ │ µ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(DK_2)": { + "key": "DK_AT", + "label": "@", + } + "ALGR(DK_3)": { + "key": "DK_PND", + "label": "£", + } + "ALGR(DK_4)": { + "key": "DK_DLR", + "label": "$", + } + "ALGR(DK_5)": { + "key": "DK_EURO", + "label": "€", + } + "ALGR(DK_7)": { + "key": "DK_LCBR", + "label": "{", + } + "ALGR(DK_8)": { + "key": "DK_LBRC", + "label": "[", + } + "ALGR(DK_9)": { + "key": "DK_RBRC", + "label": "]", + } + "ALGR(DK_0)": { + "key": "DK_RCBR", + "label": "}", + } + "ALGR(DK_ACUT)": { + "key": "DK_PIPE", + "label": "|", + } + "ALGR(DK_DIAE)": { + "key": "DK_TILD", + "label": "~ (dead)", + } + "ALGR(DK_LABK)": { + "key": "DK_BSLS", + "label": "\\", + } + "ALGR(DK_M)": { + "key": "DK_MICR", + "label": "µ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_dvorak_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_dvorak_0.0.1.hjson new file mode 100644 index 0000000000..534f99c8e6 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_dvorak_0.0.1.hjson @@ -0,0 +1,302 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ [ │ ] │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ ; │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "DV_GRV", + "label": "`", + } + "KC_1": { + "key": "DV_1", + "label": "1", + } + "KC_2": { + "key": "DV_2", + "label": "2", + } + "KC_3": { + "key": "DV_3", + "label": "3", + } + "KC_4": { + "key": "DV_4", + "label": "4", + } + "KC_5": { + "key": "DV_5", + "label": "5", + } + "KC_6": { + "key": "DV_6", + "label": "6", + } + "KC_7": { + "key": "DV_7", + "label": "7", + } + "KC_8": { + "key": "DV_8", + "label": "8", + } + "KC_9": { + "key": "DV_9", + "label": "9", + } + "KC_0": { + "key": "DV_0", + "label": "0", + } + "KC_MINS": { + "key": "DV_LBRC", + "label": "[", + } + "KC_EQL": { + "key": "DV_RBRC", + "label": "]", + } + "KC_Q": { + "key": "DV_QUOT", + "label": "'", + } + "KC_W": { + "key": "DV_COMM", + "label": ",", + } + "KC_E": { + "key": "DV_DOT", + "label": ".", + } + "KC_R": { + "key": "DV_P", + "label": "P", + } + "KC_T": { + "key": "DV_Y", + "label": "Y", + } + "KC_Y": { + "key": "DV_F", + "label": "F", + } + "KC_U": { + "key": "DV_G", + "label": "G", + } + "KC_I": { + "key": "DV_C", + "label": "C", + } + "KC_O": { + "key": "DV_R", + "label": "R", + } + "KC_P": { + "key": "DV_L", + "label": "L", + } + "KC_LBRC": { + "key": "DV_SLSH", + "label": "/", + } + "KC_RBRC": { + "key": "DV_EQL", + "label": "=", + } + "KC_BSLS": { + "key": "DV_BSLS", + "label": "\\", + } + "KC_A": { + "key": "DV_A", + "label": "A", + } + "KC_S": { + "key": "DV_O", + "label": "O", + } + "KC_D": { + "key": "DV_E", + "label": "E", + } + "KC_F": { + "key": "DV_U", + "label": "U", + } + "KC_G": { + "key": "DV_I", + "label": "I", + } + "KC_H": { + "key": "DV_D", + "label": "D", + } + "KC_J": { + "key": "DV_H", + "label": "H", + } + "KC_K": { + "key": "DV_T", + "label": "T", + } + "KC_L": { + "key": "DV_N", + "label": "N", + } + "KC_SCLN": { + "key": "DV_S", + "label": "S", + } + "KC_QUOT": { + "key": "DV_MINS", + "label": "-", + } + "KC_Z": { + "key": "DV_SCLN", + "label": ";", + } + "KC_X": { + "key": "DV_Q", + "label": "Q", + } + "KC_C": { + "key": "DV_J", + "label": "J", + } + "KC_V": { + "key": "DV_K", + "label": "K", + } + "KC_B": { + "key": "DV_X", + "label": "X", + } + "KC_N": { + "key": "DV_B", + "label": "B", + } + "KC_M": { + "key": "DV_M", + "label": "M", + } + "KC_COMM": { + "key": "DV_W", + "label": "W", + } + "KC_DOT": { + "key": "DV_V", + "label": "V", + } + "KC_SLSH": { + "key": "DV_Z", + "label": "Z", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ { │ } │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ " │ < │ > │ │ │ │ │ │ │ │ ? │ + │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ _ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ : │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(DV_GRV)": { + "key": "DV_TILD", + "label": "~", + } + "S(DV_1)": { + "key": "DV_EXLM", + "label": "!", + } + "S(DV_2)": { + "key": "DV_AT", + "label": "@", + } + "S(DV_3)": { + "key": "DV_HASH", + "label": "#", + } + "S(DV_4)": { + "key": "DV_DLR", + "label": "$", + } + "S(DV_5)": { + "key": "DV_PERC", + "label": "%", + } + "S(DV_6)": { + "key": "DV_CIRC", + "label": "^", + } + "S(DV_7)": { + "key": "DV_AMPR", + "label": "&", + } + "S(DV_8)": { + "key": "DV_ASTR", + "label": "*", + } + "S(DV_9)": { + "key": "DV_LPRN", + "label": "(", + } + "S(DV_0)": { + "key": "DV_RPRN", + "label": ")", + } + "S(DV_LBRC)": { + "key": "DV_LCBR", + "label": "{", + } + "S(DV_RBRC)": { + "key": "DV_RCBR", + "label": "}", + } + "S(DV_QUOT)": { + "key": "DV_DQUO", + "label": "\"", + } + "S(DV_COMM)": { + "key": "DV_LABK", + "label": "<", + } + "S(DV_DOT)": { + "key": "DV_RABK", + "label": ">", + } + "S(DV_SLSH)": { + "key": "DV_QUES", + "label": "?", + } + "S(DV_EQL)": { + "key": "DV_PLUS", + "label": "+", + } + "S(DV_BSLS)": { + "key": "DV_PIPE", + "label": "|", + } + "S(DV_MINS)": { + "key": "DV_UNDS", + "label": "_", + } + "S(DV_SCLN)": { + "key": "DV_COLN", + "label": ":", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson new file mode 100644 index 0000000000..70c0b3c0aa --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson @@ -0,0 +1,317 @@ +{ + "aliases": { +/* Dvorak for the French language + * Version: 2 + * + * The layout is designed by Francis Leboutte + * + * Source: https://algo.be/ergo/dvorak-fr.html + */ +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ « │ » │ / │ - │ è │ \ │ ^ │ ( │ ` │ ) │ _ │ [ │ ] │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ : │ ' │ é │ G │ . │ H │ V │ C │ M │ K │ Z │ ¨ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ O │ A │ U │ E │ B │ F │ S │ T │ N │ D │ W │ ~ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ à │ ; │ Q │ , │ I │ Y │ X │ R │ L │ P │ J │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "DV_LDAQ", + "label": "«", + } + "KC_1": { + "key": "DV_RDAQ", + "label": "»", + } + "KC_2": { + "key": "DV_SLSH", + "label": "/", + } + "KC_3": { + "key": "DV_MINS", + "label": "-", + } + "KC_4": { + "key": "DV_EGRV", + "label": "è", + } + "KC_5": { + "key": "DV_BSLS", + "label": "\\", + } + "KC_6": { + "key": "DV_CIRC", + "label": "^ (dead)", + } + "KC_7": { + "key": "DV_LPRN", + "label": "(", + } + "KC_8": { + "key": "DV_GRV", + "label": "` (dead)", + } + "KC_9": { + "key": "DV_RPRN", + "label": ")", + } + "KC_0": { + "key": "DV_UNDS", + "label": "_", + } + "KC_MINS": { + "key": "DV_LBRC", + "label": "[", + } + "KC_EQL": { + "key": "DV_RBRC", + "label": "]", + } + "KC_Q": { + "key": "DV_COLN", + "label": ":", + } + "KC_W": { + "key": "DV_QUOT", + "label": "'", + } + "KC_E": { + "key": "DV_EACU", + "label": "é", + } + "KC_R": { + "key": "DV_G", + "label": "G", + } + "KC_T": { + "key": "DV_DOT", + "label": ".", + } + "KC_Y": { + "key": "DV_H", + "label": "H", + } + "KC_U": { + "key": "DV_V", + "label": "V", + } + "KC_I": { + "key": "DV_C", + "label": "C", + } + "KC_O": { + "key": "DV_M", + "label": "M", + } + "KC_P": { + "key": "DV_K", + "label": "K", + } + "KC_LBRC": { + "key": "DV_Z", + "label": "Z", + } + "KC_RBRC": { + "key": "DV_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "DV_O", + "label": "O", + } + "KC_S": { + "key": "DV_A", + "label": "A", + } + "KC_D": { + "key": "DV_U", + "label": "U", + } + "KC_F": { + "key": "DV_E", + "label": "E", + } + "KC_G": { + "key": "DV_B", + "label": "B", + } + "KC_H": { + "key": "DV_F", + "label": "F", + } + "KC_J": { + "key": "DV_S", + "label": "S", + } + "KC_K": { + "key": "DV_T", + "label": "T", + } + "KC_L": { + "key": "DV_N", + "label": "N", + } + "KC_SCLN": { + "key": "DV_D", + "label": "D", + } + "KC_QUOT": { + "key": "DV_W", + "label": "W", + } + "KC_NUHS": { + "key": "DV_TILD", + "label": "~ (dead)", + } + "KC_NUBS": { + "key": "DV_AGRV", + "label": "à", + } + "KC_Z": { + "key": "DV_SCLN", + "label": ";", + } + "KC_X": { + "key": "DV_Q", + "label": "Q", + } + "KC_C": { + "key": "DV_COMM", + "label": ",", + } + "KC_V": { + "key": "DV_I", + "label": "I", + } + "KC_B": { + "key": "DV_Y", + "label": "Y", + } + "KC_N": { + "key": "DV_X", + "label": "X", + } + "KC_M": { + "key": "DV_R", + "label": "R", + } + "KC_COMM": { + "key": "DV_L", + "label": "L", + } + "KC_DOT": { + "key": "DV_P", + "label": "P", + } + "KC_SLSH": { + "key": "DV_J", + "label": "J", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ * │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 0 │ 0 │ + │ % │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ ? │ < │ > │ │ ! │ │ │ │ │ │ │ = │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ ç │ | │ │ @ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(DV_LDAQ)": { + "key": "DV_ASTR", + "label": "*", + } + "S(DV_RDAQ)": { + "key": "DV_1", + "label": "1", + } + "S(DV_SLSH)": { + "key": "DV_2", + "label": "2", + } + "S(DV_MINS)": { + "key": "DV_3", + "label": "3", + } + "S(DV_EGRV)": { + "key": "DV_4", + "label": "4", + } + "S(DV_BSLS)": { + "key": "DV_5", + "label": "5", + } + "S(DV_CIRC)": { + "key": "DV_6", + "label": "6", + } + "S(DV_LPRN)": { + "key": "DV_7", + "label": "7", + } + "S(DV_GRV)": { + "key": "DV_8", + "label": "8", + } + "S(DV_RPRN)": { + "key": "DV_9", + "label": "9", + } + "S(DV_UNDS)": { + "key": "DV_0", + "label": "0", + } + "S(DV_LBRC)": { + "key": "DV_PLUS", + "label": "+", + } + "S(DV_RBRC)": { + "key": "DV_PERC", + "label": "%", + } + "S(DV_COLN)": { + "key": "DV_QUES", + "label": "?", + } + "S(DV_QUOT)": { + "key": "DV_LABK", + "label": "<", + } + "S(DV_EACU)": { + "key": "DV_RABK", + "label": ">", + } + "S(DV_DOT)": { + "key": "DV_EXLM", + "label": "!", + } + "S(DV_DIAE)": { + "key": "DV_EQL", + "label": "=", + } + "S(DV_TILD)": { + "key": "DV_HASH", + "label": "#", + } + "S(DV_AGRV)": { + "key": "DV_CCED", + "label": "ç", + } + "S(DV_SCLN)": { + "key": "DV_PIPE", + "label": "|", + } + "S(DV_COMM)": { + "key": "DV_AT", + "label": "@", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_dvorak_programmer_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_dvorak_programmer_0.0.1.hjson new file mode 100644 index 0000000000..8a70dae7ef --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_dvorak_programmer_0.0.1.hjson @@ -0,0 +1,302 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ $ │ & │ [ │ { │ } │ ( │ = │ * │ ) │ + │ ] │ ! │ # │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ ; │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ @ │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ ' │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "DP_DLR", + "label": "$", + } + "KC_1": { + "key": "DP_AMPR", + "label": "&", + } + "KC_2": { + "key": "DP_LBRC", + "label": "[", + } + "KC_3": { + "key": "DP_LCBR", + "label": "{", + } + "KC_4": { + "key": "DP_RCBR", + "label": "}", + } + "KC_5": { + "key": "DP_LPRN", + "label": "(", + } + "KC_6": { + "key": "DP_EQL", + "label": "=", + } + "KC_7": { + "key": "DP_ASTR", + "label": "*", + } + "KC_8": { + "key": "DP_RPRN", + "label": ")", + } + "KC_9": { + "key": "DP_PLUS", + "label": "+", + } + "KC_0": { + "key": "DP_RBRC", + "label": "]", + } + "KC_MINS": { + "key": "DP_EXLM", + "label": "!", + } + "KC_EQL": { + "key": "DP_HASH", + "label": "#", + } + "KC_Q": { + "key": "DP_SCLN", + "label": ";", + } + "KC_W": { + "key": "DP_COMM", + "label": ",", + } + "KC_E": { + "key": "DP_DOT", + "label": ".", + } + "KC_R": { + "key": "DP_P", + "label": "P", + } + "KC_T": { + "key": "DP_Y", + "label": "Y", + } + "KC_Y": { + "key": "DP_F", + "label": "F", + } + "KC_U": { + "key": "DP_G", + "label": "G", + } + "KC_I": { + "key": "DP_C", + "label": "C", + } + "KC_O": { + "key": "DP_R", + "label": "R", + } + "KC_P": { + "key": "DP_L", + "label": "L", + } + "KC_LBRC": { + "key": "DP_SLSH", + "label": "/", + } + "KC_RBRC": { + "key": "DP_AT", + "label": "@", + } + "KC_BSLS": { + "key": "DP_BSLS", + "label": "\\", + } + "KC_A": { + "key": "DP_A", + "label": "A", + } + "KC_S": { + "key": "DP_O", + "label": "O", + } + "KC_D": { + "key": "DP_E", + "label": "E", + } + "KC_F": { + "key": "DP_U", + "label": "U", + } + "KC_G": { + "key": "DP_I", + "label": "I", + } + "KC_H": { + "key": "DP_D", + "label": "D", + } + "KC_J": { + "key": "DP_H", + "label": "H", + } + "KC_K": { + "key": "DP_T", + "label": "T", + } + "KC_L": { + "key": "DP_N", + "label": "N", + } + "KC_SCLN": { + "key": "DP_S", + "label": "S", + } + "KC_QUOT": { + "key": "DP_MINS", + "label": "-", + } + "KC_Z": { + "key": "DP_QUOT", + "label": "'", + } + "KC_X": { + "key": "DP_Q", + "label": "Q", + } + "KC_C": { + "key": "DP_J", + "label": "J", + } + "KC_V": { + "key": "DP_K", + "label": "K", + } + "KC_B": { + "key": "DP_X", + "label": "X", + } + "KC_N": { + "key": "DP_B", + "label": "B", + } + "KC_M": { + "key": "DP_M", + "label": "M", + } + "KC_COMM": { + "key": "DP_W", + "label": "W", + } + "KC_DOT": { + "key": "DP_V", + "label": "V", + } + "KC_SLSH": { + "key": "DP_Z", + "label": "Z", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ % │ 7 │ 5 │ 3 │ 1 │ 9 │ 0 │ 2 │ 4 │ 6 │ 8 │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ : │ < │ > │ │ │ │ │ │ │ │ ? │ ^ │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ _ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ " │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(DP_DLR)": { + "key": "DP_TILD", + "label": "~", + } + "S(DP_AMPR)": { + "key": "DP_PERC", + "label": "%", + } + "S(DP_LBRC)": { + "key": "DP_7", + "label": "7", + } + "S(DP_LCBR)": { + "key": "DP_5", + "label": "5", + } + "S(DP_RCBR)": { + "key": "DP_3", + "label": "3", + } + "S(DP_LPRN)": { + "key": "DP_1", + "label": "1", + } + "S(DP_EQL)": { + "key": "DP_9", + "label": "9", + } + "S(DP_ASTR)": { + "key": "DP_0", + "label": "0", + } + "S(DP_RPRN)": { + "key": "DP_2", + "label": "2", + } + "S(DP_PLUS)": { + "key": "DP_4", + "label": "4", + } + "S(DP_RBRC)": { + "key": "DP_6", + "label": "6", + } + "S(DP_EXLM)": { + "key": "DP_8", + "label": "8", + } + "S(DP_HASH)": { + "key": "DP_GRV", + "label": "`", + } + "S(DP_SCLN)": { + "key": "DP_COLN", + "label": ":", + } + "S(DP_COMM)": { + "key": "DP_LABK", + "label": "<", + } + "S(DP_DOT)": { + "key": "DP_RABK", + "label": ">", + } + "S(DP_SLSH)": { + "key": "DP_QUES", + "label": "?", + } + "S(DP_AT)": { + "key": "DP_CIRC", + "label": "^", + } + "S(DP_BSLS)": { + "key": "DP_PIPE", + "label": "|", + } + "S(DP_MINS)": { + "key": "DP_UNDS", + "label": "_", + } + "S(DP_QUOT)": { + "key": "DP_DQUO", + "label": "\"", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_estonian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_estonian_0.0.1.hjson new file mode 100644 index 0000000000..bbf7512581 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_estonian_0.0.1.hjson @@ -0,0 +1,367 @@ +{ + "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": "EE_CARN", + "label": "ˇ (dead)", + } + "KC_1": { + "key": "EE_1", + "label": "1", + } + "KC_2": { + "key": "EE_2", + "label": "2", + } + "KC_3": { + "key": "EE_3", + "label": "3", + } + "KC_4": { + "key": "EE_4", + "label": "4", + } + "KC_5": { + "key": "EE_5", + "label": "5", + } + "KC_6": { + "key": "EE_6", + "label": "6", + } + "KC_7": { + "key": "EE_7", + "label": "7", + } + "KC_8": { + "key": "EE_8", + "label": "8", + } + "KC_9": { + "key": "EE_9", + "label": "9", + } + "KC_0": { + "key": "EE_0", + "label": "0", + } + "KC_MINS": { + "key": "EE_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "EE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "EE_Q", + "label": "Q", + } + "KC_W": { + "key": "EE_W", + "label": "W", + } + "KC_E": { + "key": "EE_E", + "label": "E", + } + "KC_R": { + "key": "EE_R", + "label": "R", + } + "KC_T": { + "key": "EE_T", + "label": "T", + } + "KC_Y": { + "key": "EE_Y", + "label": "Y", + } + "KC_U": { + "key": "EE_U", + "label": "U", + } + "KC_I": { + "key": "EE_I", + "label": "I", + } + "KC_O": { + "key": "EE_O", + "label": "O", + } + "KC_P": { + "key": "EE_P", + "label": "P", + } + "KC_LBRC": { + "key": "EE_UDIA", + "label": "Ü", + } + "KC_RBRC": { + "key": "EE_OTIL", + "label": "Õ", + } + "KC_A": { + "key": "EE_A", + "label": "A", + } + "KC_S": { + "key": "EE_S", + "label": "S", + } + "KC_D": { + "key": "EE_D", + "label": "D", + } + "KC_F": { + "key": "EE_F", + "label": "F", + } + "KC_G": { + "key": "EE_G", + "label": "G", + } + "KC_H": { + "key": "EE_H", + "label": "H", + } + "KC_J": { + "key": "EE_J", + "label": "J", + } + "KC_K": { + "key": "EE_K", + "label": "K", + } + "KC_L": { + "key": "EE_L", + "label": "L", + } + "KC_SCLN": { + "key": "EE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "EE_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "EE_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "EE_LABK", + "label": "<", + } + "KC_Z": { + "key": "EE_Z", + "label": "Z", + } + "KC_X": { + "key": "EE_X", + "label": "X", + } + "KC_C": { + "key": "EE_C", + "label": "C", + } + "KC_V": { + "key": "EE_V", + "label": "V", + } + "KC_B": { + "key": "EE_B", + "label": "B", + } + "KC_N": { + "key": "EE_N", + "label": "N", + } + "KC_M": { + "key": "EE_M", + "label": "M", + } + "KC_COMM": { + "key": "EE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "EE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "EE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(EE_CARN)": { + "key": "EE_TILD", + "label": "~ (dead)", + } + "S(EE_1)": { + "key": "EE_EXLM", + "label": "!", + } + "S(EE_2)": { + "key": "EE_DQUO", + "label": "\"", + } + "S(EE_3)": { + "key": "EE_HASH", + "label": "#", + } + "S(EE_4)": { + "key": "EE_CURR", + "label": "¤", + } + "S(EE_5)": { + "key": "EE_PERC", + "label": "%", + } + "S(EE_6)": { + "key": "EE_AMPR", + "label": "&", + } + "S(EE_7)": { + "key": "EE_SLSH", + "label": "/", + } + "S(EE_8)": { + "key": "EE_LPRN", + "label": "(", + } + "S(EE_9)": { + "key": "EE_RPRN", + "label": ")", + } + "S(EE_0)": { + "key": "EE_EQL", + "label": "=", + } + "S(EE_PLUS)": { + "key": "EE_QUES", + "label": "?", + } + "S(EE_ACUT)": { + "key": "EE_GRV", + "label": "` (dead)", + } + "S(EE_QUOT)": { + "key": "EE_ASTR", + "label": "*", + } + "S(EE_LABK)": { + "key": "EE_RABK", + "label": ">", + } + "S(EE_COMM)": { + "key": "EE_SCLN", + "label": ";", + } + "S(EE_DOT)": { + "key": "EE_COLN", + "label": ":", + } + "S(EE_MINS)": { + "key": "EE_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ \ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ § │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ š │ │ │ │ │ │ │ │ │ ^ │ ½ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ ž │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(EE_2)": { + "key": "EE_AT", + "label": "@", + } + "ALGR(EE_3)": { + "key": "EE_PND", + "label": "£", + } + "ALGR(EE_4)": { + "key": "EE_DLR", + "label": "$", + } + "ALGR(EE_5)": { + "key": "EE_EURO", + "label": "€", + } + "ALGR(EE_7)": { + "key": "EE_LCBR", + "label": "{", + } + "ALGR(EE_8)": { + "key": "EE_LBRC", + "label": "[", + } + "ALGR(EE_9)": { + "key": "EE_RBRC", + "label": "]", + } + "ALGR(EE_0)": { + "key": "EE_RCBR", + "label": "}", + } + "ALGR(EE_PLUS)": { + "key": "EE_BSLS", + "label": "\\", + } + "ALGR(EE_OTIL)": { + "key": "EE_SECT", + "label": "§", + } + "ALGR(EE_S)": { + "key": "EE_SCAR", + "label": "š", + } + "ALGR(EE_ADIA)": { + "key": "EE_CIRC", + "label": "^ (dead)", + } + "ALGR(EE_QUOT)": { + "key": "EE_HALF", + "label": "½", + } + "ALGR(EE_LABK)": { + "key": "EE_PIPE", + "label": "|", + } + "ALGR(EE_Z)": { + "key": "EE_ZCAR", + "label": "ž", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_finnish_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_finnish_0.0.1.hjson new file mode 100644 index 0000000000..b284192962 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_finnish_0.0.1.hjson @@ -0,0 +1,359 @@ +{ + "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": "FI_SECT", + "label": "§", + } + "KC_1": { + "key": "FI_1", + "label": "1", + } + "KC_2": { + "key": "FI_2", + "label": "2", + } + "KC_3": { + "key": "FI_3", + "label": "3", + } + "KC_4": { + "key": "FI_4", + "label": "4", + } + "KC_5": { + "key": "FI_5", + "label": "5", + } + "KC_6": { + "key": "FI_6", + "label": "6", + } + "KC_7": { + "key": "FI_7", + "label": "7", + } + "KC_8": { + "key": "FI_8", + "label": "8", + } + "KC_9": { + "key": "FI_9", + "label": "9", + } + "KC_0": { + "key": "FI_0", + "label": "0", + } + "KC_MINS": { + "key": "FI_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "FI_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "FI_Q", + "label": "Q", + } + "KC_W": { + "key": "FI_W", + "label": "W", + } + "KC_E": { + "key": "FI_E", + "label": "E", + } + "KC_R": { + "key": "FI_R", + "label": "R", + } + "KC_T": { + "key": "FI_T", + "label": "T", + } + "KC_Y": { + "key": "FI_Y", + "label": "Y", + } + "KC_U": { + "key": "FI_U", + "label": "U", + } + "KC_I": { + "key": "FI_I", + "label": "I", + } + "KC_O": { + "key": "FI_O", + "label": "O", + } + "KC_P": { + "key": "FI_P", + "label": "P", + } + "KC_LBRC": { + "key": "FI_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "FI_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "FI_A", + "label": "A", + } + "KC_S": { + "key": "FI_S", + "label": "S", + } + "KC_D": { + "key": "FI_D", + "label": "D", + } + "KC_F": { + "key": "FI_F", + "label": "F", + } + "KC_G": { + "key": "FI_G", + "label": "G", + } + "KC_H": { + "key": "FI_H", + "label": "H", + } + "KC_J": { + "key": "FI_J", + "label": "J", + } + "KC_K": { + "key": "FI_K", + "label": "K", + } + "KC_L": { + "key": "FI_L", + "label": "L", + } + "KC_SCLN": { + "key": "FI_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "FI_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "FI_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "FI_LABK", + "label": "<", + } + "KC_Z": { + "key": "FI_Z", + "label": "Z", + } + "KC_X": { + "key": "FI_X", + "label": "X", + } + "KC_C": { + "key": "FI_C", + "label": "C", + } + "KC_V": { + "key": "FI_V", + "label": "V", + } + "KC_B": { + "key": "FI_B", + "label": "B", + } + "KC_N": { + "key": "FI_N", + "label": "N", + } + "KC_M": { + "key": "FI_M", + "label": "M", + } + "KC_COMM": { + "key": "FI_COMM", + "label": ",", + } + "KC_DOT": { + "key": "FI_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "FI_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ½ │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(FI_SECT)": { + "key": "FI_HALF", + "label": "½", + } + "S(FI_1)": { + "key": "FI_EXLM", + "label": "!", + } + "S(FI_2)": { + "key": "FI_DQUO", + "label": "\"", + } + "S(FI_3)": { + "key": "FI_HASH", + "label": "#", + } + "S(FI_4)": { + "key": "FI_CURR", + "label": "¤", + } + "S(FI_5)": { + "key": "FI_PERC", + "label": "%", + } + "S(FI_6)": { + "key": "FI_AMPR", + "label": "&", + } + "S(FI_7)": { + "key": "FI_SLSH", + "label": "/", + } + "S(FI_8)": { + "key": "FI_LPRN", + "label": "(", + } + "S(FI_9)": { + "key": "FI_RPRN", + "label": ")", + } + "S(FI_0)": { + "key": "FI_EQL", + "label": "=", + } + "S(FI_PLUS)": { + "key": "FI_QUES", + "label": "?", + } + "S(FI_ACUT)": { + "key": "FI_GRV", + "label": "` (dead)", + } + "S(FI_DIAE)": { + "key": "FI_CIRC", + "label": "^ (dead)", + } + "S(FI_QUOT)": { + "key": "FI_ASTR", + "label": "*", + } + "S(FI_LABK)": { + "key": "FI_RABK", + "label": ">", + } + "S(FI_COMM)": { + "key": "FI_SCLN", + "label": ";", + } + "S(FI_DOT)": { + "key": "FI_COLN", + "label": ":", + } + "S(FI_MINS)": { + "key": "FI_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ \ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(FI_2)": { + "key": "FI_AT", + "label": "@", + } + "ALGR(FI_3)": { + "key": "FI_PND", + "label": "£", + } + "ALGR(FI_4)": { + "key": "FI_DLR", + "label": "$", + } + "ALGR(FI_5)": { + "key": "FI_EURO", + "label": "€", + } + "ALGR(FI_7)": { + "key": "FI_LCBR", + "label": "{", + } + "ALGR(FI_8)": { + "key": "FI_LBRC", + "label": "[", + } + "ALGR(FI_9)": { + "key": "FI_RBRC", + "label": "]", + } + "ALGR(FI_0)": { + "key": "FI_RCBR", + "label": "}", + } + "ALGR(FI_PLUS)": { + "key": "FI_BSLS", + "label": "\\", + } + "ALGR(FI_DIAE)": { + "key": "FI_TILD", + "label": "~ (dead)", + } + "ALGR(FI_LABK)": { + "key": "FI_PIPE", + "label": "|", + } + "ALGR(FI_M)": { + "key": "FI_MICR", + "label": "µ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_french_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_french_0.0.1.hjson new file mode 100644 index 0000000000..8ba7b35d2e --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_french_0.0.1.hjson @@ -0,0 +1,367 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ² │ & │ é │ " │ ' │ ( │ - │ è │ _ │ ç │ à │ ) │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ ! │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "FR_SUP2", + "label": "²", + } + "KC_1": { + "key": "FR_AMPR", + "label": "&", + } + "KC_2": { + "key": "FR_EACU", + "label": "é", + } + "KC_3": { + "key": "FR_DQUO", + "label": "\"", + } + "KC_4": { + "key": "FR_QUOT", + "label": "'", + } + "KC_5": { + "key": "FR_LPRN", + "label": "(", + } + "KC_6": { + "key": "FR_MINS", + "label": "-", + } + "KC_7": { + "key": "FR_EGRV", + "label": "è", + } + "KC_8": { + "key": "FR_UNDS", + "label": "_", + } + "KC_9": { + "key": "FR_CCED", + "label": "ç", + } + "KC_0": { + "key": "FR_AGRV", + "label": "à", + } + "KC_MINS": { + "key": "FR_RPRN", + "label": ")", + } + "KC_EQL": { + "key": "FR_EQL", + "label": "=", + } + "KC_Q": { + "key": "FR_A", + "label": "A", + } + "KC_W": { + "key": "FR_Z", + "label": "Z", + } + "KC_E": { + "key": "FR_E", + "label": "E", + } + "KC_R": { + "key": "FR_R", + "label": "R", + } + "KC_T": { + "key": "FR_T", + "label": "T", + } + "KC_Y": { + "key": "FR_Y", + "label": "Y", + } + "KC_U": { + "key": "FR_U", + "label": "U", + } + "KC_I": { + "key": "FR_I", + "label": "I", + } + "KC_O": { + "key": "FR_O", + "label": "O", + } + "KC_P": { + "key": "FR_P", + "label": "P", + } + "KC_LBRC": { + "key": "FR_CIRC", + "label": "^ (dead)", + } + "KC_RBRC": { + "key": "FR_DLR", + "label": "$", + } + "KC_A": { + "key": "FR_Q", + "label": "Q", + } + "KC_S": { + "key": "FR_S", + "label": "S", + } + "KC_D": { + "key": "FR_D", + "label": "D", + } + "KC_F": { + "key": "FR_F", + "label": "F", + } + "KC_G": { + "key": "FR_G", + "label": "G", + } + "KC_H": { + "key": "FR_H", + "label": "H", + } + "KC_J": { + "key": "FR_J", + "label": "J", + } + "KC_K": { + "key": "FR_K", + "label": "K", + } + "KC_L": { + "key": "FR_L", + "label": "L", + } + "KC_SCLN": { + "key": "FR_M", + "label": "M", + } + "KC_QUOT": { + "key": "FR_UGRV", + "label": "ù", + } + "KC_NUHS": { + "key": "FR_ASTR", + "label": "*", + } + "KC_NUBS": { + "key": "FR_LABK", + "label": "<", + } + "KC_Z": { + "key": "FR_W", + "label": "W", + } + "KC_X": { + "key": "FR_X", + "label": "X", + } + "KC_C": { + "key": "FR_C", + "label": "C", + } + "KC_V": { + "key": "FR_V", + "label": "V", + } + "KC_B": { + "key": "FR_B", + "label": "B", + } + "KC_N": { + "key": "FR_N", + "label": "N", + } + "KC_M": { + "key": "FR_COMM", + "label": ",", + } + "KC_COMM": { + "key": "FR_SCLN", + "label": ";", + } + "KC_DOT": { + "key": "FR_COLN", + "label": ":", + } + "KC_SLSH": { + "key": "FR_EXLM", + "label": "!", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ £ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ % │ µ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ ? │ . │ / │ § │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(FR_AMPR)": { + "key": "FR_1", + "label": "1", + } + "S(FR_EACU)": { + "key": "FR_2", + "label": "2", + } + "S(FR_DQUO)": { + "key": "FR_3", + "label": "3", + } + "S(FR_QUOT)": { + "key": "FR_4", + "label": "4", + } + "S(FR_LPRN)": { + "key": "FR_5", + "label": "5", + } + "S(FR_MINS)": { + "key": "FR_6", + "label": "6", + } + "S(FR_EGRV)": { + "key": "FR_7", + "label": "7", + } + "S(FR_UNDS)": { + "key": "FR_8", + "label": "8", + } + "S(FR_CCED)": { + "key": "FR_9", + "label": "9", + } + "S(FR_AGRV)": { + "key": "FR_0", + "label": "0", + } + "S(FR_RPRN)": { + "key": "FR_DEG", + "label": "°", + } + "S(FR_EQL)": { + "key": "FR_PLUS", + "label": "+", + } + "S(FR_CIRC)": { + "key": "FR_DIAE", + "label": "¨ (dead)", + } + "S(FR_DLR)": { + "key": "FR_PND", + "label": "£", + } + "S(FR_UGRV)": { + "key": "FR_PERC", + "label": "%", + } + "S(FR_ASTR)": { + "key": "FR_MICR", + "label": "µ", + } + "S(FR_LABK)": { + "key": "FR_RABK", + "label": ">", + } + "S(FR_COMM)": { + "key": "FR_QUES", + "label": "?", + } + "S(FR_SCLN)": { + "key": "FR_DOT", + "label": ".", + } + "S(FR_COLN)": { + "key": "FR_SLSH", + "label": "/", + } + "S(FR_EXLM)": { + "key": "FR_SECT", + "label": "§", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ ~ │ # │ { │ [ │ | │ ` │ \ │ │ @ │ ] │ } │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ │ ¤ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(FR_EACU)": { + "key": "FR_TILD", + "label": "~ (dead)", + } + "ALGR(FR_DQUO)": { + "key": "FR_HASH", + "label": "#", + } + "ALGR(FR_QUOT)": { + "key": "FR_LCBR", + "label": "{", + } + "ALGR(FR_LPRN)": { + "key": "FR_LBRC", + "label": "[", + } + "ALGR(FR_MINS)": { + "key": "FR_PIPE", + "label": "|", + } + "ALGR(FR_EGRV)": { + "key": "FR_GRV", + "label": "` (dead)", + } + "ALGR(FR_UNDS)": { + "key": "FR_BSLS", + "label": "\\", + } + "ALGR(FR_AGRV)": { + "key": "FR_AT", + "label": "@", + } + "ALGR(FR_RPRN)": { + "key": "FR_RBRC", + "label": "]", + } + "ALGR(FR_EQL)": { + "key": "FR_RCBR", + "label": "}", + } + "ALGR(KC_E)": { + "key": "FR_EURO", + "label": "€", + } + "ALGR(FR_DLR)": { + "key": "FR_CURR", + "label": "¤", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_french_afnor_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_french_afnor_0.0.1.hjson new file mode 100644 index 0000000000..90981d085d --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_french_afnor_0.0.1.hjson @@ -0,0 +1,623 @@ +{ + "aliases": { +/* French AZERTY - AFNOR NF Z71-300 + * + * A standard for the French keyboard + * + * The project was launched at the end of 2015 on the proposal of the General + * Delegation for the French language and the languages of France (Ministry + * of Culture), starting from the observation that the current "azerty" + * keyboards constrain the writing of French, languages regional and European + * languages with Latin alphabet. + * + * For the first time, a standard (NF Z71-300) defines the placement of + * characters on the French keyboard. It offers two layouts, one of which + * closely follows the QWERTY keyboard used by most people who write in French. + * + * However, it is in many ways superior to the old keyboard: + * + * - it contains all the characters required to enter text in French (for example É, œ and ") + * - it is designed to be more ergonomic and allow faster typing + * - it includes almost 60 additional characters for entering foreign languages, technical content, etc + * - however, the characters remain easy to locate thanks to intuitive groupings + * + * Source: https://norme-azerty.fr + */ +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ @ │ à │ é │ è │ ê │ ( │ ) │ ‘ │ ’ │ « │ » │ ' │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ - │ + │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ / │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ W │ X │ C │ V │ B │ N │ . │ , │ : │ ; │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "FR_AT", + "label": "@", + } + "KC_1": { + "key": "FR_AGRV", + "label": "à", + } + "KC_2": { + "key": "FR_EACU", + "label": "é", + } + "KC_3": { + "key": "FR_EGRV", + "label": "è", + } + "KC_4": { + "key": "FR_ECIR", + "label": "ê", + } + "KC_5": { + "key": "FR_LPRN", + "label": "(", + } + "KC_6": { + "key": "FR_RPRN", + "label": ")", + } + "KC_7": { + "key": "FR_LSQU", + "label": "‘", + } + "KC_8": { + "key": "FR_RSQU", + "label": "’", + } + "KC_9": { + "key": "FR_LDAQ", + "label": "«", + } + "KC_0": { + "key": "FR_RDAQ", + "label": "»", + } + "KC_MINS": { + "key": "FR_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "FR_DCIR", + "label": "^ (dead)", + } + "KC_Q": { + "key": "FR_A", + "label": "A", + } + "KC_W": { + "key": "FR_Z", + "label": "Z", + } + "KC_E": { + "key": "FR_E", + "label": "E", + } + "KC_R": { + "key": "FR_R", + "label": "R", + } + "KC_T": { + "key": "FR_T", + "label": "T", + } + "KC_Y": { + "key": "FR_Y", + "label": "Y", + } + "KC_U": { + "key": "FR_U", + "label": "U", + } + "KC_I": { + "key": "FR_I", + "label": "I", + } + "KC_O": { + "key": "FR_O", + "label": "O", + } + "KC_P": { + "key": "FR_P", + "label": "P", + } + "KC_LBRC": { + "key": "FR_MINS", + "label": "-", + } + "KC_RBRC": { + "key": "FR_PLUS", + "label": "+", + } + "KC_A": { + "key": "FR_Q", + "label": "Q", + } + "KC_S": { + "key": "FR_S", + "label": "S", + } + "KC_D": { + "key": "FR_D", + "label": "D", + } + "KC_F": { + "key": "FR_F", + "label": "F", + } + "KC_G": { + "key": "FR_G", + "label": "G", + } + "KC_H": { + "key": "FR_H", + "label": "H", + } + "KC_J": { + "key": "FR_J", + "label": "J", + } + "KC_K": { + "key": "FR_K", + "label": "K", + } + "KC_L": { + "key": "FR_L", + "label": "L", + } + "KC_SCLN": { + "key": "FR_M", + "label": "M", + } + "KC_QUOT": { + "key": "FR_SLSH", + "label": "/", + } + "KC_NUHS": { + "key": "FR_ASTR", + "label": "*", + } + "KC_NUBS": { + "key": "FR_LABK", + "label": "<", + } + "KC_Z": { + "key": "FR_W", + "label": "W", + } + "KC_X": { + "key": "FR_X", + "label": "X", + } + "KC_C": { + "key": "FR_C", + "label": "C", + } + "KC_V": { + "key": "FR_V", + "label": "V", + } + "KC_B": { + "key": "FR_B", + "label": "B", + } + "KC_N": { + "key": "FR_N", + "label": "N", + } + "KC_M": { + "key": "FR_DOT", + "label": ".", + } + "KC_COMM": { + "key": "FR_COMM", + "label": ",", + } + "KC_DOT": { + "key": "FR_COLN", + "label": ":", + } + "KC_SLSH": { + "key": "FR_SCLN", + "label": ";", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ " │ ¨ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ – │ ± │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ \ │ ½ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ ? │ ! │ … │ = │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(FR_AT)": { + "key": "FR_HASH", + "label": "#", + } + "S(FR_AGRV)": { + "key": "FR_1", + "label": "1", + } + "S(FR_EACU)": { + "key": "FR_2", + "label": "2", + } + "S(FR_EGRV)": { + "key": "FR_3", + "label": "3", + } + "S(FR_ECIR)": { + "key": "FR_4", + "label": "4", + } + "S(FR_LPRN)": { + "key": "FR_5", + "label": "5", + } + "S(FR_RPRN)": { + "key": "FR_6", + "label": "6", + } + "S(FR_LSQU)": { + "key": "FR_7", + "label": "7", + } + "S(FR_RSQU)": { + "key": "FR_8", + "label": "8", + } + "S(FR_LDAQ)": { + "key": "FR_9", + "label": "9", + } + "S(FR_RDAQ)": { + "key": "FR_0", + "label": "0", + } + "S(FR_QUOT)": { + "key": "FR_DQUO", + "label": "\"", + } + "S(FR_DCIR)": { + "key": "FR_DIAE", + "label": "¨ (dead)", + } + "S(FR_MINS)": { + "key": "FR_NDSH", + "label": "–", + } + "S(FR_PLUS)": { + "key": "FR_PLMN", + "label": "±", + } + "S(FR_SLSH)": { + "key": "FR_BSLS", + "label": "\\", + } + "S(FR_ASTR)": { + "key": "FR_HALF", + "label": "½", + } + "S(FR_LABK)": { + "key": "FR_RABK", + "label": ">", + } + "S(FR_DOT)": { + "key": "FR_QUES", + "label": "?", + } + "S(FR_COMM)": { + "key": "FR_EXLM", + "label": "!", + } + "S(FR_COLN)": { + "key": "FR_ELLP", + "label": "…", + } + "S(FR_SCLN)": { + "key": "FR_EQL", + "label": "=", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ˘ │ § │ ´ │ ` │ & │ [ │ ] │ ¯ │ _ │ “ │ ” │ ° │ ˇ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ æ │ £ │ € │ ® │ { │ } │ ù │ ˙ │ œ │ % │ − │ † │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ θ │ ß │ $ │ ¤ │ µ │ Eu│ │ ∕ │ | │ ∞ │ ÷ │ × │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ ≤ │ ʒ │ © │ ç │ ¸ │ − │ ~ │ ¿ │ ¡ │ · │ ≃ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(FR_AT)": { + "key": "FR_BREV", + "label": "˘ (dead)", + } + "ALGR(FR_AGRV)": { + "key": "FR_SECT", + "label": "§", + } + "ALGR(FR_EACU)": { + "key": "FR_ACUT", + "label": "´ (dead)", + } + "ALGR(FR_EGRV)": { + "key": "FR_GRV", + "label": "` (dead)", + } + "ALGR(FR_ECIR)": { + "key": "FR_AMPR", + "label": "&", + } + "ALGR(FR_LPRN)": { + "key": "FR_LBRC", + "label": "[", + } + "ALGR(FR_RPRN)": { + "key": "FR_RBRC", + "label": "]", + } + "ALGR(FR_LSQU)": { + "key": "FR_MACR", + "label": "¯ (dead)", + } + "ALGR(FR_RSQU)": { + "key": "FR_UNDS", + "label": "_", + } + "ALGR(FR_LDAQ)": { + "key": "FR_LDQU", + "label": "“", + } + "ALGR(FR_RDAQ)": { + "key": "FR_RDQU", + "label": "”", + } + "ALGR(FR_QUOT)": { + "key": "FR_DEG", + "label": "°", + } + "ALGR(FR_DCIR)": { + "key": "FR_CARN", + "label": "ˇ (dead)", + } + "ALGR(FR_A)": { + "key": "FR_AE", + "label": "æ", + } + "ALGR(FR_Z)": { + "key": "FR_PND", + "label": "£", + } + "ALGR(FR_E)": { + "key": "FR_EURO", + "label": "€", + } + "ALGR(FR_R)": { + "key": "FR_REGD", + "label": "®", + } + "ALGR(FR_T)": { + "key": "FR_LCBR", + "label": "{", + } + "ALGR(FR_Y)": { + "key": "FR_RCBR", + "label": "}", + } + "ALGR(FR_U)": { + "key": "FR_UGRV", + "label": "ù", + } + "ALGR(FR_I)": { + "key": "FR_DOTA", + "label": "˙ (dead)", + } + "ALGR(FR_O)": { + "key": "FR_OE", + "label": "œ", + } + "ALGR(FR_P)": { + "key": "FR_PERC", + "label": "%", + } + "ALGR(FR_MINS)": { + "key": "FR_MMNS", + "label": "−", + } + "ALGR(FR_PLUS)": { + "key": "FR_DAGG", + "label": "†", + } + "ALGR(FR_Q)": { + "key": "FR_THET", + "label": "θ", + } + "ALGR(FR_S)": { + "key": "FR_SS", + "label": "ß", + } + "ALGR(FR_D)": { + "key": "FR_DLR", + "label": "$", + } + "ALGR(FR_F)": { + "key": "FR_CURR", + "label": "¤ (dead monetary key)", + } + "ALGR(FR_G)": { + "key": "FR_DGRK", + "label": "µ (dead Greek key)", + } + "ALGR(FR_H)": { + "key": "FR_EU", + "label": "Eu (dead European symbol key)", + } + "ALGR(FR_K)": { + "key": "FR_DSLS", + "label": "∕ (dead)", + } + "ALGR(FR_L)": { + "key": "FR_PIPE", + "label": "|", + } + "ALGR(FR_M)": { + "key": "FR_INFN", + "label": "∞", + } + "ALGR(FR_SLSH)": { + "key": "FR_DIV", + "label": "÷", + } + "ALGR(FR_ASTR)": { + "key": "FR_MUL", + "label": "×", + } + "ALGR(FR_LABK)": { + "key": "FR_LEQL", + "label": "≤", + } + "ALGR(FR_W)": { + "key": "FR_EZH", + "label": "ʒ", + } + "ALGR(FR_X)": { + "key": "FR_COPY", + "label": "©", + } + "ALGR(FR_C)": { + "key": "FR_CCED", + "label": "ç", + } + "ALGR(FR_V)": { + "key": "FR_CEDL", + "label": "¸ (dead)", + } + "ALGR(FR_B)": { + "key": "FR_DMNS", + "label": "− (dead)", + } + "ALGR(FR_N)": { + "key": "FR_DTIL", + "label": "~ (dead)", + } + "ALGR(FR_DOT)": { + "key": "FR_IQUE", + "label": "¿", + } + "ALGR(FR_COMM)": { + "key": "FR_IEXL", + "label": "¡", + } + "ALGR(FR_COLN)": { + "key": "FR_MDDT", + "label": "·", + } + "ALGR(FR_SCLN)": { + "key": "FR_AEQL", + "label": "≃", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ̑ │ │ │ │ │ ˝ │ ̏ │ │ — │ ‹ │ › │ ˚ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ ™ │ │ │ ̣ │ │ ‰ │ ‑ │ ‡ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ ˍ │ │ │ │ │ √ │ ¼ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ ≥ │ │ │ │ ˛ │ │ │ │ ̦ │ │ ≠ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(FR_AT))": { + "key": "FR_IBRV", + "label": "̑ (dead)", + } + "S(ALGR(FR_LPRN))": { + "key": "FR_DACU", + "label": "˝ (dead)", + } + "S(ALGR(FR_RPRN))": { + "key": "FR_DGRV", + "label": "̏ (dead)", + } + "S(ALGR(FR_RSQU))": { + "key": "FR_MDSH", + "label": "—", + } + "S(ALGR(FR_LDAQ))": { + "key": "FR_LSAQ", + "label": "‹", + } + "S(ALGR(FR_RDAQ))": { + "key": "FR_RSAQ", + "label": "›", + } + "S(ALGR(FR_QUOT))": { + "key": "FR_RNGA", + "label": "˚ (dead)", + } + "S(ALGR(FR_T))": { + "key": "FR_TM", + "label": "™", + } + "S(ALGR(FR_I))": { + "key": "FR_DOTB", + "label": "̣ (dead)", + } + "S(ALGR(FR_P))": { + "key": "FR_PERM", + "label": "‰", + } + "S(ALGR(FR_MINS))": { + "key": "FR_NBHY", + "label": "‑ (non-breaking hyphen)", + } + "S(ALGR(FR_PLUS))": { + "key": "FR_DDAG", + "label": "‡", + } + "S(ALGR(FR_H))": { + "key": "FR_MACB", + "label": "ˍ (dead)", + } + "S(ALGR(FR_SLSH))": { + "key": "FR_SQRT", + "label": "√", + } + "S(ALGR(FR_ASTR))": { + "key": "FR_QRTR", + "label": "¼", + } + "S(ALGR(FR_LABK))": { + "key": "FR_GEQL", + "label": "≥", + } + "S(ALGR(FR_V))": { + "key": "FR_OGON", + "label": "˛ (dead)", + } + "S(ALGR(FR_COMM))": { + "key": "FR_DCMM", + "label": "̦ (dead)", + } + "S(ALGR(FR_SCLN))": { + "key": "FR_NEQL", + "label": "≠", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_french_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_french_mac_iso_0.0.1.hjson new file mode 100644 index 0000000000..b698018d5b --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_french_mac_iso_0.0.1.hjson @@ -0,0 +1,676 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ @ │ & │ é │ " │ ' │ ( │ § │ è │ ! │ ç │ à │ ) │ - │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ ` │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ = │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "KC_GRV": { + "key": "FR_AT", + "label": "@", + } + "KC_1": { + "key": "FR_AMPR", + "label": "&", + } + "KC_2": { + "key": "FR_LEAC", + "label": "é", + } + "KC_3": { + "key": "FR_DQUO", + "label": "\"", + } + "KC_4": { + "key": "FR_QUOT", + "label": "'", + } + "KC_5": { + "key": "FR_LPRN", + "label": "(", + } + "KC_6": { + "key": "FR_SECT", + "label": "§", + } + "KC_7": { + "key": "FR_LEGR", + "label": "è", + } + "KC_8": { + "key": "FR_EXLM", + "label": "!", + } + "KC_9": { + "key": "FR_LCCE", + "label": "ç", + } + "KC_0": { + "key": "FR_LAGR", + "label": "à", + } + "KC_MINS": { + "key": "FR_RPRN", + "label": ")", + } + "KC_EQL": { + "key": "FR_MINS", + "label": "-", + } + "KC_Q": { + "key": "FR_A", + "label": "A", + } + "KC_W": { + "key": "FR_Z", + "label": "Z", + } + "KC_E": { + "key": "FR_E", + "label": "E", + } + "KC_R": { + "key": "FR_R", + "label": "R", + } + "KC_T": { + "key": "FR_T", + "label": "T", + } + "KC_Y": { + "key": "FR_Y", + "label": "Y", + } + "KC_U": { + "key": "FR_U", + "label": "U", + } + "KC_I": { + "key": "FR_I", + "label": "I", + } + "KC_O": { + "key": "FR_O", + "label": "O", + } + "KC_P": { + "key": "FR_P", + "label": "P", + } + "KC_LBRC": { + "key": "FR_CIRC", + "label": "^", + } + "KC_RBRC": { + "key": "FR_DLR", + "label": "$", + } + "KC_A": { + "key": "FR_Q", + "label": "Q", + } + "KC_S": { + "key": "FR_S", + "label": "S", + } + "KC_D": { + "key": "FR_D", + "label": "D", + } + "KC_F": { + "key": "FR_F", + "label": "F", + } + "KC_G": { + "key": "FR_G", + "label": "G", + } + "KC_H": { + "key": "FR_H", + "label": "H", + } + "KC_J": { + "key": "FR_J", + "label": "J", + } + "KC_K": { + "key": "FR_K", + "label": "K", + } + "KC_L": { + "key": "FR_L", + "label": "L", + } + "KC_SCLN": { + "key": "FR_M", + "label": "M", + } + "KC_QUOT": { + "key": "FR_LUGR", + "label": "ù", + } + "KC_NUHS": { + "key": "FR_GRV", + "label": "`", + } + "KC_NUBS": { + "key": "FR_LABK", + "label": "<", + } + "KC_Z": { + "key": "FR_W", + "label": "W", + } + "KC_X": { + "key": "FR_X", + "label": "X", + } + "KC_C": { + "key": "FR_C", + "label": "C", + } + "KC_V": { + "key": "FR_V", + "label": "V", + } + "KC_B": { + "key": "FR_B", + "label": "B", + } + "KC_N": { + "key": "FR_N", + "label": "N", + } + "KC_M": { + "key": "FR_COMM", + "label": ",", + } + "KC_COMM": { + "key": "FR_SCLN", + "label": ";", + } + "KC_DOT": { + "key": "FR_COLN", + "label": ":", + } + "KC_SLSH": { + "key": "FR_EQL", + "label": "=", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ _ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ % │ £ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ > │ │ │ │ │ │ │ ? │ . │ / │ + │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(FR_AT)": { + "key": "FR_HASH", + "label": "#", + } + "S(FR_AMPR)": { + "key": "FR_1", + "label": "1", + } + "S(FR_LEAC)": { + "key": "FR_2", + "label": "2", + } + "S(FR_DQUO)": { + "key": "FR_3", + "label": "3", + } + "S(FR_QUOT)": { + "key": "FR_4", + "label": "4", + } + "S(FR_LPRN)": { + "key": "FR_5", + "label": "5", + } + "S(FR_SECT)": { + "key": "FR_6", + "label": "6", + } + "S(FR_LEGR)": { + "key": "FR_7", + "label": "7", + } + "S(FR_EXLM)": { + "key": "FR_8", + "label": "8", + } + "S(FR_LCCE)": { + "key": "FR_9", + "label": "9", + } + "S(FR_LAGR)": { + "key": "FR_0", + "label": "0", + } + "S(FR_RPRN)": { + "key": "FR_DEG", + "label": "°", + } + "S(FR_MINS)": { + "key": "FR_UNDS", + "label": "_", + } + "S(FR_CIRC)": { + "key": "FR_DIAE", + "label": "¨ (dead)", + } + "S(FR_DLR)": { + "key": "FR_ASTR", + "label": "*", + } + "S(FR_LUGR)": { + "key": "FR_PERC", + "label": "%", + } + "S(FR_GRV)": { + "key": "FR_PND", + "label": "£", + } + "S(FR_LABK)": { + "key": "FR_RABK", + "label": ">", + } + "S(FR_COMM)": { + "key": "FR_QUES", + "label": "?", + } + "S(FR_SCLN)": { + "key": "FR_DOT", + "label": ".", + } + "S(FR_COLN)": { + "key": "FR_SLSH", + "label": "/", + } + "S(FR_EQL)": { + "key": "FR_PLUS", + "label": "+", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ • │  │ ë │ “ │ ‘ │ { │ ¶ │ « │ ¡ │ Ç │ Ø │ } │ — │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ Æ │  │ Ê │ ® │ † │ Ú │ º │ î │ Œ │ π │ Ô │ € │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ ‡ │ Ò │ ∂ │ ƒ │ fi │ Ì │ Ï │ È │ ¬ │ µ │ Ù │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≤ │ ‹ │ ≈ │ © │ ◊ │ ß │ ~ │ ∞ │ … │ ÷ │ ≠ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(FR_AT)": { + "key": "FR_BULT", + "label": "•", + } + "A(FR_AMPR)": { + "key": "FR_APPL", + "label": " (Apple logo)", + } + "A(FR_LEAC)": { + "key": "FR_LEDI", + "label": "ë", + } + "A(FR_DQUO)": { + "key": "FR_LDQU", + "label": "“", + } + "A(FR_QUOT)": { + "key": "FR_LSQU", + "label": "‘", + } + "A(FR_LPRN)": { + "key": "FR_LCBR", + "label": "{", + } + "A(FR_SECT)": { + "key": "FR_PILC", + "label": "¶", + } + "A(FR_LEGR)": { + "key": "FR_LDAQ", + "label": "«", + } + "A(FR_EXLM)": { + "key": "FR_IEXL", + "label": "¡", + } + "A(FR_LCCE)": { + "key": "FR_CCCE", + "label": "Ç", + } + "A(FR_LAGR)": { + "key": "FR_OSTR", + "label": "Ø", + } + "A(FR_RPRN)": { + "key": "FR_RCBR", + "label": "}", + } + "A(FR_MINS)": { + "key": "FR_MDSH", + "label": "—", + } + "A(FR_A)": { + "key": "FR_AE", + "label": "Æ", + } + "A(FR_Z)": { + "key": "FR_CACI", + "label": "Â", + } + "A(FR_E)": { + "key": "FR_ECIR", + "label": "Ê", + } + "A(FR_R)": { + "key": "FR_REGD", + "label": "®", + } + "A(FR_T)": { + "key": "FR_DAGG", + "label": "†", + } + "A(FR_Y)": { + "key": "FR_CUAC", + "label": "Ú", + } + "A(FR_U)": { + "key": "FR_MORD", + "label": "º", + } + "A(FR_I)": { + "key": "FR_LICI", + "label": "î", + } + "A(FR_O)": { + "key": "FR_OE", + "label": "Œ", + } + "A(FR_P)": { + "key": "FR_PI", + "label": "π", + } + "A(FR_CIRC)": { + "key": "FR_OCIR", + "label": "Ô", + } + "A(FR_DLR)": { + "key": "FR_EURO", + "label": "€", + } + "A(FR_Q)": { + "key": "FR_DDAG", + "label": "‡", + } + "A(FR_S)": { + "key": "FR_COGR", + "label": "Ò", + } + "A(FR_D)": { + "key": "FR_PDIF", + "label": "∂", + } + "A(FR_F)": { + "key": "FR_FHK", + "label": "ƒ", + } + "A(FR_G)": { + "key": "FR_FI", + "label": "fi", + } + "A(FR_H)": { + "key": "FR_CIGR", + "label": "Ì", + } + "A(FR_J)": { + "key": "FR_CIDI", + "label": "Ï", + } + "A(FR_K)": { + "key": "FR_CEGR", + "label": "È", + } + "A(FR_L)": { + "key": "FR_NOT", + "label": "¬", + } + "A(FR_M)": { + "key": "FR_MICR", + "label": "µ", + } + "A(FR_LUGR)": { + "key": "FR_CUGR", + "label": "Ù", + } + "A(FR_LABK)": { + "key": "FR_LTEQ", + "label": "≤", + } + "A(FR_W)": { + "key": "FR_LSAQ", + "label": "‹", + } + "A(FR_X)": { + "key": "FR_AEQL", + "label": "≈", + } + "A(FR_C)": { + "key": "FR_COPY", + "label": "©", + } + "A(FR_V)": { + "key": "FR_LOZN", + "label": "◊", + } + "A(FR_B)": { + "key": "FR_SS", + "label": "ß", + } + "A(FR_N)": { + "key": "FR_TILD", + "label": "~ (dead)", + } + "A(FR_COMM)": { + "key": "FR_INFN", + "label": "∞", + } + "A(FR_SCLN)": { + "key": "FR_ELLP", + "label": "…", + } + "A(FR_COLN)": { + "key": "FR_DIV", + "label": "÷", + } + "A(FR_EQL)": { + "key": "FR_NEQL", + "label": "≠", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ Ÿ │ ´ │ „ │ │ │ [ │ å │ » │ Û │ Á │ │ ] │ – │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ Å │ │ ‚ │ ™ │ │ ª │ ï │ │ ∏ │ │ ¥ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Ω │ ∑ │ ∆ │ · │ fl │ Î │ Í │ Ë │ | │ Ó │ ‰ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≥ │ › │ ⁄ │ ¢ │ √ │ ∫ │ ı │ ¿ │ │ \ │ ± │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(FR_AT))": { + "key": "FR_CYDI", + "label": "Ÿ", + } + "S(A(FR_AMPR))": { + "key": "FR_ACUT", + "label": "´ (dead)", + } + "S(A(FR_LEAC))": { + "key": "FR_DLQU", + "label": "„", + } + "S(A(FR_LPRN))": { + "key": "FR_LBRC", + "label": "[", + } + "S(A(FR_SECT))": { + "key": "FR_LARI", + "label": "å", + } + "S(A(FR_LEGR))": { + "key": "FR_RDAQ", + "label": "»", + } + "S(A(FR_EXLM))": { + "key": "FR_CUCI", + "label": "Û", + } + "S(A(FR_LCCE))": { + "key": "FR_CAAC", + "label": "Á", + } + "S(A(FR_RPRN))": { + "key": "FR_RBRC", + "label": "]", + } + "S(A(FR_MINS))": { + "key": "FR_NDSH", + "label": "–", + } + "S(A(FR_Z))": { + "key": "FR_CARI", + "label": "Å", + } + "S(A(FR_R))": { + "key": "FR_SLQU", + "label": "‚", + } + "S(A(FR_T))": { + "key": "FR_TM", + "label": "™", + } + "S(A(FR_U))": { + "key": "FR_FORD", + "label": "ª", + } + "S(A(FR_I))": { + "key": "FR_LIDI", + "label": "ï", + } + "S(A(FR_P))": { + "key": "FR_NARP", + "label": "∏", + } + "S(A(FR_DLR))": { + "key": "FR_YEN", + "label": "¥", + } + "S(A(FR_Q))": { + "key": "FR_OMEG", + "label": "Ω", + } + "S(A(FR_S))": { + "key": "FR_NARS", + "label": "∑", + } + "S(A(FR_D))": { + "key": "FR_INCR", + "label": "∆", + } + "S(A(FR_F))": { + "key": "FR_MDDT", + "label": "·", + } + "S(A(FR_G))": { + "key": "FR_FL", + "label": "fl", + } + "S(A(FR_H))": { + "key": "FR_CICI", + "label": "Î", + } + "S(A(FR_J))": { + "key": "FR_CIAC", + "label": "Í", + } + "S(A(FR_K))": { + "key": "FR_CEDI", + "label": "Ë", + } + "S(A(FR_L))": { + "key": "FR_PIPE", + "label": "|", + } + "S(A(FR_M))": { + "key": "FR_COAC", + "label": "Ó", + } + "S(A(FR_LUGR))": { + "key": "FR_PERM", + "label": "‰", + } + "S(A(FR_LABK))": { + "key": "FR_GTEQ", + "label": "≥", + } + "S(A(FR_W))": { + "key": "FR_RSAQ", + "label": "›", + } + "S(A(FR_X))": { + "key": "FR_FRSL", + "label": "⁄", + } + "S(A(FR_C))": { + "key": "FR_CENT", + "label": "¢", + } + "S(A(FR_V))": { + "key": "FR_SQRT", + "label": "√", + } + "S(A(FR_B))": { + "key": "FR_INTG", + "label": "∫", + } + "S(A(FR_N))": { + "key": "FR_DLSI", + "label": "ı", + } + "S(A(FR_COMM))": { + "key": "FR_IQUE", + "label": "¿", + } + "S(A(FR_COLN))": { + "key": "FR_BSLS", + "label": "\\", + } + "S(A(FR_EQL))": { + "key": "FR_PLMN", + "label": "±", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_german_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_german_0.0.1.hjson new file mode 100644 index 0000000000..a1cfd44956 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_german_0.0.1.hjson @@ -0,0 +1,359 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ß │ ´ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Ü │ + │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "DE_CIRC", + "label": "^ (dead)", + } + "KC_1": { + "key": "DE_1", + "label": "1", + } + "KC_2": { + "key": "DE_2", + "label": "2", + } + "KC_3": { + "key": "DE_3", + "label": "3", + } + "KC_4": { + "key": "DE_4", + "label": "4", + } + "KC_5": { + "key": "DE_5", + "label": "5", + } + "KC_6": { + "key": "DE_6", + "label": "6", + } + "KC_7": { + "key": "DE_7", + "label": "7", + } + "KC_8": { + "key": "DE_8", + "label": "8", + } + "KC_9": { + "key": "DE_9", + "label": "9", + } + "KC_0": { + "key": "DE_0", + "label": "0", + } + "KC_MINS": { + "key": "DE_SS", + "label": "ß", + } + "KC_EQL": { + "key": "DE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "DE_Q", + "label": "Q", + } + "KC_W": { + "key": "DE_W", + "label": "W", + } + "KC_E": { + "key": "DE_E", + "label": "E", + } + "KC_R": { + "key": "DE_R", + "label": "R", + } + "KC_T": { + "key": "DE_T", + "label": "T", + } + "KC_Y": { + "key": "DE_Z", + "label": "Z", + } + "KC_U": { + "key": "DE_U", + "label": "U", + } + "KC_I": { + "key": "DE_I", + "label": "I", + } + "KC_O": { + "key": "DE_O", + "label": "O", + } + "KC_P": { + "key": "DE_P", + "label": "P", + } + "KC_LBRC": { + "key": "DE_UDIA", + "label": "Ü", + } + "KC_RBRC": { + "key": "DE_PLUS", + "label": "+", + } + "KC_A": { + "key": "DE_A", + "label": "A", + } + "KC_S": { + "key": "DE_S", + "label": "S", + } + "KC_D": { + "key": "DE_D", + "label": "D", + } + "KC_F": { + "key": "DE_F", + "label": "F", + } + "KC_G": { + "key": "DE_G", + "label": "G", + } + "KC_H": { + "key": "DE_H", + "label": "H", + } + "KC_J": { + "key": "DE_J", + "label": "J", + } + "KC_K": { + "key": "DE_K", + "label": "K", + } + "KC_L": { + "key": "DE_L", + "label": "L", + } + "KC_SCLN": { + "key": "DE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "DE_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "DE_HASH", + "label": "#", + } + "KC_NUBS": { + "key": "DE_LABK", + "label": "<", + } + "KC_Z": { + "key": "DE_Y", + "label": "Y", + } + "KC_X": { + "key": "DE_X", + "label": "X", + } + "KC_C": { + "key": "DE_C", + "label": "C", + } + "KC_V": { + "key": "DE_V", + "label": "V", + } + "KC_B": { + "key": "DE_B", + "label": "B", + } + "KC_N": { + "key": "DE_N", + "label": "N", + } + "KC_M": { + "key": "DE_M", + "label": "M", + } + "KC_COMM": { + "key": "DE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "DE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "DE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ ! │ " │ § │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ' │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(DE_CIRC)": { + "key": "DE_DEG", + "label": "°", + } + "S(DE_1)": { + "key": "DE_EXLM", + "label": "!", + } + "S(DE_2)": { + "key": "DE_DQUO", + "label": "\"", + } + "S(DE_3)": { + "key": "DE_SECT", + "label": "§", + } + "S(DE_4)": { + "key": "DE_DLR", + "label": "$", + } + "S(DE_5)": { + "key": "DE_PERC", + "label": "%", + } + "S(DE_6)": { + "key": "DE_AMPR", + "label": "&", + } + "S(DE_7)": { + "key": "DE_SLSH", + "label": "/", + } + "S(DE_8)": { + "key": "DE_LPRN", + "label": "(", + } + "S(DE_9)": { + "key": "DE_RPRN", + "label": ")", + } + "S(DE_0)": { + "key": "DE_EQL", + "label": "=", + } + "S(DE_SS)": { + "key": "DE_QUES", + "label": "?", + } + "S(DE_ACUT)": { + "key": "DE_GRV", + "label": "` (dead)", + } + "S(DE_PLUS)": { + "key": "DE_ASTR", + "label": "*", + } + "S(DE_HASH)": { + "key": "DE_QUOT", + "label": "'", + } + "S(DE_LABK)": { + "key": "DE_RABK", + "label": ">", + } + "S(DE_COMM)": { + "key": "DE_SCLN", + "label": ";", + } + "S(DE_DOT)": { + "key": "DE_COLN", + "label": ":", + } + "S(DE_MINS)": { + "key": "DE_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ ² │ ³ │ │ │ │ { │ [ │ ] │ } │ \ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ @ │ │ € │ │ │ │ │ │ │ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(DE_2)": { + "key": "DE_SUP2", + "label": "²", + } + "ALGR(DE_3)": { + "key": "DE_SUP3", + "label": "³", + } + "ALGR(DE_7)": { + "key": "DE_LCBR", + "label": "{", + } + "ALGR(DE_8)": { + "key": "DE_LBRC", + "label": "[", + } + "ALGR(DE_9)": { + "key": "DE_RBRC", + "label": "]", + } + "ALGR(DE_0)": { + "key": "DE_RCBR", + "label": "}", + } + "ALGR(DE_SS)": { + "key": "DE_BSLS", + "label": "\\", + } + "ALGR(DE_Q)": { + "key": "DE_AT", + "label": "@", + } + "ALGR(DE_E)": { + "key": "DE_EURO", + "label": "€", + } + "ALGR(DE_PLUS)": { + "key": "DE_TILD", + "label": "~", + } + "ALGR(DE_LABK)": { + "key": "DE_PIPE", + "label": "|", + } + "ALGR(DE_M)": { + "key": "DE_MICR", + "label": "µ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_german_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_german_mac_iso_0.0.1.hjson new file mode 100644 index 0000000000..366ed5b9d1 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_german_mac_iso_0.0.1.hjson @@ -0,0 +1,656 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ß │ ´ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Ü │ + │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "KC_GRV": { + "key": "DE_CIRC", + "label": "^ (dead)", + } + "KC_1": { + "key": "DE_1", + "label": "1", + } + "KC_2": { + "key": "DE_2", + "label": "2", + } + "KC_3": { + "key": "DE_3", + "label": "3", + } + "KC_4": { + "key": "DE_4", + "label": "4", + } + "KC_5": { + "key": "DE_5", + "label": "5", + } + "KC_6": { + "key": "DE_6", + "label": "6", + } + "KC_7": { + "key": "DE_7", + "label": "7", + } + "KC_8": { + "key": "DE_8", + "label": "8", + } + "KC_9": { + "key": "DE_9", + "label": "9", + } + "KC_0": { + "key": "DE_0", + "label": "0", + } + "KC_MINS": { + "key": "DE_SS", + "label": "ß", + } + "KC_EQL": { + "key": "DE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "DE_Q", + "label": "Q", + } + "KC_W": { + "key": "DE_W", + "label": "W", + } + "KC_E": { + "key": "DE_E", + "label": "E", + } + "KC_R": { + "key": "DE_R", + "label": "R", + } + "KC_T": { + "key": "DE_T", + "label": "T", + } + "KC_Y": { + "key": "DE_Z", + "label": "Z", + } + "KC_U": { + "key": "DE_U", + "label": "U", + } + "KC_I": { + "key": "DE_I", + "label": "I", + } + "KC_O": { + "key": "DE_O", + "label": "O", + } + "KC_P": { + "key": "DE_P", + "label": "P", + } + "KC_LBRC": { + "key": "DE_UDIA", + "label": "Ü", + } + "KC_RBRC": { + "key": "DE_PLUS", + "label": "+", + } + "KC_A": { + "key": "DE_A", + "label": "A", + } + "KC_S": { + "key": "DE_S", + "label": "S", + } + "KC_D": { + "key": "DE_D", + "label": "D", + } + "KC_F": { + "key": "DE_F", + "label": "F", + } + "KC_G": { + "key": "DE_G", + "label": "G", + } + "KC_H": { + "key": "DE_H", + "label": "H", + } + "KC_J": { + "key": "DE_J", + "label": "J", + } + "KC_K": { + "key": "DE_K", + "label": "K", + } + "KC_L": { + "key": "DE_L", + "label": "L", + } + "KC_SCLN": { + "key": "DE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "DE_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "DE_HASH", + "label": "#", + } + "KC_NUBS": { + "key": "DE_LABK", + "label": "<", + } + "KC_Z": { + "key": "DE_Y", + "label": "Y", + } + "KC_X": { + "key": "DE_X", + "label": "X", + } + "KC_C": { + "key": "DE_C", + "label": "C", + } + "KC_V": { + "key": "DE_V", + "label": "V", + } + "KC_B": { + "key": "DE_B", + "label": "B", + } + "KC_N": { + "key": "DE_N", + "label": "N", + } + "KC_M": { + "key": "DE_M", + "label": "M", + } + "KC_COMM": { + "key": "DE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "DE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "DE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ° │ ! │ " │ § │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ' │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(DE_CIRC)": { + "key": "DE_DEG", + "label": "°", + } + "S(DE_1)": { + "key": "DE_EXLM", + "label": "!", + } + "S(DE_2)": { + "key": "DE_DQUO", + "label": "\"", + } + "S(DE_3)": { + "key": "DE_SECT", + "label": "§", + } + "S(DE_4)": { + "key": "DE_DLR", + "label": "$", + } + "S(DE_5)": { + "key": "DE_PERC", + "label": "%", + } + "S(DE_6)": { + "key": "DE_AMPR", + "label": "&", + } + "S(DE_7)": { + "key": "DE_SLSH", + "label": "/", + } + "S(DE_8)": { + "key": "DE_LPRN", + "label": "(", + } + "S(DE_9)": { + "key": "DE_RPRN", + "label": ")", + } + "S(DE_0)": { + "key": "DE_EQL", + "label": "=", + } + "S(DE_SS)": { + "key": "DE_QUES", + "label": "?", + } + "S(DE_ACUT)": { + "key": "DE_GRV", + "label": "` (dead)", + } + "S(DE_PLUS)": { + "key": "DE_ASTR", + "label": "*", + } + "S(DE_HASH)": { + "key": "DE_QUOT", + "label": "'", + } + "S(DE_LABK)": { + "key": "DE_RABK", + "label": ">", + } + "S(DE_COMM)": { + "key": "DE_SCLN", + "label": ";", + } + "S(DE_DOT)": { + "key": "DE_COLN", + "label": ":", + } + "S(DE_MINS)": { + "key": "DE_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ „ │ ¡ │ “ │ ¶ │ ¢ │ [ │ ] │ | │ { │ } │ ≠ │ ¿ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ « │ ∑ │ € │ ® │ † │ Ω │ ¨ │ ⁄ │ Ø │ π │ • │ ± │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Å │ ‚ │ ∂ │ ƒ │ © │ ª │ º │ ∆ │ @ │ Œ │ Æ │ ‘ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≤ │ ¥ │ ≈ │ Ç │ √ │ ∫ │ ~ │ µ │ ∞ │ … │ – │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(DE_CIRC)": { + "key": "DE_DLQU", + "label": "„", + } + "A(DE_1)": { + "key": "DE_IEXL", + "label": "¡", + } + "A(DE_2)": { + "key": "DE_LDQU", + "label": "“", + } + "A(DE_3)": { + "key": "DE_PILC", + "label": "¶", + } + "A(DE_4)": { + "key": "DE_CENT", + "label": "¢", + } + "A(DE_5)": { + "key": "DE_LBRC", + "label": "[", + } + "A(DE_6)": { + "key": "DE_RBRC", + "label": "]", + } + "A(DE_7)": { + "key": "DE_PIPE", + "label": "|", + } + "A(DE_8)": { + "key": "DE_LCBR", + "label": "{", + } + "A(DE_9)": { + "key": "DE_RCBR", + "label": "}", + } + "A(DE_0)": { + "key": "DE_NEQL", + "label": "≠", + } + "A(DE_SS)": { + "key": "DE_IQUE", + "label": "¿", + } + "A(DE_Q)": { + "key": "DE_LDAQ", + "label": "«", + } + "A(DE_W)": { + "key": "DE_NARS", + "label": "∑", + } + "A(DE_E)": { + "key": "DE_EURO", + "label": "€", + } + "A(DE_R)": { + "key": "DE_REGD", + "label": "®", + } + "A(DE_T)": { + "key": "DE_DAGG", + "label": "†", + } + "A(DE_Z)": { + "key": "DE_OMEG", + "label": "Ω", + } + "A(DE_U)": { + "key": "DE_DIAE", + "label": "¨ (dead)", + } + "A(DE_I)": { + "key": "DE_FRSL", + "label": "⁄", + } + "A(DE_O)": { + "key": "DE_OSTR", + "label": "Ø", + } + "A(DE_P)": { + "key": "DE_PI", + "label": "π", + } + "A(DE_UDIA)": { + "key": "DE_BULT", + "label": "•", + } + "A(DE_PLUS)": { + "key": "DE_PLMN", + "label": "±", + } + "A(DE_A)": { + "key": "DE_ARNG", + "label": "Å", + } + "A(DE_S)": { + "key": "DE_SLQU", + "label": "‚", + } + "A(DE_D)": { + "key": "DE_PDIF", + "label": "∂", + } + "A(DE_F)": { + "key": "DE_FHK", + "label": "ƒ", + } + "A(DE_G)": { + "key": "DE_COPY", + "label": "©", + } + "A(DE_H)": { + "key": "DE_FORD", + "label": "ª", + } + "A(DE_J)": { + "key": "DE_MORD", + "label": "º", + } + "A(DE_K)": { + "key": "DE_INCR", + "label": "∆", + } + "A(DE_L)": { + "key": "DE_AT", + "label": "@", + } + "A(DE_ODIA)": { + "key": "DE_OE", + "label": "Œ", + } + "A(DE_ADIA)": { + "key": "DE_AE", + "label": "Æ", + } + "A(DE_HASH)": { + "key": "DE_LSQU", + "label": "‘", + } + "A(DE_LABK)": { + "key": "DE_LTEQ", + "label": "≤", + } + "A(DE_Y)": { + "key": "DE_YEN", + "label": "¥", + } + "A(DE_X)": { + "key": "DE_AEQL", + "label": "≈", + } + "A(DE_C)": { + "key": "DE_CCCE", + "label": "Ç", + } + "A(DE_V)": { + "key": "DE_SQRT", + "label": "√", + } + "A(DE_B)": { + "key": "DE_INTG", + "label": "∫", + } + "A(DE_N)": { + "key": "DE_TILD", + "label": "~ (dead)", + } + "A(DE_M)": { + "key": "DE_MICR", + "label": "µ", + } + "A(DE_COMM)": { + "key": "DE_INFN", + "label": "∞", + } + "A(DE_DOT)": { + "key": "DE_ELLP", + "label": "…", + } + "A(DE_MINS)": { + "key": "DE_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ ¬ │ ” │ │ £ │ fi │ │ \ │ ˜ │ · │ ¯ │ ˙ │ ˚ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ » │ │ ‰ │ ¸ │ ˝ │ ˇ │ Á │ Û │ │ ∏ │ │  │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ Í │ ™ │ Ï │ Ì │ Ó │ ı │ │ fl │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≥ │ ‡ │ Ù │ │ ◊ │ ‹ │ › │ ˘ │ ˛ │ ÷ │ — │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(DE_1))": { + "key": "DE_NOT", + "label": "¬", + } + "S(A(DE_2))": { + "key": "DE_RDQU", + "label": "”", + } + "S(A(DE_4))": { + "key": "DE_PND", + "label": "£", + } + "S(A(DE_5))": { + "key": "DE_FI", + "label": "fi", + } + "S(A(DE_7))": { + "key": "DE_BSLS", + "label": "\\", + } + "S(A(DE_8))": { + "key": "DE_STIL", + "label": "˜", + } + "S(A(DE_9))": { + "key": "DE_MDDT", + "label": "·", + } + "S(A(DE_0))": { + "key": "DE_MACR", + "label": "¯", + } + "S(A(DE_SS))": { + "key": "DE_DOTA", + "label": "˙", + } + "S(A(DE_ACUT))": { + "key": "DE_RNGA", + "label": "˚", + } + "S(A(DE_Q))": { + "key": "DE_RDAQ", + "label": "»", + } + "S(A(DE_E))": { + "key": "DE_PERM", + "label": "‰", + } + "S(A(DE_R))": { + "key": "DE_CEDL", + "label": "¸", + } + "S(A(DE_T))": { + "key": "DE_DACU", + "label": "˝", + } + "S(A(DE_Z))": { + "key": "DE_CARN", + "label": "ˇ", + } + "S(A(DE_U))": { + "key": "DE_AACU", + "label": "Á", + } + "S(A(DE_I))": { + "key": "DE_UCIR", + "label": "Û", + } + "S(A(DE_P))": { + "key": "DE_NARP", + "label": "∏", + } + "S(A(DE_PLUS))": { + "key": "DE_APPL", + "label": " (Apple logo)", + } + "S(A(DE_S))": { + "key": "DE_IACU", + "label": "Í", + } + "S(A(DE_D))": { + "key": "DE_TM", + "label": "™", + } + "S(A(DE_F))": { + "key": "DE_IDIA", + "label": "Ï", + } + "S(A(DE_G))": { + "key": "DE_IGRV", + "label": "Ì", + } + "S(A(DE_H))": { + "key": "DE_OACU", + "label": "Ó", + } + "S(A(DE_J))": { + "key": "DE_DLSI", + "label": "ı", + } + "S(A(DE_L))": { + "key": "DE_FL", + "label": "fl", + } + "S(A(DE_LABK))": { + "key": "DE_GTEQ", + "label": "≥", + } + "S(A(DE_Y))": { + "key": "DE_DDAG", + "label": "‡", + } + "S(A(DE_X))": { + "key": "DE_UGRV", + "label": "Ù", + } + "S(A(DE_V))": { + "key": "DE_LOZN", + "label": "◊", + } + "S(A(DE_B))": { + "key": "DE_LSAQ", + "label": "‹", + } + "S(A(DE_N))": { + "key": "DE_RSAQ", + "label": "›", + } + "S(A(DE_M))": { + "key": "DE_BREV", + "label": "˘", + } + "S(A(DE_COMM))": { + "key": "DE_OGON", + "label": "˛", + } + "S(A(DE_DOT))": { + "key": "DE_DIV", + "label": "÷", + } + "S(A(DE_MINS))": { + "key": "DE_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_greek_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_greek_0.0.1.hjson new file mode 100644 index 0000000000..9c7f8796bf --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_greek_0.0.1.hjson @@ -0,0 +1,391 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ ; │ ς │ Ε │ Ρ │ Τ │ Υ │ Θ │ Ι │ Ο │ Π │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Α │ Σ │ Δ │ Φ │ Γ │ Η │ Ξ │ Κ │ Λ │ ΄ │ ' │ \ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ Ζ │ Χ │ Ψ │ Ω │ Β │ Ν │ Μ │ , │ . │ / │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "GR_GRV", + "label": "`", + } + "KC_1": { + "key": "GR_1", + "label": "1", + } + "KC_2": { + "key": "GR_2", + "label": "2", + } + "KC_3": { + "key": "GR_3", + "label": "3", + } + "KC_4": { + "key": "GR_4", + "label": "4", + } + "KC_5": { + "key": "GR_5", + "label": "5", + } + "KC_6": { + "key": "GR_6", + "label": "6", + } + "KC_7": { + "key": "GR_7", + "label": "7", + } + "KC_8": { + "key": "GR_8", + "label": "8", + } + "KC_9": { + "key": "GR_9", + "label": "9", + } + "KC_0": { + "key": "GR_0", + "label": "0", + } + "KC_MINS": { + "key": "GR_MINS", + "label": "-", + } + "KC_EQL": { + "key": "GR_EQL", + "label": "=", + } + "KC_Q": { + "key": "GR_SCLN", + "label": ";", + } + "KC_W": { + "key": "GR_FSIG", + "label": "ς", + } + "KC_E": { + "key": "GR_EPSL", + "label": "Ε", + } + "KC_R": { + "key": "GR_RHO", + "label": "Ρ", + } + "KC_T": { + "key": "GR_TAU", + "label": "Τ", + } + "KC_Y": { + "key": "GR_UPSL", + "label": "Υ", + } + "KC_U": { + "key": "GR_THET", + "label": "Θ", + } + "KC_I": { + "key": "GR_IOTA", + "label": "Ι", + } + "KC_O": { + "key": "GR_OMCR", + "label": "Ο", + } + "KC_P": { + "key": "GR_PI", + "label": "Π", + } + "KC_LBRC": { + "key": "GR_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "GR_RBRC", + "label": "]", + } + "KC_A": { + "key": "GR_ALPH", + "label": "Α", + } + "KC_S": { + "key": "GR_SIGM", + "label": "Σ", + } + "KC_D": { + "key": "GR_DELT", + "label": "Δ", + } + "KC_F": { + "key": "GR_PHI", + "label": "Φ", + } + "KC_G": { + "key": "GR_GAMM", + "label": "Γ", + } + "KC_H": { + "key": "GR_ETA", + "label": "Η", + } + "KC_J": { + "key": "GR_XI", + "label": "Ξ", + } + "KC_K": { + "key": "GR_KAPP", + "label": "Κ", + } + "KC_L": { + "key": "GR_LAMB", + "label": "Λ", + } + "KC_SCLN": { + "key": "GR_TONS", + "label": "΄ (dead)", + } + "KC_QUOT": { + "key": "GR_QUOT", + "label": "'", + } + "KC_NUHS": { + "key": "GR_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "GR_ZETA", + "label": "Ζ", + } + "KC_X": { + "key": "GR_CHI", + "label": "Χ", + } + "KC_C": { + "key": "GR_PSI", + "label": "Ψ", + } + "KC_V": { + "key": "GR_OMEG", + "label": "Ω", + } + "KC_B": { + "key": "GR_BETA", + "label": "Β", + } + "KC_N": { + "key": "GR_NU", + "label": "Ν", + } + "KC_M": { + "key": "GR_MU", + "label": "Μ", + } + "KC_COMM": { + "key": "GR_COMM", + "label": ",", + } + "KC_DOT": { + "key": "GR_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "GR_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ : │ ΅ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ ¨ │ " │ | │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(GR_GRV)": { + "key": "GR_TILD", + "label": "~", + } + "S(GR_1)": { + "key": "GR_EXLM", + "label": "!", + } + "S(GR_2)": { + "key": "GR_AT", + "label": "@", + } + "S(GR_3)": { + "key": "GR_HASH", + "label": "#", + } + "S(GR_4)": { + "key": "GR_DLR", + "label": "$", + } + "S(GR_5)": { + "key": "GR_PERC", + "label": "%", + } + "S(GR_6)": { + "key": "GR_CIRC", + "label": "^", + } + "S(GR_7)": { + "key": "GR_AMPR", + "label": "&", + } + "S(GR_8)": { + "key": "GR_ASTR", + "label": "*", + } + "S(GR_9)": { + "key": "GR_LPRN", + "label": "(", + } + "S(GR_0)": { + "key": "GR_RPRN", + "label": ")", + } + "S(GR_MINS)": { + "key": "GR_UNDS", + "label": "_", + } + "S(GR_EQL)": { + "key": "GR_PLUS", + "label": "+", + } + "S(GR_SCLN)": { + "key": "GR_COLN", + "label": ":", + } + "S(GR_FSIG)": { + "key": "GR_DIAT", + "label": "΅ (dead)", + } + "S(GR_LBRC)": { + "key": "GR_LCBR", + "label": "{", + } + "S(GR_RBRC)": { + "key": "GR_RCBR", + "label": "}", + } + "S(GR_TONS)": { + "key": "GR_DIAE", + "label": "¨ (dead)", + } + "S(GR_QUOT)": { + "key": "GR_DQUO", + "label": "\"", + } + "S(GR_BSLS)": { + "key": "GR_PIPE", + "label": "|", + } + "S(GR_COMM)": { + "key": "GR_LABK", + "label": "<", + } + "S(GR_DOT)": { + "key": "GR_RABK", + "label": ">", + } + "S(GR_SLSH)": { + "key": "GR_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ ² │ ³ │ £ │ § │ ¶ │ │ ¤ │ ¦ │ ° │ ± │ ½ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ ® │ │ ¥ │ │ │ │ │ « │ » │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ¬ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ © │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(GR_2)": { + "key": "GR_SUP2", + "label": "²", + } + "ALGR(GR_3)": { + "key": "GR_SUP3", + "label": "³", + } + "ALGR(GR_4)": { + "key": "GR_PND", + "label": "£", + } + "ALGR(GR_5)": { + "key": "GR_SECT", + "label": "§", + } + "ALGR(GR_6)": { + "key": "GR_PILC", + "label": "¶", + } + "ALGR(GR_8)": { + "key": "GR_CURR", + "label": "¤", + } + "ALGR(GR_9)": { + "key": "GR_BRKP", + "label": "¦", + } + "ALGR(GR_0)": { + "key": "GR_DEG", + "label": "°", + } + "ALGR(GR_MINS)": { + "key": "GR_PLMN", + "label": "±", + } + "ALGR(GR_EQL)": { + "key": "GR_HALF", + "label": "½", + } + "ALGR(GR_EPSL)": { + "key": "GR_EURO", + "label": "€", + } + "ALGR(GR_RHO)": { + "key": "GR_REGD", + "label": "®", + } + "ALGR(GR_UPSL)": { + "key": "GR_YEN", + "label": "¥", + } + "ALGR(GR_LBRC)": { + "key": "GR_LDAQ", + "label": "«", + } + "ALGR(GR_RBRC)": { + "key": "GR_RDAQ", + "label": "»", + } + "ALGR(GR_BSLS)": { + "key": "GR_NOT", + "label": "¬", + } + "ALGR(GR_PSI)": { + "key": "GR_COPY", + "label": "©", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_hebrew_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_hebrew_0.0.1.hjson new file mode 100644 index 0000000000..b519229f35 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_hebrew_0.0.1.hjson @@ -0,0 +1,347 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ; │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ / │ ' │ פ │ ם │ ן │ ו │ ט │ א │ ר │ ק │ ] │ [ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ ף │ ך │ ל │ ח │ י │ ע │ כ │ ג │ ד │ ש │ , │ \ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ ץ │ ת │ צ │ מ │ נ │ ה │ ב │ ס │ ז │ . │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "IL_SCLN", + "label": ";", + } + "KC_1": { + "key": "IL_1", + "label": "1", + } + "KC_2": { + "key": "IL_2", + "label": "2", + } + "KC_3": { + "key": "IL_3", + "label": "3", + } + "KC_4": { + "key": "IL_4", + "label": "4", + } + "KC_5": { + "key": "IL_5", + "label": "5", + } + "KC_6": { + "key": "IL_6", + "label": "6", + } + "KC_7": { + "key": "IL_7", + "label": "7", + } + "KC_8": { + "key": "IL_8", + "label": "8", + } + "KC_9": { + "key": "IL_9", + "label": "9", + } + "KC_0": { + "key": "IL_0", + "label": "0", + } + "KC_MINS": { + "key": "IL_MINS", + "label": "-", + } + "KC_EQL": { + "key": "IL_EQL", + "label": "=", + } + "KC_Q": { + "key": "IL_SLSH", + "label": "/", + } + "KC_W": { + "key": "IL_QUOT", + "label": "'", + } + "KC_E": { + "key": "IL_QOF", + "label": "ק", + } + "KC_R": { + "key": "IL_RESH", + "label": "ר", + } + "KC_T": { + "key": "IL_ALEF", + "label": "א", + } + "KC_Y": { + "key": "IL_TET", + "label": "ט", + } + "KC_U": { + "key": "IL_VAV", + "label": "ו", + } + "KC_I": { + "key": "IL_FNUN", + "label": "ן", + } + "KC_O": { + "key": "IL_FMEM", + "label": "ם", + } + "KC_P": { + "key": "IL_PE", + "label": "פ", + } + "KC_LBRC": { + "key": "IL_RBRC", + "label": "]", + } + "KC_RBRC": { + "key": "IL_LBRC", + "label": "[", + } + "KC_A": { + "key": "IL_SHIN", + "label": "ש", + } + "KC_S": { + "key": "IL_DALT", + "label": "ד", + } + "KC_D": { + "key": "IL_GIML", + "label": "ג", + } + "KC_F": { + "key": "IL_KAF", + "label": "כ", + } + "KC_G": { + "key": "IL_AYIN", + "label": "ע", + } + "KC_H": { + "key": "IL_YOD", + "label": "י", + } + "KC_J": { + "key": "IL_HET", + "label": "ח", + } + "KC_K": { + "key": "IL_LAMD", + "label": "ל", + } + "KC_L": { + "key": "IL_FKAF", + "label": "ך", + } + "KC_SCLN": { + "key": "IL_FPE", + "label": "ף", + } + "KC_QUOT": { + "key": "IL_COMM", + "label": ",", + } + "KC_NUHS": { + "key": "IL_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "IL_ZAYN", + "label": "ז", + } + "KC_X": { + "key": "IL_SMKH", + "label": "ס", + } + "KC_C": { + "key": "IL_BET", + "label": "ב", + } + "KC_V": { + "key": "IL_HE", + "label": "ה", + } + "KC_B": { + "key": "IL_NUN", + "label": "נ", + } + "KC_N": { + "key": "IL_MEM", + "label": "מ", + } + "KC_M": { + "key": "IL_TSDI", + "label": "צ", + } + "KC_COMM": { + "key": "IL_TAV", + "label": "ת", + } + "KC_DOT": { + "key": "IL_FTSD", + "label": "ץ", + } + "KC_SLSH": { + "key": "IL_DOT", + "label": ".", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ) │ ( │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ } │ { │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ : │ " │ | │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ > │ < │ ? │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(IL_SCLN)": { + "key": "IL_TILD", + "label": "~", + } + "S(IL_1)": { + "key": "IL_EXLM", + "label": "!", + } + "S(IL_2)": { + "key": "IL_AT", + "label": "@", + } + "S(IL_3)": { + "key": "IL_PND", + "label": "#", + } + "S(IL_4)": { + "key": "IL_DLR", + "label": "$", + } + "S(IL_5)": { + "key": "IL_PERC", + "label": "%", + } + "S(IL_6)": { + "key": "IL_CIRC", + "label": "^", + } + "S(IL_7)": { + "key": "IL_AMPR", + "label": "&", + } + "S(IL_8)": { + "key": "IL_ASTR", + "label": "*", + } + "S(IL_9)": { + "key": "IL_RPRN", + "label": ")", + } + "S(IL_0)": { + "key": "IL_LPRN", + "label": "(", + } + "S(IL_MINS)": { + "key": "IL_UNDS", + "label": "_", + } + "S(IL_EQL)": { + "key": "IL_PLUS", + "label": "+", + } + "S(IL_RBRC)": { + "key": "IL_RCBR", + "label": "}", + } + "S(IL_LBRC)": { + "key": "IL_LCBR", + "label": "{", + } + "S(IL_FPE)": { + "key": "IL_COLN", + "label": ":", + } + "S(IL_COMM)": { + "key": "IL_DQUO", + "label": "\"", + } + "S(IL_BSLS)": { + "key": "IL_PIPE", + "label": "|", + } + "S(IL_TAV)": { + "key": "IL_RABK", + "label": ">", + } + "S(IL_FTSD)": { + "key": "IL_LABK", + "label": "<", + } + "S(IL_DOT)": { + "key": "IL_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ € │ ₪ │ ° │ │ │ × │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ װ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ ײ │ ױ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ÷ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(IL_3)": { + "key": "IL_EURO", + "label": "€", + } + "ALGR(IL_4)": { + "key": "IL_SHKL", + "label": "₪", + } + "ALGR(IL_5)": { + "key": "IL_DEG", + "label": "°", + } + "ALGR(IL_8)": { + "key": "IL_MUL", + "label": "×", + } + "ALGR(IL_TET)": { + "key": "IL_DVAV", + "label": "װ", + } + "ALGR(IL_AYIN)": { + "key": "IL_VYOD", + "label": "ױ", + } + "ALGR(IL_YOD)": { + "key": "IL_DYOD", + "label": "ײ", + } + "ALGR(IL_DOT)": { + "key": "IL_DIV", + "label": "÷", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_hungarian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_hungarian_0.0.1.hjson new file mode 100644 index 0000000000..d4fc908dc0 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_hungarian_0.0.1.hjson @@ -0,0 +1,435 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ 0 │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ Ö │ Ü │ Ó │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Ő │ Ú │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ É │ Á │ Ű │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ Í │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "HU_0", + "label": "0", + } + "KC_1": { + "key": "HU_1", + "label": "1", + } + "KC_2": { + "key": "HU_2", + "label": "2", + } + "KC_3": { + "key": "HU_3", + "label": "3", + } + "KC_4": { + "key": "HU_4", + "label": "4", + } + "KC_5": { + "key": "HU_5", + "label": "5", + } + "KC_6": { + "key": "HU_6", + "label": "6", + } + "KC_7": { + "key": "HU_7", + "label": "7", + } + "KC_8": { + "key": "HU_8", + "label": "8", + } + "KC_9": { + "key": "HU_9", + "label": "9", + } + "KC_0": { + "key": "HU_ODIA", + "label": "Ö", + } + "KC_MINS": { + "key": "HU_UDIA", + "label": "Ü", + } + "KC_EQL": { + "key": "HU_OACU", + "label": "Ó", + } + "KC_Q": { + "key": "HU_Q", + "label": "Q", + } + "KC_W": { + "key": "HU_W", + "label": "W", + } + "KC_E": { + "key": "HU_E", + "label": "E", + } + "KC_R": { + "key": "HU_R", + "label": "R", + } + "KC_T": { + "key": "HU_T", + "label": "T", + } + "KC_Y": { + "key": "HU_Z", + "label": "Z", + } + "KC_U": { + "key": "HU_U", + "label": "U", + } + "KC_I": { + "key": "HU_I", + "label": "I", + } + "KC_O": { + "key": "HU_O", + "label": "O", + } + "KC_P": { + "key": "HU_P", + "label": "P", + } + "KC_LBRC": { + "key": "HU_ODAC", + "label": "Ő", + } + "KC_RBRC": { + "key": "HU_UACU", + "label": "Ú", + } + "KC_A": { + "key": "HU_A", + "label": "A", + } + "KC_S": { + "key": "HU_S", + "label": "S", + } + "KC_D": { + "key": "HU_D", + "label": "D", + } + "KC_F": { + "key": "HU_F", + "label": "F", + } + "KC_G": { + "key": "HU_G", + "label": "G", + } + "KC_H": { + "key": "HU_H", + "label": "H", + } + "KC_J": { + "key": "HU_J", + "label": "J", + } + "KC_K": { + "key": "HU_K", + "label": "K", + } + "KC_L": { + "key": "HU_L", + "label": "L", + } + "KC_SCLN": { + "key": "HU_EACU", + "label": "É", + } + "KC_QUOT": { + "key": "HU_AACU", + "label": "Á", + } + "KC_NUHS": { + "key": "HU_UDAC", + "label": "Ű", + } + "KC_NUBS": { + "key": "HU_IACU", + "label": "Í", + } + "KC_Z": { + "key": "HU_Y", + "label": "Y", + } + "KC_X": { + "key": "HU_X", + "label": "X", + } + "KC_C": { + "key": "HU_C", + "label": "C", + } + "KC_V": { + "key": "HU_V", + "label": "V", + } + "KC_B": { + "key": "HU_B", + "label": "B", + } + "KC_N": { + "key": "HU_N", + "label": "N", + } + "KC_M": { + "key": "HU_M", + "label": "M", + } + "KC_COMM": { + "key": "HU_COMM", + "label": ",", + } + "KC_DOT": { + "key": "HU_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "HU_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ § │ ' │ " │ + │ ! │ % │ / │ = │ ( │ ) │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ ? │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(HU_0)": { + "key": "HU_SECT", + "label": "§", + } + "S(HU_1)": { + "key": "HU_QUOT", + "label": "'", + } + "S(HU_2)": { + "key": "HU_DQUO", + "label": "\"", + } + "S(HU_3)": { + "key": "HU_PLUS", + "label": "+", + } + "S(HU_4)": { + "key": "HU_EXLM", + "label": "!", + } + "S(HU_5)": { + "key": "HU_PERC", + "label": "%", + } + "S(HU_6)": { + "key": "HU_SLSH", + "label": "/", + } + "S(HU_7)": { + "key": "HU_EQL", + "label": "=", + } + "S(HU_8)": { + "key": "HU_LPRN", + "label": "(", + } + "S(HU_9)": { + "key": "HU_RPRN", + "label": ")", + } + "S(HU_COMM)": { + "key": "HU_QUES", + "label": "?", + } + "S(HU_DOT)": { + "key": "HU_COLN", + "label": ":", + } + "S(HU_MINS)": { + "key": "HU_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ ¨ │ ¸ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ \ │ | │ Ä │ │ │ │ € │ │ │ │ ÷ │ × │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ ä │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ > │ # │ & │ @ │ { │ } │ │ ; │ │ * │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(HU_1)": { + "key": "HU_TILD", + "label": "~", + } + "ALGR(HU_2)": { + "key": "HU_CARN", + "label": "ˇ (dead)", + } + "ALGR(HU_3)": { + "key": "HU_CIRC", + "label": "^ (dead)", + } + "ALGR(HU_4)": { + "key": "HU_BREV", + "label": "˘ (dead)", + } + "ALGR(HU_5)": { + "key": "HU_RNGA", + "label": "° (dead)", + } + "ALGR(HU_6)": { + "key": "HU_OGON", + "label": "˛ (dead)", + } + "ALGR(HU_7)": { + "key": "HU_GRV", + "label": "`", + } + "ALGR(HU_8)": { + "key": "HU_DOTA", + "label": "˙ (dead)", + } + "ALGR(HU_9)": { + "key": "HU_ACUT", + "label": "´ (dead)", + } + "ALGR(HU_ODIA)": { + "key": "HU_DACU", + "label": "˝ (dead)", + } + "ALGR(HU_UDIA)": { + "key": "HU_DIAE", + "label": "¨ (dead)", + } + "ALGR(HU_OACU)": { + "key": "HU_CEDL", + "label": "¸ (dead)", + } + "ALGR(HU_Q)": { + "key": "HU_BSLS", + "label": "\\", + } + "ALGR(HU_W)": { + "key": "HU_PIPE", + "label": "|", + } + "ALGR(HU_E)": { + "key": "HU_CADI", + "label": "Ä", + } + "ALGR(HU_U)": { + "key": "HU_EURO", + "label": "€", + } + "ALGR(HU_ODAC)": { + "key": "HU_DIV", + "label": "÷", + } + "ALGR(HU_UACU)": { + "key": "HU_MUL", + "label": "×", + } + "ALGR(HU_A)": { + "key": "HU_LADI", + "label": "ä", + } + "ALGR(HU_S)": { + "key": "HU_LDST", + "label": "đ", + } + "ALGR(HU_D)": { + "key": "HU_CDST", + "label": "Đ", + } + "ALGR(HU_F)": { + "key": "HU_LBRC", + "label": "[", + } + "ALGR(HU_G)": { + "key": "HU_RBRC", + "label": "]", + } + "ALGR(HU_K)": { + "key": "HU_LLST", + "label": "ł", + } + "ALGR(HU_L)": { + "key": "HU_CLST", + "label": "Ł", + } + "ALGR(HU_EACU)": { + "key": "HU_DLR", + "label": "$", + } + "ALGR(HU_AACU)": { + "key": "HU_SS", + "label": "ß", + } + "ALGR(HU_UDAC)": { + "key": "HU_CURR", + "label": "¤", + } + "ALGR(HU_IACU)": { + "key": "HU_LABK", + "label": "<", + } + "ALGR(HU_Y)": { + "key": "HU_RABK", + "label": ">", + } + "ALGR(HU_X)": { + "key": "HU_HASH", + "label": "#", + } + "ALGR(HU_C)": { + "key": "HU_AMPR", + "label": "&", + } + "ALGR(HU_V)": { + "key": "HU_AT", + "label": "@", + } + "ALGR(HU_B)": { + "key": "HU_LCBR", + "label": "{", + } + "ALGR(HU_N)": { + "key": "HU_RCBR", + "label": "}", + } + "ALGR(HU_COMM)": { + "key": "HU_SCLN", + "label": ";", + } + "ALGR(HU_MINS)": { + "key": "HU_ASTR", + "label": "*", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_icelandic_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_icelandic_0.0.1.hjson new file mode 100644 index 0000000000..f4d6025a77 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_icelandic_0.0.1.hjson @@ -0,0 +1,355 @@ +{ + "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": "IS_RNGA", + "label": "° (dead)", + } + "KC_1": { + "key": "IS_1", + "label": "1", + } + "KC_2": { + "key": "IS_2", + "label": "2", + } + "KC_3": { + "key": "IS_3", + "label": "3", + } + "KC_4": { + "key": "IS_4", + "label": "4", + } + "KC_5": { + "key": "IS_5", + "label": "5", + } + "KC_6": { + "key": "IS_6", + "label": "6", + } + "KC_7": { + "key": "IS_7", + "label": "7", + } + "KC_8": { + "key": "IS_8", + "label": "8", + } + "KC_9": { + "key": "IS_9", + "label": "9", + } + "KC_0": { + "key": "IS_0", + "label": "0", + } + "KC_MINS": { + "key": "IS_ODIA", + "label": "Ö", + } + "KC_EQL": { + "key": "IS_MINS", + "label": "-", + } + "KC_Q": { + "key": "IS_Q", + "label": "Q", + } + "KC_W": { + "key": "IS_W", + "label": "W", + } + "KC_E": { + "key": "IS_E", + "label": "E", + } + "KC_R": { + "key": "IS_R", + "label": "R", + } + "KC_T": { + "key": "IS_T", + "label": "T", + } + "KC_Y": { + "key": "IS_Y", + "label": "Y", + } + "KC_U": { + "key": "IS_U", + "label": "U", + } + "KC_I": { + "key": "IS_I", + "label": "I", + } + "KC_O": { + "key": "IS_O", + "label": "O", + } + "KC_P": { + "key": "IS_P", + "label": "P", + } + "KC_LBRC": { + "key": "IS_ETH", + "label": "Ð", + } + "KC_RBRC": { + "key": "IS_QUOT", + "label": "'", + } + "KC_A": { + "key": "IS_A", + "label": "A", + } + "KC_S": { + "key": "IS_S", + "label": "S", + } + "KC_D": { + "key": "IS_D", + "label": "D", + } + "KC_F": { + "key": "IS_F", + "label": "F", + } + "KC_G": { + "key": "IS_G", + "label": "G", + } + "KC_H": { + "key": "IS_H", + "label": "H", + } + "KC_J": { + "key": "IS_J", + "label": "J", + } + "KC_K": { + "key": "IS_K", + "label": "K", + } + "KC_L": { + "key": "IS_L", + "label": "L", + } + "KC_SCLN": { + "key": "IS_AE", + "label": "Æ", + } + "KC_QUOT": { + "key": "IS_ACUT", + "label": "´ (dead)", + } + "KC_NUHS": { + "key": "IS_PLUS", + "label": "+", + } + "KC_NUBS": { + "key": "IS_LABK", + "label": "<", + } + "KC_Z": { + "key": "IS_Z", + "label": "Z", + } + "KC_X": { + "key": "IS_X", + "label": "X", + } + "KC_C": { + "key": "IS_C", + "label": "C", + } + "KC_V": { + "key": "IS_V", + "label": "V", + } + "KC_B": { + "key": "IS_B", + "label": "B", + } + "KC_N": { + "key": "IS_N", + "label": "N", + } + "KC_M": { + "key": "IS_M", + "label": "M", + } + "KC_COMM": { + "key": "IS_COMM", + "label": ",", + } + "KC_DOT": { + "key": "IS_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "IS_THRN", + "label": "Þ", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ │ _ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ? │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(IS_RNGA)": { + "key": "IS_DIAE", + "label": "¨ (dead)", + } + "S(IS_1)": { + "key": "IS_EXLM", + "label": "!", + } + "S(IS_2)": { + "key": "IS_DQUO", + "label": "\"", + } + "S(IS_3)": { + "key": "IS_HASH", + "label": "#", + } + "S(IS_4)": { + "key": "IS_DLR", + "label": "$", + } + "S(IS_5)": { + "key": "IS_PERC", + "label": "%", + } + "S(IS_6)": { + "key": "IS_AMPR", + "label": "&", + } + "S(IS_7)": { + "key": "IS_SLSH", + "label": "/", + } + "S(IS_8)": { + "key": "IS_LPRN", + "label": "(", + } + "S(IS_9)": { + "key": "IS_RPRN", + "label": ")", + } + "S(IS_0)": { + "key": "IS_EQL", + "label": "=", + } + "S(IS_MINS)": { + "key": "IS_UNDS", + "label": "_", + } + "S(IS_QUOT)": { + "key": "IS_QUES", + "label": "?", + } + "S(IS_PLUS)": { + "key": "IS_ASTR", + "label": "*", + } + "S(IS_LABK)": { + "key": "IS_RABK", + "label": ">", + } + "S(IS_COMM)": { + "key": "IS_SCLN", + "label": ";", + } + "S(IS_DOT)": { + "key": "IS_COLN", + "label": ":", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ │ │ │ │ │ │ { │ [ │ ] │ } │ \ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ @ │ │ € │ │ │ │ │ │ │ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ ` │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(IS_RNGA)": { + "key": "IS_DEG", + "label": "°", + } + "ALGR(IS_7)": { + "key": "IS_LCBR", + "label": "{", + } + "ALGR(IS_8)": { + "key": "IS_LBRC", + "label": "[", + } + "ALGR(IS_9)": { + "key": "IS_RBRC", + "label": "]", + } + "ALGR(IS_0)": { + "key": "IS_RCBR", + "label": "}", + } + "ALGR(IS_ODIA)": { + "key": "IS_BSLS", + "label": "\\", + } + "ALGR(IS_Q)": { + "key": "IS_AT", + "label": "@", + } + "ALGR(IS_E)": { + "key": "IS_EURO", + "label": "€", + } + "ALGR(IS_QUOT)": { + "key": "IS_TILD", + "label": "~", + } + "ALGR(IS_ACUT)": { + "key": "IS_CIRC", + "label": "^ (dead)", + } + "ALGR(IS_PLUS)": { + "key": "IS_GRV", + "label": "` (dead)", + } + "ALGR(IS_LABK)": { + "key": "IS_PIPE", + "label": "|", + } + "ALGR(IS_M)": { + "key": "IS_MICR", + "label": "µ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_irish_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_irish_0.0.1.hjson new file mode 100644 index 0000000000..94e553469e --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_irish_0.0.1.hjson @@ -0,0 +1,355 @@ +{ + "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": "IE_GRV", + "label": "`", + } + "KC_1": { + "key": "IE_1", + "label": "1", + } + "KC_2": { + "key": "IE_2", + "label": "2", + } + "KC_3": { + "key": "IE_3", + "label": "3", + } + "KC_4": { + "key": "IE_4", + "label": "4", + } + "KC_5": { + "key": "IE_5", + "label": "5", + } + "KC_6": { + "key": "IE_6", + "label": "6", + } + "KC_7": { + "key": "IE_7", + "label": "7", + } + "KC_8": { + "key": "IE_8", + "label": "8", + } + "KC_9": { + "key": "IE_9", + "label": "9", + } + "KC_0": { + "key": "IE_0", + "label": "0", + } + "KC_MINS": { + "key": "IE_MINS", + "label": "-", + } + "KC_EQL": { + "key": "IE_EQL", + "label": "=", + } + "KC_Q": { + "key": "IE_Q", + "label": "Q", + } + "KC_W": { + "key": "IE_W", + "label": "W", + } + "KC_E": { + "key": "IE_E", + "label": "E", + } + "KC_R": { + "key": "IE_R", + "label": "R", + } + "KC_T": { + "key": "IE_T", + "label": "T", + } + "KC_Y": { + "key": "IE_Y", + "label": "Y", + } + "KC_U": { + "key": "IE_U", + "label": "U", + } + "KC_I": { + "key": "IE_I", + "label": "I", + } + "KC_O": { + "key": "IE_O", + "label": "O", + } + "KC_P": { + "key": "IE_P", + "label": "P", + } + "KC_LBRC": { + "key": "IE_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "IE_RBRC", + "label": "]", + } + "KC_A": { + "key": "IE_A", + "label": "A", + } + "KC_S": { + "key": "IE_S", + "label": "S", + } + "KC_D": { + "key": "IE_D", + "label": "D", + } + "KC_F": { + "key": "IE_F", + "label": "F", + } + "KC_G": { + "key": "IE_G", + "label": "G", + } + "KC_H": { + "key": "IE_H", + "label": "H", + } + "KC_J": { + "key": "IE_J", + "label": "J", + } + "KC_K": { + "key": "IE_K", + "label": "K", + } + "KC_L": { + "key": "IE_L", + "label": "L", + } + "KC_SCLN": { + "key": "IE_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "IE_QUOT", + "label": "'", + } + "KC_NUHS": { + "key": "IE_HASH", + "label": "#", + } + "KC_NUBS": { + "key": "IE_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "IE_Z", + "label": "Z", + } + "KC_X": { + "key": "IE_X", + "label": "X", + } + "KC_C": { + "key": "IE_C", + "label": "C", + } + "KC_V": { + "key": "IE_V", + "label": "V", + } + "KC_B": { + "key": "IE_B", + "label": "B", + } + "KC_N": { + "key": "IE_N", + "label": "N", + } + "KC_M": { + "key": "IE_M", + "label": "M", + } + "KC_COMM": { + "key": "IE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "IE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "IE_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¬ │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ : │ @ │ ~ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(IE_GRV)": { + "key": "IE_NOT", + "label": "¬", + } + "S(IE_1)": { + "key": "IE_EXLM", + "label": "!", + } + "S(IE_2)": { + "key": "IE_DQUO", + "label": "\"", + } + "S(IE_3)": { + "key": "IE_PND", + "label": "£", + } + "S(IE_4)": { + "key": "IE_DLR", + "label": "$", + } + "S(IE_5)": { + "key": "IE_PERC", + "label": "%", + } + "S(IE_6)": { + "key": "IE_CIRC", + "label": "^", + } + "S(IE_7)": { + "key": "IE_AMPR", + "label": "&", + } + "S(IE_8)": { + "key": "IE_ASTR", + "label": "*", + } + "S(IE_9)": { + "key": "IE_LPRN", + "label": "(", + } + "S(IE_0)": { + "key": "IE_RPRN", + "label": ")", + } + "S(IE_MINS)": { + "key": "IE_UNDS", + "label": "_", + } + "S(IE_EQL)": { + "key": "IE_PLUS", + "label": "+", + } + "S(IE_LBRC)": { + "key": "IE_LCBR", + "label": "{", + } + "S(IE_RBRC)": { + "key": "IE_RCBR", + "label": "}", + } + "S(IE_SCLN)": { + "key": "IE_COLN", + "label": ":", + } + "S(IE_QUOT)": { + "key": "IE_AT", + "label": "@", + } + "S(IE_HASH)": { + "key": "IE_TILD", + "label": "~", + } + "S(IE_BSLS)": { + "key": "IE_PIPE", + "label": "|", + } + "S(IE_COMM)": { + "key": "IE_LABK", + "label": "<", + } + "S(IE_DOT)": { + "key": "IE_RABK", + "label": ">", + } + "S(IE_SLSH)": { + "key": "IE_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¦ │ │ │ │ € │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ É │ │ │ │ Ú │ Í │ Ó │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Á │ │ │ │ │ │ │ │ │ │ ´ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(IE_GRV)": { + "key": "IE_BRKP", + "label": "¦", + } + "ALGR(IE_4)": { + "key": "IE_EURO", + "label": "€", + } + "ALGR(IE_E)": { + "key": "IE_EACU", + "label": "É", + } + "ALGR(IE_U)": { + "key": "IE_UACU", + "label": "Ú", + } + "ALGR(IE_I)": { + "key": "IE_IACU", + "label": "Í", + } + "ALGR(IE_O)": { + "key": "IE_OACU", + "label": "Ó", + } + "ALGR(IE_A)": { + "key": "IE_AACU", + "label": "Á", + } + "ALGR(IE_QUOT)": { + "key": "IE_ACUT", + "label": "´ (dead)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_italian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_italian_0.0.1.hjson new file mode 100644 index 0000000000..951c564f62 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_italian_0.0.1.hjson @@ -0,0 +1,364 @@ +{ + "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": "IT_BSLS", + "label": "\\", + } + "KC_1": { + "key": "IT_1", + "label": "1", + } + "KC_2": { + "key": "IT_2", + "label": "2", + } + "KC_3": { + "key": "IT_3", + "label": "3", + } + "KC_4": { + "key": "IT_4", + "label": "4", + } + "KC_5": { + "key": "IT_5", + "label": "5", + } + "KC_6": { + "key": "IT_6", + "label": "6", + } + "KC_7": { + "key": "IT_7", + "label": "7", + } + "KC_8": { + "key": "IT_8", + "label": "8", + } + "KC_9": { + "key": "IT_9", + "label": "9", + } + "KC_0": { + "key": "IT_0", + "label": "0", + } + "KC_MINS": { + "key": "IT_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "IT_IGRV", + "label": "ì", + } + "KC_Q": { + "key": "IT_Q", + "label": "Q", + } + "KC_W": { + "key": "IT_W", + "label": "W", + } + "KC_E": { + "key": "IT_E", + "label": "E", + } + "KC_R": { + "key": "IT_R", + "label": "R", + } + "KC_T": { + "key": "IT_T", + "label": "T", + } + "KC_Y": { + "key": "IT_Y", + "label": "Y", + } + "KC_U": { + "key": "IT_U", + "label": "U", + } + "KC_I": { + "key": "IT_I", + "label": "I", + } + "KC_O": { + "key": "IT_O", + "label": "O", + } + "KC_P": { + "key": "IT_P", + "label": "P", + } + "KC_LBRC": { + "key": "IT_EGRV", + "label": "è", + } + "KC_RBRC": { + "key": "IT_PLUS", + "label": "+", + } + "KC_A": { + "key": "IT_A", + "label": "A", + } + "KC_S": { + "key": "IT_S", + "label": "S", + } + "KC_D": { + "key": "IT_D", + "label": "D", + } + "KC_F": { + "key": "IT_F", + "label": "F", + } + "KC_G": { + "key": "IT_G", + "label": "G", + } + "KC_H": { + "key": "IT_H", + "label": "H", + } + "KC_J": { + "key": "IT_J", + "label": "J", + } + "KC_K": { + "key": "IT_K", + "label": "K", + } + "KC_L": { + "key": "IT_L", + "label": "L", + } + "KC_SCLN": { + "key": "IT_OGRV", + "label": "ò", + } + "KC_QUOT": { + "key": "IT_AGRV", + "label": "à", + } + "KC_NUHS": { + "key": "IT_UGRV", + "label": "ù", + } + "KC_NUBS": { + "key": "IT_LABK", + "label": "<", + } + "KC_Z": { + "key": "IT_Z", + "label": "Z", + } + "KC_X": { + "key": "IT_X", + "label": "X", + } + "KC_C": { + "key": "IT_C", + "label": "C", + } + "KC_B": { + "key": "IT_B", + "label": "B", + } + "KC_V": { + "key": "IT_V", + "label": "V", + } + "KC_N": { + "key": "IT_N", + "label": "N", + } + "KC_M": { + "key": "IT_M", + "label": "M", + } + "KC_COMM": { + "key": "IT_COMM", + "label": ",", + } + "KC_DOT": { + "key": "IT_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "IT_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ | │ ! │ " │ £ │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ é │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ ç │ ° │ § │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(IT_BSLS)": { + "key": "IT_PIPE", + "label": "|", + } + "S(IT_1)": { + "key": "IT_EXLM", + "label": "!", + } + "S(IT_2)": { + "key": "IT_DQUO", + "label": "\"", + } + "S(IT_3)": { + "key": "IT_PND", + "label": "£", + } + "S(IT_4)": { + "key": "IT_DLR", + "label": "$", + } + "S(IT_5)": { + "key": "IT_PERC", + "label": "%", + } + "S(IT_6)": { + "key": "IT_AMPR", + "label": "&", + } + "S(IT_7)": { + "key": "IT_SLSH", + "label": "/", + } + "S(IT_8)": { + "key": "IT_LPRN", + "label": "(", + } + "S(IT_9)": { + "key": "IT_RPRN", + "label": ")", + } + "S(IT_0)": { + "key": "IT_EQL", + "label": "=", + } + "S(IT_QUOT)": { + "key": "IT_QUES", + "label": "?", + } + "S(IT_IGRV)": { + "key": "IT_CIRC", + "label": "^", + } + "S(IT_EGRV)": { + "key": "IT_EACU", + "label": "é", + } + "S(IT_PLUS)": { + "key": "IT_ASTR", + "label": "*", + } + "S(IT_OGRV)": { + "key": "IT_CCED", + "label": "ç", + } + "S(IT_AGRV)": { + "key": "IT_DEG", + "label": "°", + } + "S(IT_UGRV)": { + "key": "IT_SECT", + "label": "§", + } + "S(IT_LABK)": { + "key": "IT_RABK", + "label": ">", + } + "S(IT_DOT)": { + "key": "IT_COLN", + "label": ":", + } + "S(IT_COMM)": { + "key": "IT_SCLN", + "label": ";", + } + "S(IT_MINS)": { + "key": "IT_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ @ │ # │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(IT_E)": { + "key": "IT_EURO", + "label": "€", + } + "ALGR(IT_EGRV)": { + "key": "IT_LBRC", + "label": "[", + } + "ALGR(IT_PLUS)": { + "key": "IT_RBRC", + "label": "]", + } + "ALGR(IT_OGRV)": { + "key": "IT_AT", + "label": "@", + } + "ALGR(IT_AGRV)": { + "key": "IT_HASH", + "label": "#", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(IT_EGRV))": { + "key": "IT_LCBR", + "label": "{", + } + "S(ALGR(IT_PLUS))": { + "key": "IT_RCBR", + "label": "}", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_italian_mac_ansi_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_italian_mac_ansi_0.0.1.hjson new file mode 100644 index 0000000000..328755ca67 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_italian_mac_ansi_0.0.1.hjson @@ -0,0 +1,684 @@ +{ + "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": "IT_LABK", + "label": "<", + } + "KC_1": { + "key": "IT_1", + "label": "1", + } + "KC_2": { + "key": "IT_2", + "label": "2", + } + "KC_3": { + "key": "IT_3", + "label": "3", + } + "KC_4": { + "key": "IT_4", + "label": "4", + } + "KC_5": { + "key": "IT_5", + "label": "5", + } + "KC_6": { + "key": "IT_6", + "label": "6", + } + "KC_7": { + "key": "IT_7", + "label": "7", + } + "KC_8": { + "key": "IT_8", + "label": "8", + } + "KC_9": { + "key": "IT_9", + "label": "9", + } + "KC_0": { + "key": "IT_0", + "label": "0", + } + "KC_MINS": { + "key": "IT_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "IT_IGRV", + "label": "ì", + } + "KC_Q": { + "key": "IT_Q", + "label": "Q", + } + "KC_W": { + "key": "IT_W", + "label": "W", + } + "KC_E": { + "key": "IT_E", + "label": "E", + } + "KC_R": { + "key": "IT_R", + "label": "R", + } + "KC_T": { + "key": "IT_T", + "label": "T", + } + "KC_Y": { + "key": "IT_Y", + "label": "Y", + } + "KC_U": { + "key": "IT_U", + "label": "U", + } + "KC_I": { + "key": "IT_I", + "label": "I", + } + "KC_O": { + "key": "IT_O", + "label": "O", + } + "KC_P": { + "key": "IT_P", + "label": "P", + } + "KC_LBRC": { + "key": "IT_EGRV", + "label": "è", + } + "KC_RBRC": { + "key": "IT_PLUS", + "label": "+", + } + "KC_BSLS": { + "key": "IT_UGRV", + "label": "ù", + } + "KC_A": { + "key": "IT_A", + "label": "A", + } + "KC_S": { + "key": "IT_S", + "label": "S", + } + "KC_D": { + "key": "IT_D", + "label": "D", + } + "KC_F": { + "key": "IT_F", + "label": "F", + } + "KC_G": { + "key": "IT_G", + "label": "G", + } + "KC_H": { + "key": "IT_H", + "label": "H", + } + "KC_J": { + "key": "IT_J", + "label": "J", + } + "KC_K": { + "key": "IT_K", + "label": "K", + } + "KC_L": { + "key": "IT_L", + "label": "L", + } + "KC_SCLN": { + "key": "IT_OGRV", + "label": "ò", + } + "KC_QUOT": { + "key": "IT_AGRV", + "label": "à", + } + "KC_NUBS": { + "key": "IT_BSLS", + "label": "(backslash, not physically present)", + } + "KC_Z": { + "key": "IT_Z", + "label": "Z", + } + "KC_X": { + "key": "IT_X", + "label": "X", + } + "KC_C": { + "key": "IT_C", + "label": "C", + } + "KC_V": { + "key": "IT_V", + "label": "V", + } + "KC_B": { + "key": "IT_B", + "label": "B", + } + "KC_N": { + "key": "IT_N", + "label": "N", + } + "KC_M": { + "key": "IT_M", + "label": "M", + } + "KC_COMM": { + "key": "IT_COMM", + "label": ",", + } + "KC_DOT": { + "key": "IT_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "IT_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ > │ ! │ " │ £ │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ é │ * │ § │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ ç │ ° │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(IT_LABK)": { + "key": "IT_RABK", + "label": ">", + } + "S(IT_1)": { + "key": "IT_EXLM", + "label": "!", + } + "S(IT_2)": { + "key": "IT_DQUO", + "label": "\"", + } + "S(IT_3)": { + "key": "IT_PND", + "label": "£", + } + "S(IT_4)": { + "key": "IT_DLR", + "label": "$", + } + "S(IT_5)": { + "key": "IT_PERC", + "label": "%", + } + "S(IT_6)": { + "key": "IT_AMPR", + "label": "&", + } + "S(IT_7)": { + "key": "IT_SLSH", + "label": "/", + } + "S(IT_8)": { + "key": "IT_LPRN", + "label": "(", + } + "S(IT_9)": { + "key": "IT_RPRN", + "label": ")", + } + "S(IT_0)": { + "key": "IT_EQL", + "label": "=", + } + "S(IT_QUOT)": { + "key": "IT_QUES", + "label": "?", + } + "S(IT_IGRV)": { + "key": "IT_CIRC", + "label": "^", + } + "S(IT_EGRV)": { + "key": "IT_EACU", + "label": "é", + } + "S(IT_PLUS)": { + "key": "IT_ASTR", + "label": "*", + } + "S(IT_UGRV)": { + "key": "IT_SECT", + "label": "§", + } + "S(IT_OGRV)": { + "key": "IT_LCCE", + "label": "ç", + } + "S(IT_AGRV)": { + "key": "IT_DEG", + "label": "°", + } + "S(IT_BSLS)": { + "key": "IT_PIPE", + "label": "| (not physically present)", + } + "S(IT_COMM)": { + "key": "IT_SCLN", + "label": ";", + } + "S(IT_DOT)": { + "key": "IT_COLN", + "label": ":", + } + "S(IT_MINS)": { + "key": "IT_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ≤ │ « │ “ │ ‘ │ ¥ │ ~ │ ‹ │ ÷ │ ´ │ ` │ ≠ │ ¡ │ ˆ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ „ │ Ω │ € │ ® │ ™ │ Æ │ ¨ │ Œ │ Ø │ π │ [ │ ] │ ¶ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ Å │ ß │ ∂ │ ƒ │ ∞ │ ∆ │ ª │ º │ ¬ │ @ │ # │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ ∑ │ † │ © │ √ │ ∫ │ ˜ │ µ │ … │ • │ – │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(IT_LABK)": { + "key": "IT_LTEQ", + "label": "≤", + } + "A(IT_1)": { + "key": "IT_LDAQ", + "label": "«", + } + "A(IT_2)": { + "key": "IT_LDQU", + "label": "“", + } + "A(IT_3)": { + "key": "IT_LSQU", + "label": "‘", + } + "A(IT_4)": { + "key": "IT_YEN", + "label": "¥", + } + "A(IT_5)": { + "key": "IT_TILD", + "label": "~", + } + "A(IT_6)": { + "key": "IT_LSAQ", + "label": "‹", + } + "A(IT_7)": { + "key": "IT_DIV", + "label": "÷", + } + "A(IT_8)": { + "key": "IT_ACUT", + "label": "´ (dead)", + } + "A(IT_9)": { + "key": "IT_DGRV", + "label": "` (dead)", + } + "A(IT_0)": { + "key": "IT_NEQL", + "label": "≠", + } + "A(IT_QUOT)": { + "key": "IT_IEXL", + "label": "¡", + } + "A(IT_IGRV)": { + "key": "IT_DCIR", + "label": "ˆ (dead)", + } + "A(IT_Q)": { + "key": "IT_DLQU", + "label": "„", + } + "A(IT_W)": { + "key": "IT_OMEG", + "label": "Ω", + } + "A(IT_E)": { + "key": "IT_EURO", + "label": "€", + } + "A(IT_R)": { + "key": "IT_REGD", + "label": "®", + } + "A(IT_T)": { + "key": "IT_TM", + "label": "™", + } + "A(IT_Y)": { + "key": "IT_AE", + "label": "Æ", + } + "A(IT_U)": { + "key": "IT_DIAE", + "label": "¨ (dead)", + } + "A(IT_I)": { + "key": "IT_OE", + "label": "Œ", + } + "A(IT_O)": { + "key": "IT_OSTR", + "label": "Ø", + } + "A(IT_P)": { + "key": "IT_PI", + "label": "π", + } + "A(IT_EGRV)": { + "key": "IT_LBRC", + "label": "[", + } + "A(IT_PLUS)": { + "key": "IT_RBRC", + "label": "]", + } + "A(IT_A)": { + "key": "IT_ARNG", + "label": "Å", + } + "A(IT_S)": { + "key": "IT_SS", + "label": "ß", + } + "A(IT_D)": { + "key": "IT_PDIF", + "label": "∂", + } + "A(IT_F)": { + "key": "IT_FHK", + "label": "ƒ", + } + "A(IT_G)": { + "key": "IT_INFN", + "label": "∞", + } + "A(IT_H)": { + "key": "IT_INCR", + "label": "∆", + } + "A(IT_J)": { + "key": "IT_FORD", + "label": "ª", + } + "A(IT_K)": { + "key": "IT_MORD", + "label": "º", + } + "A(IT_L)": { + "key": "IT_NOT", + "label": "¬", + } + "A(IT_OGRV)": { + "key": "IT_AT", + "label": "@", + } + "A(IT_AGRV)": { + "key": "IT_HASH", + "label": "#", + } + "A(IT_UGRV)": { + "key": "IT_PILC", + "label": "¶", + } + "A(IT_BSLS)": { + "key": "IT_GRV", + "label": "` (not physically present)", + } + "A(IT_Z)": { + "key": "IT_NARS", + "label": "∑", + } + "A(IT_X)": { + "key": "IT_DAGG", + "label": "†", + } + "A(IT_C)": { + "key": "IT_COPY", + "label": "©", + } + "A(IT_V)": { + "key": "IT_SQRT", + "label": "√", + } + "A(IT_B)": { + "key": "IT_INTG", + "label": "∫", + } + "A(IT_N)": { + "key": "IT_STIL", + "label": "˜ (dead)", + } + "A(IT_M)": { + "key": "IT_MICR", + "label": "µ", + } + "A(IT_COMM)": { + "key": "IT_ELLP", + "label": "…", + } + "A(IT_DOT)": { + "key": "IT_BULT", + "label": "•", + } + "A(IT_MINS)": { + "key": "IT_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ≥ │ » │ ” │ ’ │ ¢ │ ‰ │ › │ ⁄ │  │ │ ≈ │ ¿ │ ± │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ ‚ │ À │ È │ Ì │ Ò │ │ Ù │ │ │ ∏ │ { │ } │ ◊ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ │ ¯ │ ˘ │ ˙ │ ˚ │ ¸ │ ˝ │ ˛ │ ˇ │ Ç │ ∞ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ ‡ │ Á │ É │ Í │ Ó │ Ú │ │ · │ — │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(IT_LABK))": { + "key": "IT_GTEQ", + "label": "≥", + } + "S(A(IT_1))": { + "key": "IT_RDAQ", + "label": "»", + } + "S(A(IT_2))": { + "key": "IT_RDQU", + "label": "”", + } + "S(A(IT_3))": { + "key": "IT_RSQU", + "label": "’", + } + "S(A(IT_4))": { + "key": "IT_CENT", + "label": "¢", + } + "S(A(IT_5))": { + "key": "IT_PERM", + "label": "‰", + } + "S(A(IT_6))": { + "key": "IT_RSAQ", + "label": "›", + } + "S(A(IT_7))": { + "key": "IT_FRSL", + "label": "⁄", + } + "S(A(IT_8))": { + "key": "IT_APPL", + "label": " (Apple logo)", + } + "S(A(IT_0))": { + "key": "IT_AEQL", + "label": "≈", + } + "S(A(IT_QUOT))": { + "key": "IT_IQUE", + "label": "¿", + } + "S(A(IT_IGRV))": { + "key": "IT_PLMN", + "label": "±", + } + "S(A(IT_Q))": { + "key": "IT_SLQU", + "label": "‚", + } + "S(A(IT_W))": { + "key": "IT_CAGR", + "label": "À", + } + "S(A(IT_E))": { + "key": "IT_CEGR", + "label": "È", + } + "S(A(IT_R))": { + "key": "IT_CIGR", + "label": "Ì", + } + "S(A(IT_T))": { + "key": "IT_COGR", + "label": "Ò", + } + "S(A(IT_U))": { + "key": "IT_CUGR", + "label": "Ù", + } + "S(A(IT_P))": { + "key": "IT_NARP", + "label": "∏", + } + "S(A(IT_EGRV))": { + "key": "IT_LCBR", + "label": "{", + } + "S(A(IT_PLUS))": { + "key": "IT_RCBR", + "label": "}", + } + "S(A(IT_UGRV))": { + "key": "IT_LOZN", + "label": "◊", + } + "S(A(IT_S))": { + "key": "IT_MACR", + "label": "¯", + } + "S(A(IT_D))": { + "key": "IT_BREV", + "label": "˘", + } + "S(A(IT_F))": { + "key": "IT_DOTA", + "label": "˙", + } + "S(A(IT_G))": { + "key": "IT_RGNA", + "label": "˚", + } + "S(A(IT_H))": { + "key": "IT_CEDL", + "label": "¸", + } + "S(A(IT_J))": { + "key": "IT_DACU", + "label": "˝", + } + "S(A(IT_K))": { + "key": "IT_OGON", + "label": "˛", + } + "S(A(IT_L))": { + "key": "IT_CARN", + "label": "ˇ", + } + "S(A(IT_OGRV))": { + "key": "IT_CCCE", + "label": "Ç", + } + "S(A(IT_X))": { + "key": "IT_DDAG", + "label": "‡", + } + "S(A(IT_C))": { + "key": "IT_CAAC", + "label": "Á", + } + "S(A(IT_V))": { + "key": "IT_CEAC", + "label": "É", + } + "S(A(IT_B))": { + "key": "IT_CIAC", + "label": "Í", + } + "S(A(IT_N))": { + "key": "IT_COAC", + "label": "Ó", + } + "S(A(IT_M))": { + "key": "IT_CUAC", + "label": "Ú", + } + "S(A(IT_DOT))": { + "key": "IT_MDDT", + "label": "·", + } + "S(A(IT_MINS))": { + "key": "IT_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_italian_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_italian_mac_iso_0.0.1.hjson new file mode 100644 index 0000000000..4beccd804a --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_italian_mac_iso_0.0.1.hjson @@ -0,0 +1,688 @@ +{ + "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": "IT_BSLS", + "label": "\\", + } + "KC_1": { + "key": "IT_1", + "label": "1", + } + "KC_2": { + "key": "IT_2", + "label": "2", + } + "KC_3": { + "key": "IT_3", + "label": "3", + } + "KC_4": { + "key": "IT_4", + "label": "4", + } + "KC_5": { + "key": "IT_5", + "label": "5", + } + "KC_6": { + "key": "IT_6", + "label": "6", + } + "KC_7": { + "key": "IT_7", + "label": "7", + } + "KC_8": { + "key": "IT_8", + "label": "8", + } + "KC_9": { + "key": "IT_9", + "label": "9", + } + "KC_0": { + "key": "IT_0", + "label": "0", + } + "KC_MINS": { + "key": "IT_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "IT_IGRV", + "label": "ì", + } + "KC_Q": { + "key": "IT_Q", + "label": "Q", + } + "KC_W": { + "key": "IT_W", + "label": "W", + } + "KC_E": { + "key": "IT_E", + "label": "E", + } + "KC_R": { + "key": "IT_R", + "label": "R", + } + "KC_T": { + "key": "IT_T", + "label": "T", + } + "KC_Y": { + "key": "IT_Y", + "label": "Y", + } + "KC_U": { + "key": "IT_U", + "label": "U", + } + "KC_I": { + "key": "IT_I", + "label": "I", + } + "KC_O": { + "key": "IT_O", + "label": "O", + } + "KC_P": { + "key": "IT_P", + "label": "P", + } + "KC_LBRC": { + "key": "IT_EGRV", + "label": "è", + } + "KC_RBRC": { + "key": "IT_PLUS", + "label": "+", + } + "KC_A": { + "key": "IT_A", + "label": "A", + } + "KC_S": { + "key": "IT_S", + "label": "S", + } + "KC_D": { + "key": "IT_D", + "label": "D", + } + "KC_F": { + "key": "IT_F", + "label": "F", + } + "KC_G": { + "key": "IT_G", + "label": "G", + } + "KC_H": { + "key": "IT_H", + "label": "H", + } + "KC_J": { + "key": "IT_J", + "label": "J", + } + "KC_K": { + "key": "IT_K", + "label": "K", + } + "KC_L": { + "key": "IT_L", + "label": "L", + } + "KC_SCLN": { + "key": "IT_OGRV", + "label": "ò", + } + "KC_QUOT": { + "key": "IT_AGRV", + "label": "à", + } + "KC_NUHS": { + "key": "IT_UGRV", + "label": "ù", + } + "KC_NUBS": { + "key": "IT_LABK", + "label": "<", + } + "KC_Z": { + "key": "IT_Z", + "label": "Z", + } + "KC_X": { + "key": "IT_X", + "label": "X", + } + "KC_C": { + "key": "IT_C", + "label": "C", + } + "KC_V": { + "key": "IT_V", + "label": "V", + } + "KC_B": { + "key": "IT_B", + "label": "B", + } + "KC_N": { + "key": "IT_N", + "label": "N", + } + "KC_M": { + "key": "IT_M", + "label": "M", + } + "KC_COMM": { + "key": "IT_COMM", + "label": ",", + } + "KC_DOT": { + "key": "IT_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "IT_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ | │ ! │ " │ £ │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ é │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ ç │ ° │ § │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(IT_BSLS)": { + "key": "IT_PIPE", + "label": "|", + } + "S(IT_1)": { + "key": "IT_EXLM", + "label": "!", + } + "S(IT_2)": { + "key": "IT_DQUO", + "label": "\"", + } + "S(IT_3)": { + "key": "IT_PND", + "label": "£", + } + "S(IT_4)": { + "key": "IT_DLR", + "label": "$", + } + "S(IT_5)": { + "key": "IT_PERC", + "label": "%", + } + "S(IT_6)": { + "key": "IT_AMPR", + "label": "&", + } + "S(IT_7)": { + "key": "IT_SLSH", + "label": "/", + } + "S(IT_8)": { + "key": "IT_LPRN", + "label": "(", + } + "S(IT_9)": { + "key": "IT_RPRN", + "label": ")", + } + "S(IT_0)": { + "key": "IT_EQL", + "label": "=", + } + "S(IT_QUOT)": { + "key": "IT_QUES", + "label": "?", + } + "S(IT_IGRV)": { + "key": "IT_CIRC", + "label": "^", + } + "S(IT_EGRV)": { + "key": "IT_EACU", + "label": "é", + } + "S(IT_PLUS)": { + "key": "IT_ASTR", + "label": "*", + } + "S(IT_OGRV)": { + "key": "IT_LCCE", + "label": "ç", + } + "S(IT_AGRV)": { + "key": "IT_DEG", + "label": "°", + } + "S(IT_UGRV)": { + "key": "IT_SECT", + "label": "§", + } + "S(IT_LABK)": { + "key": "IT_RABK", + "label": ">", + } + "S(IT_COMM)": { + "key": "IT_SCLN", + "label": ";", + } + "S(IT_DOT)": { + "key": "IT_COLN", + "label": ":", + } + "S(IT_MINS)": { + "key": "IT_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ` │ « │ “ │ ‘ │ ¥ │ ~ │ ‹ │ ÷ │ ´ │ ` │ ≠ │ ¡ │ ˆ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ „ │ Ω │ € │ ® │ ™ │ Æ │ ¨ │ Œ │ Ø │ π │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Å │ ß │ ∂ │ ƒ │ ∞ │ ∆ │ ª │ º │ ¬ │ @ │ # │ ¶ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≤ │ ∑ │ † │ © │ √ │ ∫ │ ˜ │ µ │ … │ • │ – │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(IT_BSLS)": { + "key": "IT_GRV", + "label": "`", + } + "A(IT_1)": { + "key": "IT_LDAQ", + "label": "«", + } + "A(IT_2)": { + "key": "IT_LDQU", + "label": "“", + } + "A(IT_3)": { + "key": "IT_LSQU", + "label": "‘", + } + "A(IT_4)": { + "key": "IT_YEN", + "label": "¥", + } + "A(IT_5)": { + "key": "IT_TILD", + "label": "~", + } + "A(IT_6)": { + "key": "IT_LSAQ", + "label": "‹", + } + "A(IT_7)": { + "key": "IT_DIV", + "label": "÷", + } + "A(IT_8)": { + "key": "IT_ACUT", + "label": "´ (dead)", + } + "A(IT_9)": { + "key": "IT_DGRV", + "label": "` (dead)", + } + "A(IT_0)": { + "key": "IT_NEQL", + "label": "≠", + } + "A(IT_QUOT)": { + "key": "IT_IEXL", + "label": "¡", + } + "A(IT_IGRV)": { + "key": "IT_DCIR", + "label": "ˆ (dead)", + } + "A(IT_Q)": { + "key": "IT_DLQU", + "label": "„", + } + "A(IT_W)": { + "key": "IT_OMEG", + "label": "Ω", + } + "A(IT_E)": { + "key": "IT_EURO", + "label": "€", + } + "A(IT_R)": { + "key": "IT_REGD", + "label": "®", + } + "A(IT_T)": { + "key": "IT_TM", + "label": "™", + } + "A(IT_Y)": { + "key": "IT_AE", + "label": "Æ", + } + "A(IT_U)": { + "key": "IT_DIAE", + "label": "¨ (dead)", + } + "A(IT_I)": { + "key": "IT_OE", + "label": "Œ", + } + "A(IT_O)": { + "key": "IT_OSTR", + "label": "Ø", + } + "A(IT_P)": { + "key": "IT_PI", + "label": "π", + } + "A(IT_EGRV)": { + "key": "IT_LBRC", + "label": "[", + } + "A(IT_PLUS)": { + "key": "IT_RBRC", + "label": "]", + } + "A(IT_A)": { + "key": "IT_ARNG", + "label": "Å", + } + "A(IT_S)": { + "key": "IT_SS", + "label": "ß", + } + "A(IT_D)": { + "key": "IT_PDIF", + "label": "∂", + } + "A(IT_F)": { + "key": "IT_FHK", + "label": "ƒ", + } + "A(IT_G)": { + "key": "IT_INFN", + "label": "∞", + } + "A(IT_H)": { + "key": "IT_INCR", + "label": "∆", + } + "A(IT_J)": { + "key": "IT_FORD", + "label": "ª", + } + "A(IT_K)": { + "key": "IT_MORD", + "label": "º", + } + "A(IT_L)": { + "key": "IT_NOT", + "label": "¬", + } + "A(IT_OGRV)": { + "key": "IT_AT", + "label": "@", + } + "A(IT_AGRV)": { + "key": "IT_HASH", + "label": "#", + } + "A(IT_UGRV)": { + "key": "IT_PILC", + "label": "¶", + } + "A(IT_LABK)": { + "key": "IT_LTEQ", + "label": "≤", + } + "A(IT_Z)": { + "key": "IT_NARS", + "label": "∑", + } + "A(IT_X)": { + "key": "IT_DAGG", + "label": "†", + } + "A(IT_C)": { + "key": "IT_COPY", + "label": "©", + } + "A(IT_V)": { + "key": "IT_SQRT", + "label": "√", + } + "A(IT_B)": { + "key": "IT_INTG", + "label": "∫", + } + "A(IT_N)": { + "key": "IT_STIL", + "label": "˜ (dead)", + } + "A(IT_M)": { + "key": "IT_MICR", + "label": "µ", + } + "A(IT_COMM)": { + "key": "IT_ELLP", + "label": "…", + } + "A(IT_DOT)": { + "key": "IT_BULT", + "label": "•", + } + "A(IT_MINS)": { + "key": "IT_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ı │ » │ ” │ ’ │ ¢ │ ‰ │ › │ ⁄ │  │ │ ≈ │ ¿ │ ± │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ ‚ │ À │ È │ Ì │ Ò │ │ Ù │ │ │ ∏ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ ¯ │ ˘ │ ˙ │ ˚ │ ¸ │ ˝ │ ˛ │ ˇ │ Ç │ │ ◊ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≥ │ │ ‡ │ Á │ É │ Í │ Ó │ Ú │ │ · │ — │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(IT_BSLS))": { + "key": "IT_DLSI", + "label": "ı", + } + "S(A(IT_1))": { + "key": "IT_RDAQ", + "label": "»", + } + "S(A(IT_2))": { + "key": "IT_RDQU", + "label": "”", + } + "S(A(IT_3))": { + "key": "IT_RSQU", + "label": "’", + } + "S(A(IT_4))": { + "key": "IT_CENT", + "label": "¢", + } + "S(A(IT_5))": { + "key": "IT_PERM", + "label": "‰", + } + "S(A(IT_6))": { + "key": "IT_RSAQ", + "label": "›", + } + "S(A(IT_7))": { + "key": "IT_FRSL", + "label": "⁄", + } + "S(A(IT_8))": { + "key": "IT_APPL", + "label": " (Apple logo)", + } + "S(A(IT_0))": { + "key": "IT_AEQL", + "label": "≈", + } + "S(A(IT_QUOT))": { + "key": "IT_IQUE", + "label": "¿", + } + "S(A(IT_IGRV))": { + "key": "IT_PLMN", + "label": "±", + } + "S(A(IT_Q))": { + "key": "IT_SLQU", + "label": "‚", + } + "S(A(IT_W))": { + "key": "IT_CAGR", + "label": "À", + } + "S(A(IT_E))": { + "key": "IT_CEGR", + "label": "È", + } + "S(A(IT_R))": { + "key": "IT_CIGR", + "label": "Ì", + } + "S(A(IT_T))": { + "key": "IT_COGR", + "label": "Ò", + } + "S(A(IT_U))": { + "key": "IT_CUGR", + "label": "Ù", + } + "S(A(IT_P))": { + "key": "IT_NARP", + "label": "∏", + } + "S(A(IT_EGRV))": { + "key": "IT_LCBR", + "label": "{", + } + "S(A(IT_PLUS))": { + "key": "IT_RCBR", + "label": "}", + } + "S(A(IT_S))": { + "key": "IT_MACR", + "label": "¯", + } + "S(A(IT_D))": { + "key": "IT_BREV", + "label": "˘", + } + "S(A(IT_F))": { + "key": "IT_DOTA", + "label": "˙", + } + "S(A(IT_G))": { + "key": "IT_RNGA", + "label": "˚", + } + "S(A(IT_H))": { + "key": "IT_CEDL", + "label": "¸", + } + "S(A(IT_J))": { + "key": "IT_DACU", + "label": "˝", + } + "S(A(IT_K))": { + "key": "IT_OGON", + "label": "˛", + } + "S(A(IT_L))": { + "key": "IT_CARN", + "label": "ˇ", + } + "S(A(IT_OGRV))": { + "key": "IT_CCCE", + "label": "Ç", + } + "S(A(IT_UGRV))": { + "key": "IT_LOZN", + "label": "◊", + } + "S(A(IT_LABK))": { + "key": "IT_GTEQ", + "label": "≥", + } + "S(A(IT_X))": { + "key": "IT_DDAG", + "label": "‡", + } + "S(A(IT_C))": { + "key": "IT_CAAC", + "label": "Á", + } + "S(A(IT_V))": { + "key": "IT_CEAC", + "label": "É", + } + "S(A(IT_B))": { + "key": "IT_CIAC", + "label": "Í", + } + "S(A(IT_N))": { + "key": "IT_COAC", + "label": "Ó", + } + "S(A(IT_M))": { + "key": "IT_CUAC", + "label": "Ú", + } + "S(A(IT_DOT))": { + "key": "IT_MDDT", + "label": "·", + } + "S(A(IT_MINS))": { + "key": "IT_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_japanese_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_japanese_0.0.1.hjson new file mode 100644 index 0000000000..d95712abd9 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_japanese_0.0.1.hjson @@ -0,0 +1,330 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Z↔H│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ @ │ [ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ Eisū │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ : │ ] │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ + * │ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \ │ │ + * ├─────┬──┴┬──┴──┬┴───┴┬──┴───┴──┬┴───┴┬──┴┬──┴┬──┴┬──┴┬─────┤ + * │ │ │ │Muhen│ │ Hen │K↔H│ │ │ │ │ + * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘ + */ + "KC_GRV": { + "key": "JP_ZKHK", + "label": "Zenkaku ↔ Hankaku ↔ Kanji (半角 ↔ 全角 ↔ 漢字)", + } + "KC_1": { + "key": "JP_1", + "label": "1", + } + "KC_2": { + "key": "JP_2", + "label": "2", + } + "KC_3": { + "key": "JP_3", + "label": "3", + } + "KC_4": { + "key": "JP_4", + "label": "4", + } + "KC_5": { + "key": "JP_5", + "label": "5", + } + "KC_6": { + "key": "JP_6", + "label": "6", + } + "KC_7": { + "key": "JP_7", + "label": "7", + } + "KC_8": { + "key": "JP_8", + "label": "8", + } + "KC_9": { + "key": "JP_9", + "label": "9", + } + "KC_0": { + "key": "JP_0", + "label": "0", + } + "KC_MINS": { + "key": "JP_MINS", + "label": "-", + } + "KC_EQL": { + "key": "JP_CIRC", + "label": "^", + } + "KC_INT3": { + "key": "JP_YEN", + "label": "¥", + } + "KC_Q": { + "key": "JP_Q", + "label": "Q", + } + "KC_W": { + "key": "JP_W", + "label": "W", + } + "KC_E": { + "key": "JP_E", + "label": "E", + } + "KC_R": { + "key": "JP_R", + "label": "R", + } + "KC_T": { + "key": "JP_T", + "label": "T", + } + "KC_Y": { + "key": "JP_Y", + "label": "Y", + } + "KC_U": { + "key": "JP_U", + "label": "U", + } + "KC_I": { + "key": "JP_I", + "label": "I", + } + "KC_O": { + "key": "JP_O", + "label": "O", + } + "KC_P": { + "key": "JP_P", + "label": "P", + } + "KC_LBRC": { + "key": "JP_AT", + "label": "@", + } + "KC_RBRC": { + "key": "JP_LBRC", + "label": "[", + } + "KC_CAPS": { + "key": "JP_EISU", + "label": "Eisū (英数)", + } + "KC_A": { + "key": "JP_A", + "label": "A", + } + "KC_S": { + "key": "JP_S", + "label": "S", + } + "KC_D": { + "key": "JP_D", + "label": "D", + } + "KC_F": { + "key": "JP_F", + "label": "F", + } + "KC_G": { + "key": "JP_G", + "label": "G", + } + "KC_H": { + "key": "JP_H", + "label": "H", + } + "KC_J": { + "key": "JP_J", + "label": "J", + } + "KC_K": { + "key": "JP_K", + "label": "K", + } + "KC_L": { + "key": "JP_L", + "label": "L", + } + "KC_SCLN": { + "key": "JP_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "JP_COLN", + "label": ":", + } + "KC_NUHS": { + "key": "JP_RBRC", + "label": "]", + } + "KC_Z": { + "key": "JP_Z", + "label": "Z", + } + "KC_X": { + "key": "JP_X", + "label": "X", + } + "KC_C": { + "key": "JP_C", + "label": "C", + } + "KC_V": { + "key": "JP_V", + "label": "V", + } + "KC_B": { + "key": "JP_B", + "label": "B", + } + "KC_N": { + "key": "JP_N", + "label": "N", + } + "KC_M": { + "key": "JP_M", + "label": "M", + } + "KC_COMM": { + "key": "JP_COMM", + "label": ",", + } + "KC_DOT": { + "key": "JP_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "JP_SLSH", + "label": "/", + } + "KC_INT1": { + "key": "JP_BSLS", + "label": "\\", + } + "KC_INT5": { + "key": "JP_MHEN", + "label": "Muhenkan (無変換)", + } + "KC_INT4": { + "key": "JP_HENK", + "label": "Henkan (変換)", + } + "KC_INT2": { + "key": "JP_KANA", + "label": "Katakana ↔ Hiragana ↔ Rōmaji (カタカナ ↔ ひらがな ↔ ローマ字)", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ ! │ " │ # │ $ │ % │ & │ ' │ ( │ ) │ │ = │ ~ │ | │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ` │ { │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ Caps │ │ │ │ │ │ │ │ │ │ + │ * │ } │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ _ │ │ + * ├─────┬──┴┬──┴──┬┴───┴┬──┴───┴──┬┴───┴┬──┴┬──┴┬──┴┬──┴┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘ + */ + "S(JP_1)": { + "key": "JP_EXLM", + "label": "!", + } + "S(JP_2)": { + "key": "JP_DQUO", + "label": "\"", + } + "S(JP_3)": { + "key": "JP_HASH", + "label": "#", + } + "S(JP_4)": { + "key": "JP_DLR", + "label": "$", + } + "S(JP_5)": { + "key": "JP_PERC", + "label": "%", + } + "S(JP_6)": { + "key": "JP_AMPR", + "label": "&", + } + "S(JP_7)": { + "key": "JP_QUOT", + "label": "'", + } + "S(JP_8)": { + "key": "JP_LPRN", + "label": "(", + } + "S(JP_9)": { + "key": "JP_RPRN", + "label": ")", + } + "S(JP_MINS)": { + "key": "JP_EQL", + "label": "=", + } + "S(JP_CIRC)": { + "key": "JP_TILD", + "label": "~", + } + "S(JP_YEN)": { + "key": "JP_PIPE", + "label": "|", + } + "S(JP_AT)": { + "key": "JP_GRV", + "label": "`", + } + "S(JP_LBRC)": { + "key": "JP_LCBR", + "label": "{", + } + "S(JP_EISU)": { + "key": "JP_CAPS", + "label": "Caps Lock", + } + "S(JP_SCLN)": { + "key": "JP_PLUS", + "label": "+", + } + "S(JP_COLN)": { + "key": "JP_ASTR", + "label": "*", + } + "S(JP_RBRC)": { + "key": "JP_RCBR", + "label": "}", + } + "S(JP_COMM)": { + "key": "JP_LABK", + "label": "<", + } + "S(JP_DOT)": { + "key": "JP_RABK", + "label": ">", + } + "S(JP_SLSH)": { + "key": "JP_QUES", + "label": "?", + } + "S(JP_BSLS)": { + "key": "JP_UNDS", + "label": "_", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_korean_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_korean_0.0.1.hjson new file mode 100644 index 0000000000..5ee19c9e4e --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_korean_0.0.1.hjson @@ -0,0 +1,310 @@ +{ + "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 │ , │ . │ / │ │ + * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┴───┴──┬┴──┬┴───┴┬──┴┬───┬─────┤ + * │ │ │ │Hnj│ │H↔Y│ │ │ │ │ + * └─────┴───┴─────┴───┴───────────────┴───┴─────┴───┴───┴─────┘ + */ + "KC_GRV": { + "key": "KR_GRV", + "label": "`", + } + "KC_1": { + "key": "KR_1", + "label": "1", + } + "KC_2": { + "key": "KR_2", + "label": "2", + } + "KC_3": { + "key": "KR_3", + "label": "3", + } + "KC_4": { + "key": "KR_4", + "label": "4", + } + "KC_5": { + "key": "KR_5", + "label": "5", + } + "KC_6": { + "key": "KR_6", + "label": "6", + } + "KC_7": { + "key": "KR_7", + "label": "7", + } + "KC_8": { + "key": "KR_8", + "label": "8", + } + "KC_9": { + "key": "KR_9", + "label": "9", + } + "KC_0": { + "key": "KR_0", + "label": "0", + } + "KC_MINS": { + "key": "KR_MINS", + "label": "-", + } + "KC_EQL": { + "key": "KR_EQL", + "label": "=", + } + "KC_Q": { + "key": "KR_Q", + "label": "Q", + } + "KC_W": { + "key": "KR_W", + "label": "W", + } + "KC_E": { + "key": "KR_E", + "label": "E", + } + "KC_R": { + "key": "KR_R", + "label": "R", + } + "KC_T": { + "key": "KR_T", + "label": "T", + } + "KC_Y": { + "key": "KR_Y", + "label": "Y", + } + "KC_U": { + "key": "KR_U", + "label": "U", + } + "KC_I": { + "key": "KR_I", + "label": "I", + } + "KC_O": { + "key": "KR_O", + "label": "O", + } + "KC_P": { + "key": "KR_P", + "label": "P", + } + "KC_LBRC": { + "key": "KR_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "KR_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "KR_WON", + "label": "₩", + } + "KC_A": { + "key": "KR_A", + "label": "A", + } + "KC_S": { + "key": "KR_S", + "label": "S", + } + "KC_D": { + "key": "KR_D", + "label": "D", + } + "KC_F": { + "key": "KR_F", + "label": "F", + } + "KC_G": { + "key": "KR_G", + "label": "G", + } + "KC_H": { + "key": "KR_H", + "label": "H", + } + "KC_J": { + "key": "KR_J", + "label": "J", + } + "KC_K": { + "key": "KR_K", + "label": "K", + } + "KC_L": { + "key": "KR_L", + "label": "L", + } + "KC_SCLN": { + "key": "KR_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "KR_QUOT", + "label": "'", + } + "KC_Z": { + "key": "KR_Z", + "label": "Z", + } + "KC_X": { + "key": "KR_X", + "label": "X", + } + "KC_C": { + "key": "KR_C", + "label": "C", + } + "KC_V": { + "key": "KR_V", + "label": "V", + } + "KC_B": { + "key": "KR_B", + "label": "B", + } + "KC_N": { + "key": "KR_N", + "label": "N", + } + "KC_M": { + "key": "KR_M", + "label": "M", + } + "KC_COMM": { + "key": "KR_COMM", + "label": ",", + } + "KC_DOT": { + "key": "KR_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "KR_SLSH", + "label": "/", + } + "KC_LNG2": { + "key": "KR_HANJ", + "label": "Hanja (한자)", + } + "KC_LNG1": { + "key": "KR_HAEN", + "label": "Han ↔ Yeong (한 ↔ 영)", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┴───┴──┬┴──┬┴───┴┬──┴┬───┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └─────┴───┴─────┴───┴───────────────┴───┴─────┴───┴───┴─────┘ + */ + "S(KR_GRV)": { + "key": "KR_TILD", + "label": "~", + } + "S(KR_1)": { + "key": "KR_EXLM", + "label": "!", + } + "S(KR_2)": { + "key": "KR_AT", + "label": "@", + } + "S(KR_3)": { + "key": "KR_HASH", + "label": "#", + } + "S(KR_4)": { + "key": "KR_DLR", + "label": "$", + } + "S(KR_5)": { + "key": "KR_PERC", + "label": "%", + } + "S(KR_6)": { + "key": "KR_CIRC", + "label": "^", + } + "S(KR_7)": { + "key": "KR_AMPR", + "label": "&", + } + "S(KR_8)": { + "key": "KR_ASTR", + "label": "*", + } + "S(KR_9)": { + "key": "KR_LPRN", + "label": "(", + } + "S(KR_0)": { + "key": "KR_RPRN", + "label": ")", + } + "S(KR_MINS)": { + "key": "KR_UNDS", + "label": "_", + } + "S(KR_EQL)": { + "key": "KR_PLUS", + "label": "+", + } + "S(KR_LBRC)": { + "key": "KR_LCBR", + "label": "{", + } + "S(KR_RBRC)": { + "key": "KR_RCBR", + "label": "}", + } + "S(KR_WON)": { + "key": "KR_PIPE", + "label": "|", + } + "S(KR_SCLN)": { + "key": "KR_COLN", + "label": ":", + } + "S(KR_QUOT)": { + "key": "KR_DQUO", + "label": "\"", + } + "S(KR_COMM)": { + "key": "KR_LABK", + "label": "<", + } + "S(KR_DOT)": { + "key": "KR_RABK", + "label": ">", + } + "S(KR_SLSH)": { + "key": "KR_QUES", + "label": "?", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_latvian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_latvian_0.0.1.hjson new file mode 100644 index 0000000000..ab80f0fdd9 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_latvian_0.0.1.hjson @@ -0,0 +1,440 @@ +{ + "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": "LV_GRV", + "label": "`", + } + "KC_1": { + "key": "LV_1", + "label": "1", + } + "KC_2": { + "key": "LV_2", + "label": "2", + } + "KC_3": { + "key": "LV_3", + "label": "3", + } + "KC_4": { + "key": "LV_4", + "label": "4", + } + "KC_5": { + "key": "LV_5", + "label": "5", + } + "KC_6": { + "key": "LV_6", + "label": "6", + } + "KC_7": { + "key": "LV_7", + "label": "7", + } + "KC_8": { + "key": "LV_8", + "label": "8", + } + "KC_9": { + "key": "LV_9", + "label": "9", + } + "KC_0": { + "key": "LV_0", + "label": "0", + } + "KC_MINS": { + "key": "LV_MINS", + "label": "-", + } + "KC_EQL": { + "key": "LV_EQL", + "label": "=", + } + "KC_Q": { + "key": "LV_Q", + "label": "Q", + } + "KC_W": { + "key": "LV_W", + "label": "W", + } + "KC_E": { + "key": "LV_E", + "label": "E", + } + "KC_R": { + "key": "LV_R", + "label": "R", + } + "KC_T": { + "key": "LV_T", + "label": "T", + } + "KC_Y": { + "key": "LV_Y", + "label": "Y", + } + "KC_U": { + "key": "LV_U", + "label": "U", + } + "KC_I": { + "key": "LV_I", + "label": "I", + } + "KC_O": { + "key": "LV_O", + "label": "O", + } + "KC_P": { + "key": "LV_P", + "label": "P", + } + "KC_LBRC": { + "key": "LV_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "LV_RBRC", + "label": "]", + } + "KC_A": { + "key": "LV_A", + "label": "A", + } + "KC_S": { + "key": "LV_S", + "label": "S", + } + "KC_D": { + "key": "LV_D", + "label": "D", + } + "KC_F": { + "key": "LV_F", + "label": "F", + } + "KC_G": { + "key": "LV_G", + "label": "G", + } + "KC_H": { + "key": "LV_H", + "label": "H", + } + "KC_J": { + "key": "LV_J", + "label": "J", + } + "KC_K": { + "key": "LV_K", + "label": "K", + } + "KC_L": { + "key": "LV_L", + "label": "L", + } + "KC_SCLN": { + "key": "LV_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "LV_QUOT", + "label": "' (dead)", + } + "KC_NUHS": { + "key": "LV_BSLS", + "label": "\\", + } + "KC_NUBS": { + "key": "LV_NUBS", + "label": "\\", + } + "KC_Z": { + "key": "LV_Z", + "label": "Z", + } + "KC_X": { + "key": "LV_X", + "label": "X", + } + "KC_C": { + "key": "LV_C", + "label": "C", + } + "KC_V": { + "key": "LV_V", + "label": "V", + } + "KC_B": { + "key": "LV_B", + "label": "B", + } + "KC_N": { + "key": "LV_N", + "label": "N", + } + "KC_M": { + "key": "LV_M", + "label": "M", + } + "KC_COMM": { + "key": "LV_COMM", + "label": ",", + } + "KC_DOT": { + "key": "LV_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "LV_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ : │ " │ | │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(LV_GRV)": { + "key": "LV_TILD", + "label": "~", + } + "S(LV_1)": { + "key": "LV_EXLM", + "label": "!", + } + "S(LV_2)": { + "key": "LV_AT", + "label": "@", + } + "S(LV_3)": { + "key": "LV_HASH", + "label": "#", + } + "S(LV_4)": { + "key": "LV_DLR", + "label": "$", + } + "S(LV_5)": { + "key": "LV_PERC", + "label": "%", + } + "S(LV_6)": { + "key": "LV_CIRC", + "label": "^", + } + "S(LV_7)": { + "key": "LV_AMPR", + "label": "&", + } + "S(LV_8)": { + "key": "LV_ASTR", + "label": "*", + } + "S(LV_9)": { + "key": "LV_LPRN", + "label": "(", + } + "S(LV_0)": { + "key": "LV_RPRN", + "label": ")", + } + "S(LV_MINS)": { + "key": "LV_UNDS", + "label": "_", + } + "S(LV_EQL)": { + "key": "LV_PLUS", + "label": "+", + } + "S(LV_LBRC)": { + "key": "LV_LCBR", + "label": "{", + } + "S(LV_RBRC)": { + "key": "LV_RCBR", + "label": "}", + } + "S(LV_SCLN)": { + "key": "LV_COLN", + "label": ":", + } + "S(LV_QUOT)": { + "key": "LV_DQUO", + "label": "\" (dead)", + } + "S(LV_BSLS)": { + "key": "LV_PIPE", + "label": "|", + } + "S(LV_COMM)": { + "key": "LV_LABK", + "label": "<", + } + "S(LV_DOT)": { + "key": "LV_RABK", + "label": ">", + } + "S(LV_SLSH)": { + "key": "LV_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ - │ │ « │ » │ € │ │ ’ │ │ │ │ │ – │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ Ē │ Ŗ │ │ │ Ū │ Ī │ Ō │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Ā │ Š │ │ │ Ģ │ │ │ Ķ │ Ļ │ │ ´ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ Ž │ │ Č │ │ │ Ņ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(LV_GRV)": { + "key": "LV_SHYP", + "label": "­ (soft hyphen)", + } + "ALGR(LV_1)": { + "key": "LV_NBSP", + "label": "(non-breaking space)", + } + "ALGR(LV_2)": { + "key": "LV_LDAQ", + "label": "«", + } + "ALGR(LV_3)": { + "key": "LV_RDAQ", + "label": "»", + } + "ALGR(LV_4)": { + "key": "LV_EURO", + "label": "€", + } + "ALGR(LV_6)": { + "key": "LV_RSQU", + "label": "’", + } + "ALGR(LV_MINS)": { + "key": "LV_NDSH", + "label": "–", + } + "ALGR(LV_E)": { + "key": "LV_EMAC", + "label": "Ē", + } + "ALGR(LV_R)": { + "key": "LV_RCED", + "label": "Ŗ", + } + "ALGR(LV_U)": { + "key": "LV_UMAC", + "label": "Ū", + } + "ALGR(LV_I)": { + "key": "LV_IMAC", + "label": "Ī", + } + "ALGR(LV_O)": { + "key": "LV_OMAC", + "label": "Ō", + } + "ALGR(LV_A)": { + "key": "LV_AMAC", + "label": "Ā", + } + "ALGR(LV_S)": { + "key": "LV_SCAR", + "label": "Š", + } + "ALGR(LV_G)": { + "key": "LV_GCED", + "label": "Ģ", + } + "ALGR(LV_K)": { + "key": "LV_KCED", + "label": "Ķ", + } + "ALGR(LV_L)": { + "key": "LV_LCED", + "label": "Ļ", + } + "ALGR(LV_QUOT)": { + "key": "LV_ACUT", + "label": "´ (dead)", + } + "ALGR(LV_Z)": { + "key": "LV_ZCAR", + "label": "Ž", + } + "ALGR(LV_C)": { + "key": "LV_CCAR", + "label": "Č", + } + "ALGR(LV_N)": { + "key": "LV_NCED", + "label": "Ņ", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ § │ ° │ │ ± │ × │ │ │ — │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(LV_4))": { + "key": "LV_SECT", + "label": "§", + } + "S(ALGR(LV_5))": { + "key": "LV_DEG", + "label": "°", + } + "S(ALGR(LV_7))": { + "key": "LV_PLMN", + "label": "±", + } + "S(ALGR(LV_8))": { + "key": "LV_MUL", + "label": "×", + } + "S(ALGR(LV_MINS))": { + "key": "LV_MDSH", + "label": "—", + } + "S(ALGR(LV_QUOT))": { + "key": "LV_DIAE", + "label": "¨ (dead)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_lithuanian_azerty_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_lithuanian_azerty_0.0.1.hjson new file mode 100644 index 0000000000..dfb527878e --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_lithuanian_azerty_0.0.1.hjson @@ -0,0 +1,375 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ ! │ - │ / │ ; │ : │ , │ . │ = │ ( │ ) │ ? │ X │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Ą │ Ž │ E │ R │ T │ Y │ U │ I │ O │ P │ Į │ W │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ Š │ G │ H │ J │ K │ L │ Ų │ Ė │ Q │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Z │ Ū │ C │ V │ B │ N │ M │ Č │ F │ Ę │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "LT_GRV", + "label": "`", + } + "KC_1": { + "key": "LT_EXLM", + "label": "!", + } + "KC_2": { + "key": "LT_MINS", + "label": "-", + } + "KC_3": { + "key": "LT_SLSH", + "label": "/", + } + "KC_4": { + "key": "LT_SCLN", + "label": ";", + } + "KC_5": { + "key": "LT_COLN", + "label": ":", + } + "KC_6": { + "key": "LT_COMM", + "label": ",", + } + "KC_7": { + "key": "LT_DOT", + "label": ".", + } + "KC_8": { + "key": "LT_EQL", + "label": "=", + } + "KC_9": { + "key": "LT_LPRN", + "label": "(", + } + "KC_0": { + "key": "LT_RPRN", + "label": ")", + } + "KC_MINS": { + "key": "LT_QUES", + "label": "?", + } + "KC_EQL": { + "key": "LT_X", + "label": "X", + } + "KC_Q": { + "key": "LT_AOGO", + "label": "Ą", + } + "KC_W": { + "key": "LT_ZCAR", + "label": "Ž", + } + "KC_E": { + "key": "LT_E", + "label": "E", + } + "KC_R": { + "key": "LT_R", + "label": "R", + } + "KC_T": { + "key": "LT_T", + "label": "T", + } + "KC_Y": { + "key": "LT_Y", + "label": "Y", + } + "KC_U": { + "key": "LT_U", + "label": "U", + } + "KC_I": { + "key": "LT_I", + "label": "I", + } + "KC_O": { + "key": "LT_O", + "label": "O", + } + "KC_P": { + "key": "LT_P", + "label": "P", + } + "KC_LBRC": { + "key": "LT_IOGO", + "label": "Į", + } + "KC_RBRC": { + "key": "LT_W", + "label": "W", + } + "KC_A": { + "key": "LT_A", + "label": "A", + } + "KC_S": { + "key": "LT_S", + "label": "S", + } + "KC_D": { + "key": "LT_D", + "label": "D", + } + "KC_F": { + "key": "LT_SCAR", + "label": "Š", + } + "KC_G": { + "key": "LT_G", + "label": "G", + } + "KC_H": { + "key": "LT_H", + "label": "H", + } + "KC_J": { + "key": "LT_J", + "label": "J", + } + "KC_K": { + "key": "LT_K", + "label": "K", + } + "KC_L": { + "key": "LT_L", + "label": "L", + } + "KC_SCLN": { + "key": "LT_UOGO", + "label": "Ų", + } + "KC_QUOT": { + "key": "LT_EDOT", + "label": "Ė", + } + "KC_NUHS": { + "key": "LT_Q", + "label": "Q", + } + "KC_NUBS": { + "key": "LT_LABK", + "label": "<", + } + "KC_Z": { + "key": "LT_Z", + "label": "Z", + } + "KC_X": { + "key": "LT_UMAC", + "label": "Ū", + } + "KC_C": { + "key": "LT_C", + "label": "C", + } + "KC_V": { + "key": "LT_V", + "label": "V", + } + "KC_B": { + "key": "LT_B", + "label": "B", + } + "KC_N": { + "key": "LT_N", + "label": "N", + } + "KC_M": { + "key": "LT_M", + "label": "M", + } + "KC_COMM": { + "key": "LT_CCAR", + "label": "Č", + } + "KC_DOT": { + "key": "LT_F", + "label": "F", + } + "KC_SLSH": { + "key": "LT_EOGO", + "label": "Ę", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ + │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(LT_GRV)": { + "key": "LT_TILD", + "label": "~", + } + "S(LT_EXLM)": { + "key": "LT_1", + "label": "1", + } + "S(LT_MINS)": { + "key": "LT_2", + "label": "2", + } + "S(LT_SLSH)": { + "key": "LT_3", + "label": "3", + } + "S(LT_SCLN)": { + "key": "LT_4", + "label": "4", + } + "S(LT_COLN)": { + "key": "LT_5", + "label": "5", + } + "S(LT_COMM)": { + "key": "LT_6", + "label": "6", + } + "S(LT_DOT)": { + "key": "LT_7", + "label": "7", + } + "S(LT_EQL)": { + "key": "LT_8", + "label": "8", + } + "S(LT_LPRN)": { + "key": "LT_9", + "label": "9", + } + "S(LT_RPRN)": { + "key": "LT_0", + "label": "0", + } + "S(LT_QUES)": { + "key": "LT_PLUS", + "label": "+", + } + "S(LT_LABK)": { + "key": "LT_RABK", + "label": ">", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ´ │ @ │ _ │ # │ $ │ § │ ^ │ & │ * │ [ │ ] │ ' │ % │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ " │ | │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ – │ │ │ │ │ │ │ │ „ │ “ │ \ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(LT_GRV)": { + "key": "LT_ACUT", + "label": "´", + } + "ALGR(LT_EXLM)": { + "key": "LT_AT", + "label": "@", + } + "ALGR(LT_MINS)": { + "key": "LT_UNDS", + "label": "_", + } + "ALGR(LT_SLSH)": { + "key": "LT_HASH", + "label": "#", + } + "ALGR(LT_SCLN)": { + "key": "LT_DLR", + "label": "$", + } + "ALGR(LT_COLN)": { + "key": "LT_SECT", + "label": "§", + } + "ALGR(LT_COMM)": { + "key": "LT_CIRC", + "label": "^", + } + "ALGR(LT_DOT)": { + "key": "LT_AMPR", + "label": "&", + } + "ALGR(LT_EQL)": { + "key": "LT_ASTR", + "label": "*", + } + "ALGR(LT_LPRN)": { + "key": "LT_LBRC", + "label": "[", + } + "ALGR(LT_RPRN)": { + "key": "LT_RBRC", + "label": "]", + } + "ALGR(LT_QUES)": { + "key": "LT_QUOT", + "label": "'", + } + "ALGR(LT_X)": { + "key": "LT_PERC", + "label": "%", + } + "ALGR(LT_E)": { + "key": "LT_EURO", + "label": "€", + } + "ALGR(LT_IOGO)": { + "key": "LT_LCBR", + "label": "{", + } + "ALGR(LT_W)": { + "key": "LT_RCBR", + "label": "}", + } + "ALGR(LT_EDOT)": { + "key": "LT_DQUO", + "label": "\"", + } + "ALGR(LT_Q)": { + "key": "LT_PIPE", + "label": "|", + } + "ALGR(LT_LABK)": { + "key": "LT_NDSH", + "label": "–", + } + "ALGR(LT_CCAR)": { + "key": "LT_DLQU", + "label": "„", + } + "ALGR(LT_F)": { + "key": "LT_LDQU", + "label": "“", + } + "ALGR(LT_EOGO)": { + "key": "LT_BSLS", + "label": "\\", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_lithuanian_qwerty_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_lithuanian_qwerty_0.0.1.hjson new file mode 100644 index 0000000000..a4ea30d592 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_lithuanian_qwerty_0.0.1.hjson @@ -0,0 +1,368 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ Ą │ Č │ Ę │ Ė │ Į │ Š │ Ų │ Ū │ 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": "LT_GRV", + "label": "`", + } + "KC_1": { + "key": "LT_AOGO", + "label": "Ą", + } + "KC_2": { + "key": "LT_CCAR", + "label": "Č", + } + "KC_3": { + "key": "LT_EOGO", + "label": "Ę", + } + "KC_4": { + "key": "LT_EDOT", + "label": "Ė", + } + "KC_5": { + "key": "LT_IOGO", + "label": "Į", + } + "KC_6": { + "key": "LT_SCAR", + "label": "Š", + } + "KC_7": { + "key": "LT_UOGO", + "label": "Ų", + } + "KC_8": { + "key": "LT_UMAC", + "label": "Ū", + } + "KC_9": { + "key": "LT_9", + "label": "9", + } + "KC_0": { + "key": "LT_0", + "label": "0", + } + "KC_MINS": { + "key": "LT_MINS", + "label": "-", + } + "KC_EQL": { + "key": "LT_ZCAR", + "label": "Ž", + } + "KC_Q": { + "key": "LT_Q", + "label": "Q", + } + "KC_W": { + "key": "LT_W", + "label": "W", + } + "KC_E": { + "key": "LT_E", + "label": "E", + } + "KC_R": { + "key": "LT_R", + "label": "R", + } + "KC_T": { + "key": "LT_T", + "label": "T", + } + "KC_Y": { + "key": "LT_Y", + "label": "Y", + } + "KC_U": { + "key": "LT_U", + "label": "U", + } + "KC_I": { + "key": "LT_I", + "label": "I", + } + "KC_O": { + "key": "LT_O", + "label": "O", + } + "KC_P": { + "key": "LT_P", + "label": "P", + } + "KC_LBRC": { + "key": "LT_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "LT_RBRC", + "label": "]", + } + "KC_A": { + "key": "LT_A", + "label": "A", + } + "KC_S": { + "key": "LT_S", + "label": "S", + } + "KC_D": { + "key": "LT_D", + "label": "D", + } + "KC_F": { + "key": "LT_F", + "label": "F", + } + "KC_G": { + "key": "LT_G", + "label": "G", + } + "KC_H": { + "key": "LT_H", + "label": "H", + } + "KC_J": { + "key": "LT_J", + "label": "J", + } + "KC_K": { + "key": "LT_K", + "label": "K", + } + "KC_L": { + "key": "LT_L", + "label": "L", + } + "KC_SCLN": { + "key": "LT_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "LT_QUOT", + "label": "'", + } + "KC_BSLS": { + "key": "LT_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "LT_Z", + "label": "Z", + } + "KC_X": { + "key": "LT_X", + "label": "X", + } + "KC_C": { + "key": "LT_C", + "label": "C", + } + "KC_V": { + "key": "LT_V", + "label": "V", + } + "KC_B": { + "key": "LT_B", + "label": "B", + } + "KC_N": { + "key": "LT_N", + "label": "N", + } + "KC_M": { + "key": "LT_M", + "label": "M", + } + "KC_COMM": { + "key": "LT_COMM", + "label": ",", + } + "KC_DOT": { + "key": "LT_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "LT_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ │ │ │ │ │ │ │ │ ( │ ) │ _ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(LT_GRV)": { + "key": "LT_TILD", + "label": "~", + } + "S(LT_9)": { + "key": "LT_LPRN", + "label": "(", + } + "S(LT_0)": { + "key": "LT_RPRN", + "label": ")", + } + "S(LT_MINS)": { + "key": "LT_UNDS", + "label": "_", + } + "S(LT_LBRC)": { + "key": "LT_LCBR", + "label": "{", + } + "S(LT_RBRC)": { + "key": "LT_RCBR", + "label": "}", + } + "S(LT_SCLN)": { + "key": "LT_COLN", + "label": ":", + } + "S(LT_QUOT)": { + "key": "LT_DQUO", + "label": "\"", + } + "S(LT_BSLS)": { + "key": "LT_PIPE", + "label": "|", + } + "S(LT_COMM)": { + "key": "LT_LABK", + "label": "<", + } + "S(LT_DOT)": { + "key": "LT_RABK", + "label": ">", + } + "S(LT_SLSH)": { + "key": "LT_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ │ │ │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(LT_AOGO)": { + "key": "LT_1", + "label": "1", + } + "ALGR(LT_CCAR)": { + "key": "LT_2", + "label": "2", + } + "ALGR(LT_EOGO)": { + "key": "LT_3", + "label": "3", + } + "ALGR(LT_EDOT)": { + "key": "LT_4", + "label": "4", + } + "ALGR(LT_IOGO)": { + "key": "LT_5", + "label": "5", + } + "ALGR(LT_SCAR)": { + "key": "LT_6", + "label": "6", + } + "ALGR(LT_UOGO)": { + "key": "LT_7", + "label": "7", + } + "ALGR(LT_UMAC)": { + "key": "LT_8", + "label": "8", + } + "ALGR(LT_ZCAR)": { + "key": "LT_EQL", + "label": "=", + } + "ALGR(LT_E)": { + "key": "LT_EURO", + "label": "€", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ │ │ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(LT_AOGO))": { + "key": "LT_EXLM", + "label": "!", + } + "S(ALGR(LT_CCAR))": { + "key": "LT_AT", + "label": "@", + } + "S(ALGR(LT_EOGO))": { + "key": "LT_HASH", + "label": "#", + } + "S(ALGR(LT_EDOT))": { + "key": "LT_DLR", + "label": "$", + } + "S(ALGR(LT_IOGO))": { + "key": "LT_PERC", + "label": "%", + } + "S(ALGR(LT_SCAR))": { + "key": "LT_CIRC", + "label": "^", + } + "S(ALGR(LT_UOGO))": { + "key": "LT_AMPR", + "label": "&", + } + "S(ALGR(LT_UMAC))": { + "key": "LT_ASTR", + "label": "*", + } + "S(ALGR(LT_ZCAR))": { + "key": "LT_PLUS", + "label": "+", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_neo2_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_neo2_0.0.1.hjson new file mode 100644 index 0000000000..980bddbf7a --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_neo2_0.0.1.hjson @@ -0,0 +1,217 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ X │ V │ L │ C │ W │ K │ H │ G │ F │ Q │ ß │ ´ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ L3 │ U │ I │ A │ E │ O │ S │ N │ R │ T │ D │ Y │ L3│ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │L4 │ Ü │ Ö │ Ä │ P │ Z │ B │ M │ , │ . │ J │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ L4 │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "NE_CIRC", + "label": "^ (dead)", + } + "KC_1": { + "key": "NE_1", + "label": "1", + } + "KC_2": { + "key": "NE_2", + "label": "2", + } + "KC_3": { + "key": "NE_3", + "label": "3", + } + "KC_4": { + "key": "NE_4", + "label": "4", + } + "KC_5": { + "key": "NE_5", + "label": "5", + } + "KC_6": { + "key": "NE_6", + "label": "6", + } + "KC_7": { + "key": "NE_7", + "label": "7", + } + "KC_8": { + "key": "NE_8", + "label": "8", + } + "KC_9": { + "key": "NE_9", + "label": "9", + } + "KC_0": { + "key": "NE_0", + "label": "0", + } + "KC_MINS": { + "key": "NE_MINS", + "label": "-", + } + "KC_EQL": { + "key": "NE_GRV", + "label": "` (dead)", + } + "KC_Q": { + "key": "NE_X", + "label": "X", + } + "KC_W": { + "key": "NE_V", + "label": "V", + } + "KC_E": { + "key": "NE_L", + "label": "L", + } + "KC_R": { + "key": "NE_C", + "label": "C", + } + "KC_T": { + "key": "NE_W", + "label": "W", + } + "KC_Y": { + "key": "NE_K", + "label": "K", + } + "KC_U": { + "key": "NE_H", + "label": "H", + } + "KC_I": { + "key": "NE_G", + "label": "G", + } + "KC_O": { + "key": "NE_F", + "label": "F", + } + "KC_P": { + "key": "NE_Q", + "label": "Q", + } + "KC_LBRC": { + "key": "NE_SS", + "label": "ß", + } + "KC_RBRC": { + "key": "NE_ACUT", + "label": "´ (dead)", + } + "KC_CAPS": { + "key": "NE_L3L", + "label": "(layer 3)", + } + "KC_A": { + "key": "NE_U", + "label": "U", + } + "KC_S": { + "key": "NE_I", + "label": "I", + } + "KC_D": { + "key": "NE_A", + "label": "A", + } + "KC_F": { + "key": "NE_E", + "label": "E", + } + "KC_G": { + "key": "NE_O", + "label": "O", + } + "KC_H": { + "key": "NE_S", + "label": "S", + } + "KC_J": { + "key": "NE_N", + "label": "N", + } + "KC_K": { + "key": "NE_R", + "label": "R", + } + "KC_L": { + "key": "NE_T", + "label": "T", + } + "KC_SCLN": { + "key": "NE_D", + "label": "D", + } + "KC_QUOT": { + "key": "NE_Y", + "label": "Y", + } + "KC_NUHS": { + "key": "NE_L3R", + "label": "(layer 3)", + } + "KC_NUBS": { + "key": "NE_L4L", + "label": "(layer 4)", + } + "KC_Z": { + "key": "NE_UDIA", + "label": "Ü", + } + "KC_X": { + "key": "NE_ODIA", + "label": "Ö", + } + "KC_C": { + "key": "NE_ADIA", + "label": "Ä", + } + "KC_V": { + "key": "NE_P", + "label": "P", + } + "KC_B": { + "key": "NE_Z", + "label": "Z", + } + "KC_N": { + "key": "NE_B", + "label": "B", + } + "KC_M": { + "key": "NE_M", + "label": "M", + } + "KC_COMM": { + "key": "NE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "NE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "NE_J", + "label": "J", + } + "KC_ALGR": { + "key": "NE_L4R", + "label": "(layer 4)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_nordic_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_nordic_0.0.1.hjson new file mode 100644 index 0000000000..fb3d1bc84b --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_nordic_0.0.1.hjson @@ -0,0 +1,116 @@ +{ + "aliases": { + "KC_GRV": { + "key": "NO_HALF" + } + "KC_MINS": { + "key": "NO_PLUS" + } + "KC_EQL": { + "key": "NO_ACUT" + } + "KC_LBRC": { + "key": "NO_AM" + } + "KC_RBRC": { + "key": "NO_QUOT", + "label": "this is the \"umlaut\" char on Nordic keyboards, Apple layout", + } + "KC_SCLN": { + "key": "NO_AE" + } + "KC_QUOT": { + "key": "NO_OSLH" + } + "KC_NUHS": { + "key": "NO_APOS" + } + "KC_NUBS": { + "key": "NO_LESS" + } + "KC_SLSH": { + "key": "NO_MINS" + } + "LSFT(NO_HALF)": { + "key": "NO_SECT" + } + "LSFT(KC_2)": { + "key": "NO_QUO2" + } + "LSFT(KC_4)": { + "key": "NO_BULT" + } + "LSFT(KC_6)": { + "key": "NO_AMPR" + } + "LSFT(KC_7)": { + "key": "NO_SLSH" + } + "LSFT(KC_8)": { + "key": "NO_LPRN" + } + "LSFT(KC_9)": { + "key": "NO_RPRN" + } + "LSFT(KC_0)": { + "key": "NO_EQL" + } + "LSFT(NO_PLUS)": { + "key": "NO_QUES" + } + "LSFT(NO_ACUT)": { + "key": "NO_GRV" + } + "LSFT(NO_QUOT)": { + "key": "NO_CIRC" + } + "LSFT(NO_LESS)": { + "key": "NO_GRTR" + } + "LSFT(KC_COMM)": { + "key": "NO_SCLN" + } + "LSFT(KC_DOT)": { + "key": "NO_COLN" + } + "LSFT(NO_MINS)": { + "key": "NO_UNDS" + } + "ALGR(KC_2)": { + "key": "NO_AT" + } + "ALGR(KC_3)": { + "key": "NO_PND" + } + "ALGR(KC_4)": { + "key": "NO_DLR" + } + "ALGR(KC_7)": { + "key": "NO_LCBR" + } + "ALGR(KC_8)": { + "key": "NO_LBRC" + } + "ALGR(KC_9)": { + "key": "NO_RBRC" + } + "ALGR(KC_0)": { + "key": "NO_RCBR" + } + "ALGR(KC_NUBS)": { + "key": "NO_PIPE" + } + "ALGR(KC_E)": { + "key": "NO_EURO" + } + "ALGR(NO_QUOT)": { + "key": "NO_TILD" + } + "ALGR(KC_MINS)": { + "key": "NO_BSLS" + } + "ALGR(KC_M)": { + "key": "NO_MU" + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_norman_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_norman_0.0.1.hjson new file mode 100644 index 0000000000..98ea7e6aab --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_norman_0.0.1.hjson @@ -0,0 +1,302 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ D │ F │ K │ J │ U │ R │ L │ ; │ [ │ ] │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ A │ S │ E │ T │ G │ Y │ N │ I │ O │ H │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Z │ X │ C │ V │ B │ P │ M │ , │ . │ / │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "NM_GRV", + "label": "`", + } + "KC_1": { + "key": "NM_1", + "label": "1", + } + "KC_2": { + "key": "NM_2", + "label": "2", + } + "KC_3": { + "key": "NM_3", + "label": "3", + } + "KC_4": { + "key": "NM_4", + "label": "4", + } + "KC_5": { + "key": "NM_5", + "label": "5", + } + "KC_6": { + "key": "NM_6", + "label": "6", + } + "KC_7": { + "key": "NM_7", + "label": "7", + } + "KC_8": { + "key": "NM_8", + "label": "8", + } + "KC_9": { + "key": "NM_9", + "label": "9", + } + "KC_0": { + "key": "NM_0", + "label": "0", + } + "KC_MINS": { + "key": "NM_MINS", + "label": "-", + } + "KC_EQL": { + "key": "NM_EQL", + "label": "=", + } + "KC_Q": { + "key": "NM_Q", + "label": "Q", + } + "KC_W": { + "key": "NM_W", + "label": "W", + } + "KC_E": { + "key": "NM_D", + "label": "D", + } + "KC_R": { + "key": "NM_F", + "label": "F", + } + "KC_T": { + "key": "NM_K", + "label": "K", + } + "KC_Y": { + "key": "NM_J", + "label": "J", + } + "KC_U": { + "key": "NM_U", + "label": "U", + } + "KC_I": { + "key": "NM_R", + "label": "R", + } + "KC_O": { + "key": "NM_L", + "label": "L", + } + "KC_P": { + "key": "NM_SCLN", + "label": ";", + } + "KC_LBRC": { + "key": "NM_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "NM_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "NM_BSLS", + "label": "\\", + } + "KC_A": { + "key": "NM_A", + "label": "A", + } + "KC_S": { + "key": "NM_S", + "label": "S", + } + "KC_D": { + "key": "NM_E", + "label": "E", + } + "KC_F": { + "key": "NM_T", + "label": "T", + } + "KC_G": { + "key": "NM_G", + "label": "G", + } + "KC_H": { + "key": "NM_Y", + "label": "Y", + } + "KC_J": { + "key": "NM_N", + "label": "N", + } + "KC_K": { + "key": "NM_I", + "label": "I", + } + "KC_L": { + "key": "NM_O", + "label": "O", + } + "KC_SCLN": { + "key": "NM_H", + "label": "H", + } + "KC_QUOT": { + "key": "NM_QUOT", + "label": "'", + } + "KC_Z": { + "key": "NM_Z", + "label": "Z", + } + "KC_X": { + "key": "NM_X", + "label": "X", + } + "KC_C": { + "key": "NM_C", + "label": "C", + } + "KC_V": { + "key": "NM_V", + "label": "V", + } + "KC_B": { + "key": "NM_B", + "label": "B", + } + "KC_N": { + "key": "NM_P", + "label": "P", + } + "KC_M": { + "key": "NM_M", + "label": "M", + } + "KC_COMM": { + "key": "NM_COMM", + "label": ",", + } + "KC_DOT": { + "key": "NM_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "NM_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(NM_GRV)": { + "key": "NM_TILD", + "label": "~", + } + "S(NM_1)": { + "key": "NM_EXLM", + "label": "!", + } + "S(NM_2)": { + "key": "NM_AT", + "label": "@", + } + "S(NM_3)": { + "key": "NM_HASH", + "label": "#", + } + "S(NM_4)": { + "key": "NM_DLR", + "label": "$", + } + "S(NM_5)": { + "key": "NM_PERC", + "label": "%", + } + "S(NM_6)": { + "key": "NM_CIRC", + "label": "^", + } + "S(NM_7)": { + "key": "NM_AMPR", + "label": "&", + } + "S(NM_8)": { + "key": "NM_ASTR", + "label": "*", + } + "S(NM_9)": { + "key": "NM_LPRN", + "label": "(", + } + "S(NM_0)": { + "key": "NM_RPRN", + "label": ")", + } + "S(NM_MINS)": { + "key": "NM_UNDS", + "label": "_", + } + "S(NM_EQL)": { + "key": "NM_PLUS", + "label": "+", + } + "S(NM_SCLN)": { + "key": "NM_COLN", + "label": ":", + } + "S(NM_LBRC)": { + "key": "NM_LCBR", + "label": "{", + } + "S(NM_RBRC)": { + "key": "NM_RCBR", + "label": "}", + } + "S(NM_BSLS)": { + "key": "NM_PIPE", + "label": "|", + } + "S(NM_QUOT)": { + "key": "NM_DQUO", + "label": "\"", + } + "S(NM_COMM)": { + "key": "NM_LABK", + "label": "<", + } + "S(NM_DOT)": { + "key": "NM_RABK", + "label": ">", + } + "S(NM_SLSH)": { + "key": "NM_QUES", + "label": "?", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_norwegian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_norwegian_0.0.1.hjson new file mode 100644 index 0000000000..4e8cbb5d0e --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_norwegian_0.0.1.hjson @@ -0,0 +1,355 @@ +{ + "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": "NO_PIPE", + "label": "|", + } + "KC_1": { + "key": "NO_1", + "label": "1", + } + "KC_2": { + "key": "NO_2", + "label": "2", + } + "KC_3": { + "key": "NO_3", + "label": "3", + } + "KC_4": { + "key": "NO_4", + "label": "4", + } + "KC_5": { + "key": "NO_5", + "label": "5", + } + "KC_6": { + "key": "NO_6", + "label": "6", + } + "KC_7": { + "key": "NO_7", + "label": "7", + } + "KC_8": { + "key": "NO_8", + "label": "8", + } + "KC_9": { + "key": "NO_9", + "label": "9", + } + "KC_0": { + "key": "NO_0", + "label": "0", + } + "KC_MINS": { + "key": "NO_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "NO_BSLS", + "label": "\\", + } + "KC_Q": { + "key": "NO_Q", + "label": "Q", + } + "KC_W": { + "key": "NO_W", + "label": "W", + } + "KC_E": { + "key": "NO_E", + "label": "E", + } + "KC_R": { + "key": "NO_R", + "label": "R", + } + "KC_T": { + "key": "NO_T", + "label": "T", + } + "KC_Y": { + "key": "NO_Y", + "label": "Y", + } + "KC_U": { + "key": "NO_U", + "label": "U", + } + "KC_I": { + "key": "NO_I", + "label": "I", + } + "KC_O": { + "key": "NO_O", + "label": "O", + } + "KC_P": { + "key": "NO_P", + "label": "P", + } + "KC_LBRC": { + "key": "NO_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "NO_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "NO_A", + "label": "A", + } + "KC_S": { + "key": "NO_S", + "label": "S", + } + "KC_D": { + "key": "NO_D", + "label": "D", + } + "KC_F": { + "key": "NO_F", + "label": "F", + } + "KC_G": { + "key": "NO_G", + "label": "G", + } + "KC_H": { + "key": "NO_H", + "label": "H", + } + "KC_J": { + "key": "NO_J", + "label": "J", + } + "KC_K": { + "key": "NO_K", + "label": "K", + } + "KC_L": { + "key": "NO_L", + "label": "L", + } + "KC_SCLN": { + "key": "NO_OSTR", + "label": "Ø", + } + "KC_QUOT": { + "key": "NO_AE", + "label": "Æ", + } + "KC_NUHS": { + "key": "NO_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "NO_LABK", + "label": "<", + } + "KC_Z": { + "key": "NO_Z", + "label": "Z", + } + "KC_X": { + "key": "NO_X", + "label": "X", + } + "KC_C": { + "key": "NO_C", + "label": "C", + } + "KC_V": { + "key": "NO_V", + "label": "V", + } + "KC_B": { + "key": "NO_B", + "label": "B", + } + "KC_N": { + "key": "NO_N", + "label": "N", + } + "KC_M": { + "key": "NO_M", + "label": "M", + } + "KC_COMM": { + "key": "NO_COMM", + "label": ",", + } + "KC_DOT": { + "key": "NO_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "NO_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ § │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(NO_PIPE)": { + "key": "NO_SECT", + "label": "§", + } + "S(NO_1)": { + "key": "NO_EXLM", + "label": "!", + } + "S(NO_2)": { + "key": "NO_DQUO", + "label": "\"", + } + "S(NO_3)": { + "key": "NO_HASH", + "label": "#", + } + "S(NO_4)": { + "key": "NO_CURR", + "label": "¤", + } + "S(NO_5)": { + "key": "NO_PERC", + "label": "%", + } + "S(NO_6)": { + "key": "NO_AMPR", + "label": "&", + } + "S(NO_7)": { + "key": "NO_SLSH", + "label": "/", + } + "S(NO_8)": { + "key": "NO_LPRN", + "label": "(", + } + "S(NO_9)": { + "key": "NO_RPRN", + "label": ")", + } + "S(NO_0)": { + "key": "NO_EQL", + "label": "=", + } + "S(NO_PLUS)": { + "key": "NO_QUES", + "label": "?", + } + "S(NO_BSLS)": { + "key": "NO_GRV", + "label": "` (dead)", + } + "S(NO_DIAE)": { + "key": "NO_CIRC", + "label": "^ (dead)", + } + "S(NO_QUOT)": { + "key": "NO_ASTR", + "label": "*", + } + "S(NO_LABK)": { + "key": "NO_RABK", + "label": ">", + } + "S(NO_COMM)": { + "key": "NO_SCLN", + "label": ";", + } + "S(NO_DOT)": { + "key": "NO_COLN", + "label": ":", + } + "S(NO_MINS)": { + "key": "NO_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ │ ´ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ µ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(NO_2)": { + "key": "NO_AT", + "label": "@", + } + "ALGR(NO_3)": { + "key": "NO_PND", + "label": "£", + } + "ALGR(NO_4)": { + "key": "NO_DLR", + "label": "$", + } + "ALGR(NO_5)": { + "key": "NO_EURO", + "label": "€", + } + "ALGR(NO_7)": { + "key": "NO_LCBR", + "label": "{", + } + "ALGR(NO_8)": { + "key": "NO_LBRC", + "label": "[", + } + "ALGR(NO_9)": { + "key": "NO_RBRC", + "label": "]", + } + "ALGR(NO_0)": { + "key": "NO_RCBR", + "label": "}", + } + "ALGR(NO_BSLS)": { + "key": "NO_ACUT", + "label": "´ (dead)", + } + "ALGR(NO_DIAE)": { + "key": "NO_TILD", + "label": "~ (dead)", + } + "ALGR(NO_M)": { + "key": "NO_MICR", + "label": "µ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_plover_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_plover_0.0.1.hjson new file mode 100644 index 0000000000..fb00ef0c62 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_plover_0.0.1.hjson @@ -0,0 +1,86 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │Num│ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ S │ T │ P │ H │ │ * │ F │ P │ L │ T │ D │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ K │ W │ R │ │ │ R │ B │ G │ S │ Z │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ A │ O │ │ E │ U │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_1": { + "key": "PV_NUM" + } + "KC_Q": { + "key": "PV_LS" + } + "KC_W": { + "key": "PV_LT" + } + "KC_E": { + "key": "PV_LP" + } + "KC_R": { + "key": "PV_LH" + } + "KC_Y": { + "key": "PV_STAR" + } + "KC_U": { + "key": "PV_RF" + } + "KC_I": { + "key": "PV_RP" + } + "KC_O": { + "key": "PV_RL" + } + "KC_P": { + "key": "PV_RT" + } + "KC_LBRC": { + "key": "PV_RD" + } + "KC_S": { + "key": "PV_LK" + } + "KC_D": { + "key": "PV_LW" + } + "KC_F": { + "key": "PV_LR" + } + "KC_J": { + "key": "PV_RR" + } + "KC_K": { + "key": "PV_RB" + } + "KC_L": { + "key": "PV_RG" + } + "KC_SCLN": { + "key": "PV_RS" + } + "KC_QUOT": { + "key": "PV_RZ" + } + "KC_C": { + "key": "PV_A" + } + "KC_V": { + "key": "PV_O" + } + "KC_N": { + "key": "PV_E" + } + "KC_M": { + "key": "PV_U" + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_plover_dvorak_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_plover_dvorak_0.0.1.hjson new file mode 100644 index 0000000000..9656dd9821 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_plover_dvorak_0.0.1.hjson @@ -0,0 +1,73 @@ +{ + "aliases": { + "DV_1": { + "key": "PD_NUM" + } + "DV_Q": { + "key": "PD_LS" + } + "DV_W": { + "key": "PD_LT" + } + "DV_E": { + "key": "PD_LP" + } + "DV_R": { + "key": "PD_LH" + } + "DV_S": { + "key": "PD_LK" + } + "DV_D": { + "key": "PD_LW" + } + "DV_F": { + "key": "PD_LR" + } + "DV_Y": { + "key": "PD_STAR" + } + "DV_U": { + "key": "PD_RF" + } + "DV_I": { + "key": "PD_RP" + } + "DV_O": { + "key": "PD_RL" + } + "DV_P": { + "key": "PD_RT" + } + "DV_LBRC": { + "key": "PD_RD" + } + "DV_J": { + "key": "PD_RR" + } + "DV_K": { + "key": "PD_RB" + } + "DV_L": { + "key": "PD_RG" + } + "DV_SCLN": { + "key": "PD_RS" + } + "DV_QUOT": { + "key": "PD_RZ" + } + "DV_C": { + "key": "PD_A" + } + "DV_V": { + "key": "PD_O" + } + "DV_N": { + "key": "PD_E" + } + "DV_M": { + "key": "PD_U" + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_polish_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_polish_0.0.1.hjson new file mode 100644 index 0000000000..609011b1f7 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_polish_0.0.1.hjson @@ -0,0 +1,355 @@ +{ + "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": "PL_GRV", + "label": "`", + } + "KC_1": { + "key": "PL_1", + "label": "1", + } + "KC_2": { + "key": "PL_2", + "label": "2", + } + "KC_3": { + "key": "PL_3", + "label": "3", + } + "KC_4": { + "key": "PL_4", + "label": "4", + } + "KC_5": { + "key": "PL_5", + "label": "5", + } + "KC_6": { + "key": "PL_6", + "label": "6", + } + "KC_7": { + "key": "PL_7", + "label": "7", + } + "KC_8": { + "key": "PL_8", + "label": "8", + } + "KC_9": { + "key": "PL_9", + "label": "9", + } + "KC_0": { + "key": "PL_0", + "label": "0", + } + "KC_MINS": { + "key": "PL_MINS", + "label": "-", + } + "KC_EQL": { + "key": "PL_EQL", + "label": "=", + } + "KC_Q": { + "key": "PL_Q", + "label": "Q", + } + "KC_W": { + "key": "PL_W", + "label": "W", + } + "KC_E": { + "key": "PL_E", + "label": "E", + } + "KC_R": { + "key": "PL_R", + "label": "R", + } + "KC_T": { + "key": "PL_T", + "label": "T", + } + "KC_Y": { + "key": "PL_Y", + "label": "Y", + } + "KC_U": { + "key": "PL_U", + "label": "U", + } + "KC_I": { + "key": "PL_I", + "label": "I", + } + "KC_O": { + "key": "PL_O", + "label": "O", + } + "KC_P": { + "key": "PL_P", + "label": "P", + } + "KC_LBRC": { + "key": "PL_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "PL_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "PL_BSLS", + "label": "\\", + } + "KC_A": { + "key": "PL_A", + "label": "A", + } + "KC_S": { + "key": "PL_S", + "label": "S", + } + "KC_D": { + "key": "PL_D", + "label": "D", + } + "KC_F": { + "key": "PL_F", + "label": "F", + } + "KC_G": { + "key": "PL_G", + "label": "G", + } + "KC_H": { + "key": "PL_H", + "label": "H", + } + "KC_J": { + "key": "PL_J", + "label": "J", + } + "KC_K": { + "key": "PL_K", + "label": "K", + } + "KC_L": { + "key": "PL_L", + "label": "L", + } + "KC_SCLN": { + "key": "PL_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "PL_QUOT", + "label": "'", + } + "KC_Z": { + "key": "PL_Z", + "label": "Z", + } + "KC_X": { + "key": "PL_X", + "label": "X", + } + "KC_C": { + "key": "PL_C", + "label": "C", + } + "KC_V": { + "key": "PL_V", + "label": "V", + } + "KC_B": { + "key": "PL_B", + "label": "B", + } + "KC_N": { + "key": "PL_N", + "label": "N", + } + "KC_M": { + "key": "PL_M", + "label": "M", + } + "KC_COMM": { + "key": "PL_COMM", + "label": ",", + } + "KC_DOT": { + "key": "PL_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "PL_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(PL_GRV)": { + "key": "PL_TILD", + "label": "~", + } + "S(PL_1)": { + "key": "PL_EXLM", + "label": "!", + } + "S(PL_2)": { + "key": "PL_AT", + "label": "@", + } + "S(PL_3)": { + "key": "PL_HASH", + "label": "#", + } + "S(PL_4)": { + "key": "PL_DLR", + "label": "$", + } + "S(PL_5)": { + "key": "PL_PERC", + "label": "%", + } + "S(PL_6)": { + "key": "PL_CIRC", + "label": "^", + } + "S(PL_7)": { + "key": "PL_AMPR", + "label": "&", + } + "S(PL_8)": { + "key": "PL_ASTR", + "label": "*", + } + "S(PL_9)": { + "key": "PL_LPRN", + "label": "(", + } + "S(PL_0)": { + "key": "PL_RPRN", + "label": ")", + } + "S(PL_MINS)": { + "key": "PL_UNDS", + "label": "_", + } + "S(PL_EQL)": { + "key": "PL_PLUS", + "label": "+", + } + "S(PL_LBRC)": { + "key": "PL_LCBR", + "label": "{", + } + "S(PL_RBRC)": { + "key": "PL_RCBR", + "label": "}", + } + "S(PL_BSLS)": { + "key": "PL_PIPE", + "label": "|", + } + "S(PL_SCLN)": { + "key": "PL_COLN", + "label": ":", + } + "S(PL_QUOT)": { + "key": "PL_DQUO", + "label": "\"", + } + "S(PL_COMM)": { + "key": "PL_LABK", + "label": "<", + } + "S(PL_DOT)": { + "key": "PL_RABK", + "label": ">", + } + "S(PL_SLSH)": { + "key": "PL_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ Ę │ │ │ │ € │ │ Ó │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ Ą │ Ś │ │ │ │ │ │ │ Ł │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Ż │ Ź │ Ć │ │ │ Ń │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(PL_E)": { + "key": "PL_EOGO", + "label": "Ę", + } + "ALGR(PL_U)": { + "key": "PL_EURO", + "label": "€", + } + "ALGR(PL_O)": { + "key": "PL_OACU", + "label": "Ó", + } + "ALGR(PL_A)": { + "key": "PL_AOGO", + "label": "Ą", + } + "ALGR(PL_S)": { + "key": "PL_SACU", + "label": "Ś", + } + "ALGR(PL_L)": { + "key": "PL_LSTR", + "label": "Ł", + } + "ALGR(PL_Z)": { + "key": "PL_ZDOT", + "label": "Ż", + } + "ALGR(PL_X)": { + "key": "PL_ZACU", + "label": "Ź", + } + "ALGR(PL_C)": { + "key": "PL_CACU", + "label": "Ć", + } + "ALGR(PL_N)": { + "key": "PL_NACU", + "label": "Ń", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_portuguese_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_portuguese_0.0.1.hjson new file mode 100644 index 0000000000..c8e43065d2 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_portuguese_0.0.1.hjson @@ -0,0 +1,355 @@ +{ + "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": "PT_BSLS", + "label": "\\", + } + "KC_1": { + "key": "PT_1", + "label": "1", + } + "KC_2": { + "key": "PT_2", + "label": "2", + } + "KC_3": { + "key": "PT_3", + "label": "3", + } + "KC_4": { + "key": "PT_4", + "label": "4", + } + "KC_5": { + "key": "PT_5", + "label": "5", + } + "KC_6": { + "key": "PT_6", + "label": "6", + } + "KC_7": { + "key": "PT_7", + "label": "7", + } + "KC_8": { + "key": "PT_8", + "label": "8", + } + "KC_9": { + "key": "PT_9", + "label": "9", + } + "KC_0": { + "key": "PT_0", + "label": "0", + } + "KC_MINS": { + "key": "PT_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "PT_LDAQ", + "label": "«", + } + "KC_Q": { + "key": "PT_Q", + "label": "Q", + } + "KC_W": { + "key": "PT_W", + "label": "W", + } + "KC_E": { + "key": "PT_E", + "label": "E", + } + "KC_R": { + "key": "PT_R", + "label": "R", + } + "KC_T": { + "key": "PT_T", + "label": "T", + } + "KC_Y": { + "key": "PT_Y", + "label": "Y", + } + "KC_U": { + "key": "PT_U", + "label": "U", + } + "KC_I": { + "key": "PT_I", + "label": "I", + } + "KC_O": { + "key": "PT_O", + "label": "O", + } + "KC_P": { + "key": "PT_P", + "label": "P", + } + "KC_LBRC": { + "key": "PT_PLUS", + "label": "+", + } + "KC_RBRC": { + "key": "PT_ACUT", + "label": "´ (dead)", + } + "KC_A": { + "key": "PT_A", + "label": "A", + } + "KC_S": { + "key": "PT_S", + "label": "S", + } + "KC_D": { + "key": "PT_D", + "label": "D", + } + "KC_F": { + "key": "PT_F", + "label": "F", + } + "KC_G": { + "key": "PT_G", + "label": "G", + } + "KC_H": { + "key": "PT_H", + "label": "H", + } + "KC_J": { + "key": "PT_J", + "label": "J", + } + "KC_K": { + "key": "PT_K", + "label": "K", + } + "KC_L": { + "key": "PT_L", + "label": "L", + } + "KC_SCLN": { + "key": "PT_CCED", + "label": "Ç", + } + "KC_QUOT": { + "key": "PT_MORD", + "label": "º", + } + "KC_NUHS": { + "key": "PT_TILD", + "label": "~ (dead)", + } + "KC_NUBS": { + "key": "PT_LABK", + "label": "<", + } + "KC_Z": { + "key": "PT_Z", + "label": "Z", + } + "KC_X": { + "key": "PT_X", + "label": "X", + } + "KC_C": { + "key": "PT_C", + "label": "C", + } + "KC_V": { + "key": "PT_V", + "label": "V", + } + "KC_B": { + "key": "PT_B", + "label": "B", + } + "KC_N": { + "key": "PT_N", + "label": "N", + } + "KC_M": { + "key": "PT_M", + "label": "M", + } + "KC_COMM": { + "key": "PT_COMM", + "label": ",", + } + "KC_DOT": { + "key": "PT_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "PT_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ | │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ » │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ * │ ` │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ª │ ^ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(PT_BSLS)": { + "key": "PT_PIPE", + "label": "|", + } + "S(PT_1)": { + "key": "PT_EXLM", + "label": "!", + } + "S(PT_2)": { + "key": "PT_DQUO", + "label": "\"", + } + "S(PT_3)": { + "key": "PT_HASH", + "label": "#", + } + "S(PT_4)": { + "key": "PT_DLR", + "label": "$", + } + "S(PT_5)": { + "key": "PT_PERC", + "label": "%", + } + "S(PT_6)": { + "key": "PT_AMPR", + "label": "&", + } + "S(PT_7)": { + "key": "PT_SLSH", + "label": "/", + } + "S(PT_8)": { + "key": "PT_LPRN", + "label": "(", + } + "S(PT_9)": { + "key": "PT_RPRN", + "label": ")", + } + "S(PT_0)": { + "key": "PT_EQL", + "label": "=", + } + "S(PT_QUOT)": { + "key": "PT_QUES", + "label": "?", + } + "S(PT_LDAQ)": { + "key": "PT_RDAQ", + "label": "»", + } + "S(PT_PLUS)": { + "key": "PT_ASTR", + "label": "*", + } + "S(PT_ACUT)": { + "key": "PT_GRV", + "label": "` (dead)", + } + "S(PT_MORD)": { + "key": "PT_FORD", + "label": "ª", + } + "S(PT_TILD)": { + "key": "PT_CIRC", + "label": "^ (dead)", + } + "S(PT_LABK)": { + "key": "PT_RABK", + "label": ">", + } + "S(PT_COMM)": { + "key": "PT_SCLN", + "label": ";", + } + "S(PT_DOT)": { + "key": "PT_COLN", + "label": ":", + } + "S(PT_MINS)": { + "key": "PT_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ @ │ £ │ § │ │ │ { │ [ │ ] │ } │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ ¨ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(PT_2)": { + "key": "PT_AT", + "label": "@", + } + "ALGR(PT_3)": { + "key": "PT_PND", + "label": "£", + } + "ALGR(PT_4)": { + "key": "PT_SECT", + "label": "§", + } + "ALGR(PT_7)": { + "key": "PT_LCBR", + "label": "{", + } + "ALGR(PT_8)": { + "key": "PT_LBRC", + "label": "[", + } + "ALGR(PT_9)": { + "key": "PT_RBRC", + "label": "]", + } + "ALGR(PT_0)": { + "key": "PT_RCBR", + "label": "}", + } + "ALGR(PT_PLUS)": { + "key": "PT_DIAE", + "label": "¨ (dead)", + } + "ALGR(PT_E)": { + "key": "PT_EURO", + "label": "€", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_portuguese_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_portuguese_mac_iso_0.0.1.hjson new file mode 100644 index 0000000000..b1c9aaad98 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_portuguese_mac_iso_0.0.1.hjson @@ -0,0 +1,620 @@ +{ + "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": "PT_SECT", + "label": "§", + } + "KC_1": { + "key": "PT_1", + "label": "1", + } + "KC_2": { + "key": "PT_2", + "label": "2", + } + "KC_3": { + "key": "PT_3", + "label": "3", + } + "KC_4": { + "key": "PT_4", + "label": "4", + } + "KC_5": { + "key": "PT_5", + "label": "5", + } + "KC_6": { + "key": "PT_6", + "label": "6", + } + "KC_7": { + "key": "PT_7", + "label": "7", + } + "KC_8": { + "key": "PT_8", + "label": "8", + } + "KC_9": { + "key": "PT_9", + "label": "9", + } + "KC_0": { + "key": "PT_0", + "label": "0", + } + "KC_MINS": { + "key": "PT_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "PT_PLUS", + "label": "+", + } + "KC_Q": { + "key": "PT_Q", + "label": "Q", + } + "KC_W": { + "key": "PT_W", + "label": "W", + } + "KC_E": { + "key": "PT_E", + "label": "E", + } + "KC_R": { + "key": "PT_R", + "label": "R", + } + "KC_T": { + "key": "PT_T", + "label": "T", + } + "KC_Y": { + "key": "PT_Y", + "label": "Y", + } + "KC_U": { + "key": "PT_U", + "label": "U", + } + "KC_I": { + "key": "PT_I", + "label": "I", + } + "KC_O": { + "key": "PT_O", + "label": "O", + } + "KC_P": { + "key": "PT_P", + "label": "P", + } + "KC_LBRC": { + "key": "PT_MORD", + "label": "º", + } + "KC_RBRC": { + "key": "PT_ACUT", + "label": "´ (dead)", + } + "KC_A": { + "key": "PT_A", + "label": "A", + } + "KC_S": { + "key": "PT_S", + "label": "S", + } + "KC_D": { + "key": "PT_D", + "label": "D", + } + "KC_F": { + "key": "PT_F", + "label": "F", + } + "KC_G": { + "key": "PT_G", + "label": "G", + } + "KC_H": { + "key": "PT_H", + "label": "H", + } + "KC_J": { + "key": "PT_J", + "label": "J", + } + "KC_K": { + "key": "PT_K", + "label": "K", + } + "KC_L": { + "key": "PT_L", + "label": "L", + } + "KC_SCLN": { + "key": "PT_CCED", + "label": "Ç", + } + "KC_QUOT": { + "key": "PT_TILD", + "label": "~ (dead)", + } + "KC_NUHS": { + "key": "PT_BSLS", + "label": "\\", + } + "KC_NUBS": { + "key": "PT_LABK", + "label": "<", + } + "KC_Z": { + "key": "PT_Z", + "label": "Z", + } + "KC_X": { + "key": "PT_X", + "label": "X", + } + "KC_C": { + "key": "PT_C", + "label": "C", + } + "KC_V": { + "key": "PT_V", + "label": "V", + } + "KC_B": { + "key": "PT_B", + "label": "B", + } + "KC_N": { + "key": "PT_N", + "label": "N", + } + "KC_M": { + "key": "PT_M", + "label": "M", + } + "KC_COMM": { + "key": "PT_COMM", + "label": ",", + } + "KC_DOT": { + "key": "PT_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "PT_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ± │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ª │ ` │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ | │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(PT_SECT)": { + "key": "PT_PLMN", + "label": "±", + } + "S(PT_1)": { + "key": "PT_EXLM", + "label": "!", + } + "S(PT_2)": { + "key": "PT_DQUO", + "label": "\"", + } + "S(PT_3)": { + "key": "PT_HASH", + "label": "#", + } + "S(PT_4)": { + "key": "PT_DLR", + "label": "$", + } + "S(PT_5)": { + "key": "PT_PERC", + "label": "%", + } + "S(PT_6)": { + "key": "PT_AMPR", + "label": "&", + } + "S(PT_7)": { + "key": "PT_SLSH", + "label": "/", + } + "S(PT_8)": { + "key": "PT_LPRN", + "label": "(", + } + "S(PT_9)": { + "key": "PT_RPRN", + "label": ")", + } + "S(PT_0)": { + "key": "PT_EQL", + "label": "=", + } + "S(PT_QUOT)": { + "key": "PT_QUES", + "label": "?", + } + "S(PT_PLUS)": { + "key": "PT_ASTR", + "label": "*", + } + "S(PT_MORD)": { + "key": "PT_FORD", + "label": "ª", + } + "S(PT_ACUT)": { + "key": "PT_GRV", + "label": "` (dead)", + } + "S(PT_TILD)": { + "key": "PT_CIRC", + "label": "^ (dead)", + } + "S(PT_BSLS)": { + "key": "PT_PIPE", + "label": "|", + } + "S(PT_LABK)": { + "key": "PT_RABK", + "label": ">", + } + "S(PT_COMM)": { + "key": "PT_SCLN", + "label": ";", + } + "S(PT_DOT)": { + "key": "PT_COLN", + "label": ":", + } + "S(PT_MINS)": { + "key": "PT_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │  │ @ │ € │ £ │ ‰ │ ¶ │ ÷ │ [ │ ] │ ≠ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ Œ │ ∑ │ Æ │ ® │ ™ │ ¥ │ † │ ı │ Ø │ π │ ° │ ¨ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Å │ ß │ ∂ │ ƒ │ ˙ │ ˇ │ ¯ │ „ │ ‘ │ ¸ │ ˜ │ ‹ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≤ │ Ω │ « │ © │ √ │ ∫ │ ¬ │ µ │ “ │ … │ — │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(PT_1)": { + "key": "PT_APPL", + "label": " (Apple logo)", + } + "A(PT_2)": { + "key": "PT_AT", + "label": "@", + } + "A(PT_3)": { + "key": "PT_EURO", + "label": "€", + } + "A(PT_4)": { + "key": "PT_PND", + "label": "£", + } + "A(PT_5)": { + "key": "PT_PERM", + "label": "‰", + } + "A(PT_6)": { + "key": "PT_PILC", + "label": "¶", + } + "A(PT_7)": { + "key": "PT_DIV", + "label": "÷", + } + "A(PT_8)": { + "key": "PT_LBRC", + "label": "[", + } + "A(PT_9)": { + "key": "PT_RBRC", + "label": "]", + } + "A(PT_0)": { + "key": "PT_NEQL", + "label": "≠", + } + "A(PT_Q)": { + "key": "PT_OE", + "label": "Œ", + } + "A(PT_W)": { + "key": "PT_NARS", + "label": "∑", + } + "A(PT_E)": { + "key": "PT_AE", + "label": "Æ", + } + "A(PT_R)": { + "key": "PT_REGD", + "label": "®", + } + "A(PT_T)": { + "key": "PT_TM", + "label": "™", + } + "A(PT_Y)": { + "key": "PT_YEN", + "label": "¥", + } + "A(PT_U)": { + "key": "PT_DAGG", + "label": "†", + } + "A(PT_I)": { + "key": "PT_DLSI", + "label": "ı", + } + "A(PT_O)": { + "key": "PT_OSTR", + "label": "Ø", + } + "A(PT_P)": { + "key": "PT_PI", + "label": "π", + } + "A(PT_MORD)": { + "key": "PT_DEG", + "label": "°", + } + "A(PT_ACUT)": { + "key": "PT_DIAE", + "label": "¨ (dead)", + } + "A(PT_A)": { + "key": "PT_ARNG", + "label": "å", + } + "A(PT_S)": { + "key": "PT_SS", + "label": "ß", + } + "A(PT_D)": { + "key": "PT_PDIF", + "label": "∂", + } + "A(PT_F)": { + "key": "PT_FHK", + "label": "ƒ", + } + "A(PT_G)": { + "key": "PT_DOTA", + "label": "˙", + } + "A(PT_H)": { + "key": "PT_CARN", + "label": "ˇ", + } + "A(PT_J)": { + "key": "PT_MACR", + "label": "¯", + } + "A(PT_K)": { + "key": "PT_DLQU", + "label": "„", + } + "A(PT_L)": { + "key": "PT_LSQU", + "label": "‘", + } + "A(PT_CCED)": { + "key": "PT_CEDL", + "label": "¸", + } + "A(PT_TILD)": { + "key": "PT_STIL", + "label": "˜ (dead)", + } + "A(PT_BSLS)": { + "key": "PT_LSAQ", + "label": "‹", + } + "A(PT_LABK)": { + "key": "PT_LTEQ", + "label": "≤", + } + "A(PT_Z)": { + "key": "PT_OMEG", + "label": "Ω", + } + "A(PT_X)": { + "key": "PT_LDAQ", + "label": "«", + } + "A(PT_C)": { + "key": "PT_COPY", + "label": "©", + } + "A(PT_V)": { + "key": "PT_SQRT", + "label": "√", + } + "A(PT_B)": { + "key": "PT_INTG", + "label": "∫", + } + "A(PT_N)": { + "key": "PT_NOT", + "label": "¬", + } + "A(PT_M)": { + "key": "PT_MICR", + "label": "µ", + } + "A(PT_COMM)": { + "key": "PT_LDQU", + "label": "“", + } + "A(PT_DOT)": { + "key": "PT_ELLP", + "label": "…", + } + "A(PT_MINS)": { + "key": "PT_MDSH", + "label": "—", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ ¡ │ fi │ fl │ ¢ │ ∞ │ • │ ⁄ │ { │ } │ ≈ │ ¿ │ ◊ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ ‡ │ ˚ │ │ ∏ │ │ ˝ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ ∆ │ │ │ │ │ ‚ │ ’ │ ˛ │ ˆ │ › │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≥ │ │ » │ │ │ │ │ │ ” │ · │ – │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(PT_1))": { + "key": "PT_IEXL", + "label": "¡", + } + "S(A(PT_2))": { + "key": "PT_FI", + "label": "fi", + } + "S(A(PT_3))": { + "key": "PT_FL", + "label": "fl", + } + "S(A(PT_4))": { + "key": "PT_CENT", + "label": "¢", + } + "S(A(PT_5))": { + "key": "PT_INFN", + "label": "∞", + } + "S(A(PT_6))": { + "key": "PT_BULT", + "label": "•", + } + "S(A(PT_7))": { + "key": "PT_FRSL", + "label": "⁄", + } + "S(A(PT_8))": { + "key": "PT_LCBR", + "label": "{", + } + "S(A(PT_9))": { + "key": "PT_RCBR", + "label": "}", + } + "S(A(PT_0))": { + "key": "PT_AEQL", + "label": "≈", + } + "S(A(PT_QUOT))": { + "key": "PT_IQUE", + "label": "¿", + } + "S(A(PT_PLUS))": { + "key": "PT_LOZN", + "label": "◊", + } + "S(A(PT_U))": { + "key": "PT_DDAG", + "label": "‡", + } + "S(A(PT_I))": { + "key": "PT_RNGA", + "label": "˚", + } + "S(A(PT_P))": { + "key": "PT_NARP", + "label": "∏", + } + "S(A(PT_ACUT))": { + "key": "PT_DACU", + "label": "˝", + } + "S(A(PT_D))": { + "key": "PT_INCR", + "label": "∆", + } + "S(A(PT_K))": { + "key": "PT_SLQU", + "label": "‚", + } + "S(A(PT_L))": { + "key": "PT_RSQU", + "label": "’", + } + "S(A(PT_CCED))": { + "key": "PT_OGON", + "label": "˛", + } + "S(A(PT_TILD))": { + "key": "PT_DCIR", + "label": "ˆ (dead)", + } + "S(A(PT_BSLS))": { + "key": "PT_RSAQ", + "label": "›", + } + "S(A(PT_LABK))": { + "key": "PT_GTEQ", + "label": "≥", + } + "S(A(PT_X))": { + "key": "PT_RDAQ", + "label": "»", + } + "S(A(PT_COMM))": { + "key": "PT_RDQU", + "label": "”", + } + "S(A(PT_DOT))": { + "key": "PT_MDDT", + "label": "·", + } + "S(A(PT_MINS))": { + "key": "PT_NDSH", + "label": "–", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_romanian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_romanian_0.0.1.hjson new file mode 100644 index 0000000000..42b1e89d3b --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_romanian_0.0.1.hjson @@ -0,0 +1,444 @@ +{ + "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": "RO_DLQU", + "label": "„", + } + "KC_1": { + "key": "RO_1", + "label": "1", + } + "KC_2": { + "key": "RO_2", + "label": "2", + } + "KC_3": { + "key": "RO_3", + "label": "3", + } + "KC_4": { + "key": "RO_4", + "label": "4", + } + "KC_5": { + "key": "RO_5", + "label": "5", + } + "KC_6": { + "key": "RO_6", + "label": "6", + } + "KC_7": { + "key": "RO_7", + "label": "7", + } + "KC_8": { + "key": "RO_8", + "label": "8", + } + "KC_9": { + "key": "RO_9", + "label": "9", + } + "KC_0": { + "key": "RO_0", + "label": "0", + } + "KC_MINS": { + "key": "RO_MINS", + "label": "-", + } + "KC_EQL": { + "key": "RO_EQL", + "label": "=", + } + "KC_Q": { + "key": "RO_Q", + "label": "Q", + } + "KC_W": { + "key": "RO_W", + "label": "W", + } + "KC_E": { + "key": "RO_E", + "label": "E", + } + "KC_R": { + "key": "RO_R", + "label": "R", + } + "KC_T": { + "key": "RO_T", + "label": "T", + } + "KC_Y": { + "key": "RO_Y", + "label": "Y", + } + "KC_U": { + "key": "RO_U", + "label": "U", + } + "KC_I": { + "key": "RO_I", + "label": "I", + } + "KC_O": { + "key": "RO_O", + "label": "O", + } + "KC_P": { + "key": "RO_P", + "label": "P", + } + "KC_LBRC": { + "key": "RO_ABRV", + "label": "Ă", + } + "KC_RBRC": { + "key": "RO_ICIR", + "label": "Î", + } + "KC_A": { + "key": "RO_A", + "label": "A", + } + "KC_S": { + "key": "RO_S", + "label": "S", + } + "KC_D": { + "key": "RO_D", + "label": "D", + } + "KC_F": { + "key": "RO_F", + "label": "F", + } + "KC_G": { + "key": "RO_G", + "label": "G", + } + "KC_H": { + "key": "RO_H", + "label": "H", + } + "KC_J": { + "key": "RO_J", + "label": "J", + } + "KC_K": { + "key": "RO_K", + "label": "K", + } + "KC_L": { + "key": "RO_L", + "label": "L", + } + "KC_SCLN": { + "key": "RO_SCOM", + "label": "Ș", + } + "KC_QUOT": { + "key": "RO_TCOM", + "label": "Ț", + } + "KC_NUHS": { + "key": "RO_ACIR", + "label": "Â", + } + "KC_NUBS": { + "key": "RO_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "RO_Z", + "label": "Z", + } + "KC_X": { + "key": "RO_X", + "label": "X", + } + "KC_C": { + "key": "RO_C", + "label": "C", + } + "KC_V": { + "key": "RO_V", + "label": "V", + } + "KC_B": { + "key": "RO_B", + "label": "B", + } + "KC_N": { + "key": "RO_N", + "label": "N", + } + "KC_M": { + "key": "RO_M", + "label": "M", + } + "KC_COMM": { + "key": "RO_COMM", + "label": ",", + } + "KC_DOT": { + "key": "RO_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "RO_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ” │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ │ ; │ : │ ? │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(RO_DLQU)": { + "key": "RO_RDQU", + "label": "”", + } + "S(RO_1)": { + "key": "RO_EXLM", + "label": "!", + } + "S(RO_2)": { + "key": "RO_AT", + "label": "@", + } + "S(RO_3)": { + "key": "RO_HASH", + "label": "#", + } + "S(RO_4)": { + "key": "RO_DLR", + "label": "$", + } + "S(RO_5)": { + "key": "RO_PERC", + "label": "%", + } + "S(RO_6)": { + "key": "RO_CIRC", + "label": "^", + } + "S(RO_7)": { + "key": "RO_AMPR", + "label": "&", + } + "S(RO_8)": { + "key": "RO_ASTR", + "label": "*", + } + "S(RO_9)": { + "key": "RO_LPRN", + "label": "(", + } + "S(RO_0)": { + "key": "RO_RPRN", + "label": ")", + } + "S(RO_MINS)": { + "key": "RO_UNDS", + "label": "_", + } + "S(RO_EQL)": { + "key": "RO_PLUS", + "label": "+", + } + "S(RO_BSLS)": { + "key": "RO_PIPE", + "label": "|", + } + "S(RO_COMM)": { + "key": "RO_SCLN", + "label": ";", + } + "S(RO_DOT)": { + "key": "RO_COLN", + "label": ":", + } + "S(RO_SLSH)": { + "key": "RO_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ ¨ │ ¸ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ § │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ ß │ Đ │ │ │ │ │ │ Ł │ │ ' │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ © │ │ │ │ │ < │ > │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(RO_DLQU)": { + "key": "RO_GRV", + "label": "`", + } + "ALGR(RO_1)": { + "key": "RO_DTIL", + "label": "~ (dead)", + } + "ALGR(RO_2)": { + "key": "RO_CARN", + "label": "ˇ (dead)", + } + "ALGR(RO_3)": { + "key": "RO_DCIR", + "label": "^ (dead)", + } + "ALGR(RO_4)": { + "key": "RO_BREV", + "label": "˘ (dead)", + } + "ALGR(RO_5)": { + "key": "RO_RNGA", + "label": "° (dead)", + } + "ALGR(RO_6)": { + "key": "RO_OGON", + "label": "˛ (dead)", + } + "ALGR(RO_7)": { + "key": "RO_DGRV", + "label": "` (dead)", + } + "ALGR(RO_8)": { + "key": "RO_DOTA", + "label": "˙ (dead)", + } + "ALGR(RO_9)": { + "key": "RO_ACUT", + "label": "´ (dead)", + } + "ALGR(RO_0)": { + "key": "RO_DACU", + "label": "˝ (dead)", + } + "ALGR(RO_MINS)": { + "key": "RO_DIAE", + "label": "¨ (dead)", + } + "ALGR(RO_EQL)": { + "key": "RO_CEDL", + "label": "¸ (dead)", + } + "ALGR(RO_E)": { + "key": "RO_EURO", + "label": "€", + } + "ALGR(RO_P)": { + "key": "RO_SECT", + "label": "§", + } + "ALGR(RO_ABRV)": { + "key": "RO_LBRC", + "label": "[", + } + "ALGR(RO_ICIR)": { + "key": "RO_RBRC", + "label": "]", + } + "ALGR(RO_S)": { + "key": "RO_SS", + "label": "ß", + } + "ALGR(RO_D)": { + "key": "RO_DSTR", + "label": "Đ", + } + "ALGR(RO_L)": { + "key": "RO_LSTR", + "label": "Ł", + } + "ALGR(RO_TCOM)": { + "key": "RO_QUOT", + "label": "'", + } + "ALGR(RO_C)": { + "key": "RO_COPY", + "label": "©", + } + "ALGR(RO_COMM)": { + "key": "RO_LABK", + "label": "<", + } + "ALGR(RO_DOT)": { + "key": "RO_RABK", + "label": ">", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ │ │ │ │ │ │ │ │ │ │ – │ ± │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ « │ » │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(RO_DLQU))": { + "key": "RO_TILD", + "label": "~", + } + "S(ALGR(RO_MINS))": { + "key": "RO_NDSH", + "label": "–", + } + "S(ALGR(RO_EQL))": { + "key": "RO_PLMN", + "label": "±", + } + "S(ALGR(RO_ABRV))": { + "key": "RO_LCBR", + "label": "{", + } + "S(ALGR(RO_ICIR))": { + "key": "RO_RCBR", + "label": "}", + } + "S(ALGR(RO_TCOM))": { + "key": "RO_DQUO", + "label": "\"", + } + "S(ALGR(RO_COMM))": { + "key": "RO_LDAQ", + "label": "«", + } + "S(ALGR(RO_DOT))": { + "key": "RO_RDAQ", + "label": "»", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_russian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_russian_0.0.1.hjson new file mode 100644 index 0000000000..d83fc0f61f --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_russian_0.0.1.hjson @@ -0,0 +1,291 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ Ё │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Й │ Ц │ У │ К │ Е │ Н │ Г │ Ш │ Щ │ З │ Х │ Ъ │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ Ф │ Ы │ В │ А │ П │ Р │ О │ Л │ Д │ Ж │ Э │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Я │ Ч │ С │ М │ И │ Т │ Ь │ Б │ Ю │ . │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "RU_YO", + "label": "Ё", + } + "KC_1": { + "key": "RU_1", + "label": "1", + } + "KC_2": { + "key": "RU_2", + "label": "2", + } + "KC_3": { + "key": "RU_3", + "label": "3", + } + "KC_4": { + "key": "RU_4", + "label": "4", + } + "KC_5": { + "key": "RU_5", + "label": "5", + } + "KC_6": { + "key": "RU_6", + "label": "6", + } + "KC_7": { + "key": "RU_7", + "label": "7", + } + "KC_8": { + "key": "RU_8", + "label": "8", + } + "KC_9": { + "key": "RU_9", + "label": "9", + } + "KC_0": { + "key": "RU_0", + "label": "0", + } + "KC_MINS": { + "key": "RU_MINS", + "label": "-", + } + "KC_EQL": { + "key": "RU_EQL", + "label": "=", + } + "KC_Q": { + "key": "RU_SHTI", + "label": "Й", + } + "KC_W": { + "key": "RU_TSE", + "label": "Ц", + } + "KC_E": { + "key": "RU_U", + "label": "У", + } + "KC_R": { + "key": "RU_KA", + "label": "К", + } + "KC_T": { + "key": "RU_IE", + "label": "Е", + } + "KC_Y": { + "key": "RU_EN", + "label": "Н", + } + "KC_U": { + "key": "RU_GHE", + "label": "Г", + } + "KC_I": { + "key": "RU_SHA", + "label": "Ш", + } + "KC_O": { + "key": "RU_SHCH", + "label": "Щ", + } + "KC_P": { + "key": "RU_ZE", + "label": "З", + } + "KC_LBRC": { + "key": "RU_HA", + "label": "Х", + } + "KC_RBRC": { + "key": "RU_HARD", + "label": "Ъ", + } + "KC_BSLS": { + "key": "RU_BSLS", + "label": "\\", + } + "KC_A": { + "key": "RU_EF", + "label": "Ф", + } + "KC_S": { + "key": "RU_YERU", + "label": "Ы", + } + "KC_D": { + "key": "RU_VE", + "label": "В", + } + "KC_F": { + "key": "RU_A", + "label": "А", + } + "KC_G": { + "key": "RU_PE", + "label": "П", + } + "KC_H": { + "key": "RU_ER", + "label": "Р", + } + "KC_J": { + "key": "RU_O", + "label": "О", + } + "KC_K": { + "key": "RU_EL", + "label": "Л", + } + "KC_L": { + "key": "RU_DE", + "label": "Д", + } + "KC_SCLN": { + "key": "RU_ZHE", + "label": "Ж", + } + "KC_QUOT": { + "key": "RU_E", + "label": "Э", + } + "KC_Z": { + "key": "RU_YA", + "label": "Я", + } + "KC_X": { + "key": "RU_CHE", + "label": "Ч", + } + "KC_C": { + "key": "RU_ES", + "label": "С", + } + "KC_V": { + "key": "RU_EM", + "label": "М", + } + "KC_B": { + "key": "RU_I", + "label": "И", + } + "KC_N": { + "key": "RU_TE", + "label": "Т", + } + "KC_M": { + "key": "RU_SOFT", + "label": "Ь", + } + "KC_COMM": { + "key": "RU_BE", + "label": "Б", + } + "KC_DOT": { + "key": "RU_YU", + "label": "Ю", + } + "KC_SLSH": { + "key": "RU_DOT", + "label": ".", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ! │ " │ № │ ; │ % │ : │ ? │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ / │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ , │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(RU_1)": { + "key": "RU_EXLM", + "label": "!", + } + "S(RU_2)": { + "key": "RU_DQUO", + "label": "\"", + } + "S(RU_3)": { + "key": "RU_NUM", + "label": "№", + } + "S(RU_4)": { + "key": "RU_SCLN", + "label": ";", + } + "S(RU_5)": { + "key": "RU_PERC", + "label": "%", + } + "S(RU_6)": { + "key": "RU_COLN", + "label": ":", + } + "S(RU_7)": { + "key": "RU_QUES", + "label": "?", + } + "S(RU_8)": { + "key": "RU_ASTR", + "label": "*", + } + "S(RU_9)": { + "key": "RU_LPRN", + "label": "(", + } + "S(RU_0)": { + "key": "RU_RPRN", + "label": ")", + } + "S(RU_MINS)": { + "key": "RU_UNDS", + "label": "_", + } + "S(RU_EQL)": { + "key": "RU_PLUS", + "label": "+", + } + "S(RU_BSLS)": { + "key": "RU_SLSH", + "label": "/", + } + "S(RU_DOT)": { + "key": "RU_COMM", + "label": ",", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ ₽ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(RU_8)": { + "key": "RU_RUBL", + "label": "₽", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_serbian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_serbian_0.0.1.hjson new file mode 100644 index 0000000000..98957930a0 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_serbian_0.0.1.hjson @@ -0,0 +1,307 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Љ │ Њ │ Е │ Р │ Т │ З │ У │ И │ О │ П │ Ш │ Ђ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ А │ С │ Д │ Ф │ Г │ Х │ Ј │ К │ Л │ Ч │ Ћ │ Ж │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Ѕ │ Џ │ Ц │ В │ Б │ Н │ М │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "RS_GRV", + "label": "`", + } + "KC_1": { + "key": "RS_1", + "label": "1", + } + "KC_2": { + "key": "RS_2", + "label": "2", + } + "KC_3": { + "key": "RS_3", + "label": "3", + } + "KC_4": { + "key": "RS_4", + "label": "4", + } + "KC_5": { + "key": "RS_5", + "label": "5", + } + "KC_6": { + "key": "RS_6", + "label": "6", + } + "KC_7": { + "key": "RS_7", + "label": "7", + } + "KC_8": { + "key": "RS_8", + "label": "8", + } + "KC_9": { + "key": "RS_9", + "label": "9", + } + "KC_0": { + "key": "RS_0", + "label": "0", + } + "KC_MINS": { + "key": "RS_QUOT", + "label": "' (dead)", + } + "KC_EQL": { + "key": "RS_PLUS", + "label": "+", + } + "KC_Q": { + "key": "RS_LJE", + "label": "Љ", + } + "KC_W": { + "key": "RS_NJE", + "label": "Њ", + } + "KC_E": { + "key": "RS_IE", + "label": "Е", + } + "KC_R": { + "key": "RS_ER", + "label": "Р", + } + "KC_T": { + "key": "RS_TE", + "label": "Т", + } + "KC_Y": { + "key": "RS_ZE", + "label": "З", + } + "KC_U": { + "key": "RS_U", + "label": "У", + } + "KC_I": { + "key": "RS_I", + "label": "И", + } + "KC_O": { + "key": "RS_O", + "label": "О", + } + "KC_P": { + "key": "RS_PE", + "label": "П", + } + "KC_LBRC": { + "key": "RS_SHA", + "label": "Ш", + } + "KC_RBRC": { + "key": "RS_DJE", + "label": "Ђ", + } + "KC_A": { + "key": "RS_A", + "label": "А", + } + "KC_S": { + "key": "RS_ES", + "label": "С", + } + "KC_D": { + "key": "RS_DE", + "label": "Д", + } + "KC_F": { + "key": "RS_EF", + "label": "Ф", + } + "KC_G": { + "key": "RS_GHE", + "label": "Г", + } + "KC_H": { + "key": "RS_HA", + "label": "Х", + } + "KC_J": { + "key": "RS_JE", + "label": "Ј", + } + "KC_K": { + "key": "RS_KA", + "label": "К", + } + "KC_L": { + "key": "RS_EL", + "label": "Л", + } + "KC_SCLN": { + "key": "RS_CHE", + "label": "Ч", + } + "KC_QUOT": { + "key": "RS_TSHE", + "label": "Ћ", + } + "KC_NUHS": { + "key": "RS_ZHE", + "label": "Ж", + } + "KC_NUBS": { + "key": "RS_LABK", + "label": "<", + } + "KC_Z": { + "key": "RS_DZE", + "label": "Ѕ", + } + "KC_X": { + "key": "RS_DZHE", + "label": "Џ", + } + "KC_C": { + "key": "RS_TSE", + "label": "Ц", + } + "KC_V": { + "key": "RS_VE", + "label": "В", + } + "KC_B": { + "key": "RS_BE", + "label": "Б", + } + "KC_N": { + "key": "RS_EN", + "label": "Н", + } + "KC_M": { + "key": "RS_EM", + "label": "М", + } + "KC_COMM": { + "key": "RS_COMM", + "label": ",", + } + "KC_DOT": { + "key": "RS_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "RS_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(RS_GRV)": { + "key": "RS_TILD", + "label": "~", + } + "S(RS_1)": { + "key": "RS_EXLM", + "label": "!", + } + "S(RS_2)": { + "key": "RS_DQUO", + "label": "\"", + } + "S(RS_3)": { + "key": "RS_HASH", + "label": "#", + } + "S(RS_4)": { + "key": "RS_DLR", + "label": "$", + } + "S(RS_5)": { + "key": "RS_PERC", + "label": "%", + } + "S(RS_6)": { + "key": "RS_AMPR", + "label": "&", + } + "S(RS_7)": { + "key": "RS_SLSH", + "label": "/", + } + "S(RS_8)": { + "key": "RS_LPRN", + "label": "(", + } + "S(RS_9)": { + "key": "RS_RPRN", + "label": ")", + } + "S(RS_0)": { + "key": "RS_EQL", + "label": "=", + } + "S(RS_QUOT)": { + "key": "RS_QUES", + "label": "?", + } + "S(RS_PLUS)": { + "key": "RS_ASTR", + "label": "*", + } + "S(RS_LABK)": { + "key": "RS_RABK", + "label": ">", + } + "S(RS_COMM)": { + "key": "RS_SCLN", + "label": ";", + } + "S(RS_DOT)": { + "key": "RS_COLN", + "label": ":", + } + "S(RS_MINS)": { + "key": "RS_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(RS_IE)": { + "key": "RS_EURO", + "label": "€", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_serbian_latin_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_serbian_latin_0.0.1.hjson new file mode 100644 index 0000000000..ca4746b646 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_serbian_latin_0.0.1.hjson @@ -0,0 +1,407 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ‚ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "RS_SLQU", + "label": "‚ (dead)", + } + "KC_1": { + "key": "RS_1", + "label": "1", + } + "KC_2": { + "key": "RS_2", + "label": "2", + } + "KC_3": { + "key": "RS_3", + "label": "3", + } + "KC_4": { + "key": "RS_4", + "label": "4", + } + "KC_5": { + "key": "RS_5", + "label": "5", + } + "KC_6": { + "key": "RS_6", + "label": "6", + } + "KC_7": { + "key": "RS_7", + "label": "7", + } + "KC_8": { + "key": "RS_8", + "label": "8", + } + "KC_9": { + "key": "RS_9", + "label": "9", + } + "KC_0": { + "key": "RS_0", + "label": "0", + } + "KC_MINS": { + "key": "RS_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "RS_PLUS", + "label": "+", + } + "KC_Q": { + "key": "RS_Q", + "label": "Q", + } + "KC_W": { + "key": "RS_W", + "label": "W", + } + "KC_E": { + "key": "RS_E", + "label": "E", + } + "KC_R": { + "key": "RS_R", + "label": "R", + } + "KC_T": { + "key": "RS_T", + "label": "T", + } + "KC_Y": { + "key": "RS_Z", + "label": "Z", + } + "KC_U": { + "key": "RS_U", + "label": "U", + } + "KC_I": { + "key": "RS_I", + "label": "I", + } + "KC_O": { + "key": "RS_O", + "label": "O", + } + "KC_P": { + "key": "RS_P", + "label": "P", + } + "KC_LBRC": { + "key": "RS_SCAR", + "label": "Š", + } + "KC_RBRC": { + "key": "RS_DSTR", + "label": "Đ", + } + "KC_A": { + "key": "RS_A", + "label": "A", + } + "KC_S": { + "key": "RS_S", + "label": "S", + } + "KC_D": { + "key": "RS_D", + "label": "D", + } + "KC_F": { + "key": "RS_F", + "label": "F", + } + "KC_G": { + "key": "RS_G", + "label": "G", + } + "KC_H": { + "key": "RS_H", + "label": "H", + } + "KC_J": { + "key": "RS_J", + "label": "J", + } + "KC_K": { + "key": "RS_K", + "label": "K", + } + "KC_L": { + "key": "RS_L", + "label": "L", + } + "KC_SCLN": { + "key": "RS_CCAR", + "label": "Č", + } + "KC_QUOT": { + "key": "RS_CACU", + "label": "Ć", + } + "KC_NUHS": { + "key": "RS_ZCAR", + "label": "Ž", + } + "KC_NUBS": { + "key": "RS_LABK", + "label": "<", + } + "KC_Z": { + "key": "RS_Y", + "label": "Y", + } + "KC_X": { + "key": "RS_X", + "label": "X", + } + "KC_C": { + "key": "RS_C", + "label": "C", + } + "KC_V": { + "key": "RS_V", + "label": "V", + } + "KC_B": { + "key": "RS_B", + "label": "B", + } + "KC_N": { + "key": "RS_N", + "label": "N", + } + "KC_M": { + "key": "RS_M", + "label": "M", + } + "KC_COMM": { + "key": "RS_COMM", + "label": ",", + } + "KC_DOT": { + "key": "RS_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "RS_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(RS_SLQU)": { + "key": "RS_TILD", + "label": "~", + } + "S(RS_1)": { + "key": "RS_EXLM", + "label": "!", + } + "S(RS_2)": { + "key": "RS_DQUO", + "label": "\"", + } + "S(RS_3)": { + "key": "RS_HASH", + "label": "#", + } + "S(RS_4)": { + "key": "RS_DLR", + "label": "$", + } + "S(RS_5)": { + "key": "RS_PERC", + "label": "%", + } + "S(RS_6)": { + "key": "RS_AMPR", + "label": "&", + } + "S(RS_7)": { + "key": "RS_SLSH", + "label": "/", + } + "S(RS_8)": { + "key": "RS_LPRN", + "label": "(", + } + "S(RS_9)": { + "key": "RS_RPRN", + "label": ")", + } + "S(RS_0)": { + "key": "RS_EQL", + "label": "=", + } + "S(RS_QUOT)": { + "key": "RS_QUES", + "label": "?", + } + "S(RS_PLUS)": { + "key": "RS_ASTR", + "label": "*", + } + "S(RS_LABK)": { + "key": "RS_RABK", + "label": ">", + } + "S(RS_COMM)": { + "key": "RS_SCLN", + "label": ";", + } + "S(RS_DOT)": { + "key": "RS_COLN", + "label": ":", + } + "S(RS_MINS)": { + "key": "RS_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ ¨ │ ¸ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(RS_2)": { + "key": "RS_CARN", + "label": "ˇ (dead)", + } + "ALGR(RS_3)": { + "key": "RS_CIRC", + "label": "^ (dead)", + } + "ALGR(RS_4)": { + "key": "RS_BREV", + "label": "˘ (dead)", + } + "ALGR(RS_5)": { + "key": "RS_RNGA", + "label": "° (dead)", + } + "ALGR(RS_6)": { + "key": "RS_OGON", + "label": "˛ (dead)", + } + "ALGR(RS_7)": { + "key": "RS_GRV", + "label": "`", + } + "ALGR(RS_8)": { + "key": "RS_DOTA", + "label": "˙ (dead)", + } + "ALGR(RS_9)": { + "key": "RS_ACUT", + "label": "´ (dead)", + } + "ALGR(RS_0)": { + "key": "RS_DACU", + "label": "˝ (dead)", + } + "ALGR(RS_QUOT)": { + "key": "RS_DIAE", + "label": "¨ (dead)", + } + "ALGR(RS_PLUS)": { + "key": "RS_CEDL", + "label": "¸ (dead)", + } + "ALGR(RS_Q)": { + "key": "RS_BSLS", + "label": "\\", + } + "ALGR(RS_W)": { + "key": "RS_PIPE", + "label": "|", + } + "ALGR(RS_E)": { + "key": "RS_EURO", + "label": "€", + } + "ALGR(RS_SCAR)": { + "key": "RS_DIV", + "label": "÷", + } + "ALGR(RS_DSTR)": { + "key": "RS_MUL", + "label": "×", + } + "ALGR(RS_F)": { + "key": "RS_LBRC", + "label": "[", + } + "ALGR(RS_G)": { + "key": "RS_RBRC", + "label": "]", + } + "ALGR(RS_K)": { + "key": "RS_LLST", + "label": "ł", + } + "ALGR(RS_L)": { + "key": "RS_CLST", + "label": "Ł", + } + "ALGR(RS_CACU)": { + "key": "RS_SS", + "label": "ß", + } + "ALGR(RS_ZCAR)": { + "key": "RS_CURR", + "label": "¤", + } + "ALGR(RS_V)": { + "key": "RS_AT", + "label": "@", + } + "ALGR(RS_B)": { + "key": "RS_LCBR", + "label": "{", + } + "ALGR(RS_N)": { + "key": "RS_RCBR", + "label": "}", + } + "ALGR(RS_M)": { + "key": "RS_SECT", + "label": "§", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_slovak_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_slovak_0.0.1.hjson new file mode 100644 index 0000000000..14eb4b783a --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_slovak_0.0.1.hjson @@ -0,0 +1,443 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ; │ + │ ľ │ š │ č │ ť │ ž │ ý │ á │ í │ é │ = │ ´ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ä │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ô │ § │ ň │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ & │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "SK_SCLN", + "label": ";", + } + "KC_1": { + "key": "SK_PLUS", + "label": "+", + } + "KC_2": { + "key": "SK_LCAR", + "label": "ľ", + } + "KC_3": { + "key": "SK_SCAR", + "label": "š", + } + "KC_4": { + "key": "SK_CCAR", + "label": "č", + } + "KC_5": { + "key": "SK_TCAR", + "label": "ť", + } + "KC_6": { + "key": "SK_ZCAR", + "label": "ž", + } + "KC_7": { + "key": "SK_YACU", + "label": "ý", + } + "KC_8": { + "key": "SK_AACU", + "label": "á", + } + "KC_9": { + "key": "SK_IACU", + "label": "í", + } + "KC_0": { + "key": "SK_EACU", + "label": "é", + } + "KC_MINS": { + "key": "SK_EQL", + "label": "=", + } + "KC_EQL": { + "key": "SK_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "SK_Q", + "label": "Q", + } + "KC_W": { + "key": "SK_W", + "label": "W", + } + "KC_E": { + "key": "SK_E", + "label": "E", + } + "KC_R": { + "key": "SK_R", + "label": "R", + } + "KC_T": { + "key": "SK_T", + "label": "T", + } + "KC_Y": { + "key": "SK_Z", + "label": "Z", + } + "KC_U": { + "key": "SK_U", + "label": "U", + } + "KC_I": { + "key": "SK_I", + "label": "I", + } + "KC_O": { + "key": "SK_O", + "label": "O", + } + "KC_P": { + "key": "SK_P", + "label": "P", + } + "KC_LBRC": { + "key": "SK_UACU", + "label": "ú", + } + "KC_RBRC": { + "key": "SK_ADIA", + "label": "ä", + } + "KC_A": { + "key": "SK_A", + "label": "A", + } + "KC_S": { + "key": "SK_S", + "label": "S", + } + "KC_D": { + "key": "SK_D", + "label": "D", + } + "KC_F": { + "key": "SK_F", + "label": "F", + } + "KC_G": { + "key": "SK_G", + "label": "G", + } + "KC_H": { + "key": "SK_H", + "label": "H", + } + "KC_J": { + "key": "SK_J", + "label": "J", + } + "KC_K": { + "key": "SK_K", + "label": "K", + } + "KC_L": { + "key": "SK_L", + "label": "L", + } + "KC_SCLN": { + "key": "SK_OCIR", + "label": "ô", + } + "KC_QUOT": { + "key": "SK_SECT", + "label": "§", + } + "KC_NUHS": { + "key": "SK_NCAR", + "label": "ň", + } + "KC_NUBS": { + "key": "SK_AMPR", + "label": "&", + } + "KC_Z": { + "key": "SK_Y", + "label": "Y", + } + "KC_X": { + "key": "SK_X", + "label": "X", + } + "KC_C": { + "key": "SK_C", + "label": "C", + } + "KC_V": { + "key": "SK_V", + "label": "V", + } + "KC_B": { + "key": "SK_B", + "label": "B", + } + "KC_N": { + "key": "SK_N", + "label": "N", + } + "KC_M": { + "key": "SK_M", + "label": "M", + } + "KC_COMM": { + "key": "SK_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SK_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SK_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ " │ ! │ ) │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ * │ │ │ │ │ │ │ │ ? │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(SK_SCLN)": { + "key": "SK_RNGA", + "label": "° (dead)", + } + "S(SK_PLUS)": { + "key": "SK_1", + "label": "1", + } + "S(SK_LCAR)": { + "key": "SK_2", + "label": "2", + } + "S(SK_SCAR)": { + "key": "SK_3", + "label": "3", + } + "S(SK_CCAR)": { + "key": "SK_4", + "label": "4", + } + "S(SK_TCAR)": { + "key": "SK_5", + "label": "5", + } + "S(SK_ZCAR)": { + "key": "SK_6", + "label": "6", + } + "S(SK_YACU)": { + "key": "SK_7", + "label": "7", + } + "S(SK_AACU)": { + "key": "SK_8", + "label": "8", + } + "S(SK_IACU)": { + "key": "SK_9", + "label": "9", + } + "S(SK_EACU)": { + "key": "SK_0", + "label": "0", + } + "S(SK_EQL)": { + "key": "SK_PERC", + "label": "%", + } + "S(SK_ACUT)": { + "key": "SK_CARN", + "label": "ˇ (dead)", + } + "S(SK_UACU)": { + "key": "SK_SLSH", + "label": "/", + } + "S(SK_ADIA)": { + "key": "SK_LPRN", + "label": "(", + } + "S(SK_OCIR)": { + "key": "SK_DQUO", + "label": "\"", + } + "S(SK_SECT)": { + "key": "SK_EXLM", + "label": "!", + } + "S(SK_NCAR)": { + "key": "SK_RPRN", + "label": ")", + } + "S(SK_AMPR)": { + "key": "SK_ASTR", + "label": "*", + } + "S(SK_COMM)": { + "key": "SK_QUES", + "label": "?", + } + "S(SK_DOT)": { + "key": "SK_COLN", + "label": ":", + } + "S(SK_MINS)": { + "key": "SK_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ~ │ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ │ ˝ │ ¨ │ ¸ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ \ │ | │ € │ │ │ │ │ │ │ ' │ ÷ │ × │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ > │ # │ │ @ │ { │ } │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(SK_PLUS)": { + "key": "SK_TILD", + "label": "~", + } + "ALGR(SK_SCAR)": { + "key": "SK_CIRC", + "label": "^ (dead)", + } + "ALGR(SK_CCAR)": { + "key": "SK_BREV", + "label": "˘ (dead)", + } + "ALGR(SK_TCAR)": { + "key": "SK_OGON", + "label": "˛ (dead)", + } + "ALGR(SK_ZCAR)": { + "key": "SK_GRV", + "label": "`", + } + "ALGR(SK_YACU)": { + "key": "SK_DOTA", + "label": "˙ (dead)", + } + "ALGR(SK_EACU)": { + "key": "SK_DACU", + "label": "˝ (dead)", + } + "ALGR(SK_EQL)": { + "key": "SK_DIAE", + "label": "¨ (dead)", + } + "ALGR(SK_ACUT)": { + "key": "SK_CEDL", + "label": "¸ (dead)", + } + "ALGR(SK_Q)": { + "key": "SK_BSLS", + "label": "\\", + } + "ALGR(SK_W)": { + "key": "SK_PIPE", + "label": "|", + } + "ALGR(SK_E)": { + "key": "SK_EURO", + "label": "€", + } + "ALGR(SK_P)": { + "key": "SK_QUOT", + "label": "'", + } + "ALGR(SK_UACU)": { + "key": "SK_DIV", + "label": "÷", + } + "ALGR(SK_ADIA)": { + "key": "SK_MUL", + "label": "×", + } + "ALGR(SK_S)": { + "key": "SK_LDST", + "label": "đ", + } + "ALGR(SK_D)": { + "key": "SK_CDST", + "label": "Đ", + } + "ALGR(SK_F)": { + "key": "SK_LBRC", + "label": "[", + } + "ALGR(SK_G)": { + "key": "SK_RBRC", + "label": "]", + } + "ALGR(SK_K)": { + "key": "SK_LLST", + "label": "ł", + } + "ALGR(SK_L)": { + "key": "SK_CLST", + "label": "Ł", + } + "ALGR(SK_OCIR)": { + "key": "SK_DLR", + "label": "$", + } + "ALGR(SK_SECT)": { + "key": "SK_SS", + "label": "ß", + } + "ALGR(SK_NCAR)": { + "key": "SK_CURR", + "label": "¤", + } + "ALGR(SK_AMPR)": { + "key": "SK_LABK", + "label": "<", + } + "ALGR(SK_Y)": { + "key": "SK_RABK", + "label": ">", + } + "ALGR(SK_X)": { + "key": "SK_HASH", + "label": "#", + } + "ALGR(SK_V)": { + "key": "SK_AT", + "label": "@", + } + "ALGR(SK_B)": { + "key": "SK_LCBR", + "label": "{", + } + "ALGR(SK_N)": { + "key": "SK_RCBR", + "label": "}", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_slovenian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_slovenian_0.0.1.hjson new file mode 100644 index 0000000000..fd1a4eb4fc --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_slovenian_0.0.1.hjson @@ -0,0 +1,403 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¸ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "SI_CEDL", + "label": "¸ (dead)", + } + "KC_1": { + "key": "SI_1", + "label": "1", + } + "KC_2": { + "key": "SI_2", + "label": "2", + } + "KC_3": { + "key": "SI_3", + "label": "3", + } + "KC_4": { + "key": "SI_4", + "label": "4", + } + "KC_5": { + "key": "SI_5", + "label": "5", + } + "KC_6": { + "key": "SI_6", + "label": "6", + } + "KC_7": { + "key": "SI_7", + "label": "7", + } + "KC_8": { + "key": "SI_8", + "label": "8", + } + "KC_9": { + "key": "SI_9", + "label": "9", + } + "KC_0": { + "key": "SI_0", + "label": "0", + } + "KC_MINS": { + "key": "SI_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "SI_PLUS", + "label": "+", + } + "KC_Q": { + "key": "SI_Q", + "label": "Q", + } + "KC_W": { + "key": "SI_W", + "label": "W", + } + "KC_E": { + "key": "SI_E", + "label": "E", + } + "KC_R": { + "key": "SI_R", + "label": "R", + } + "KC_T": { + "key": "SI_T", + "label": "T", + } + "KC_Y": { + "key": "SI_Z", + "label": "Z", + } + "KC_U": { + "key": "SI_U", + "label": "U", + } + "KC_I": { + "key": "SI_I", + "label": "I", + } + "KC_O": { + "key": "SI_O", + "label": "O", + } + "KC_P": { + "key": "SI_P", + "label": "P", + } + "KC_LBRC": { + "key": "SI_SCAR", + "label": "Š", + } + "KC_RBRC": { + "key": "SI_DSTR", + "label": "Đ", + } + "KC_A": { + "key": "SI_A", + "label": "A", + } + "KC_S": { + "key": "SI_S", + "label": "S", + } + "KC_D": { + "key": "SI_D", + "label": "D", + } + "KC_F": { + "key": "SI_F", + "label": "F", + } + "KC_G": { + "key": "SI_G", + "label": "G", + } + "KC_H": { + "key": "SI_H", + "label": "H", + } + "KC_J": { + "key": "SI_J", + "label": "J", + } + "KC_K": { + "key": "SI_K", + "label": "K", + } + "KC_L": { + "key": "SI_L", + "label": "L", + } + "KC_SCLN": { + "key": "SI_CCAR", + "label": "Č", + } + "KC_QUOT": { + "key": "SI_CACU", + "label": "Ć", + } + "KC_NUHS": { + "key": "SI_ZCAR", + "label": "Ž", + } + "KC_NUBS": { + "key": "SI_LABK", + "label": "<", + } + "KC_Z": { + "key": "SI_Y", + "label": "Y", + } + "KC_X": { + "key": "SI_X", + "label": "X", + } + "KC_C": { + "key": "SI_C", + "label": "C", + } + "KC_V": { + "key": "SI_V", + "label": "V", + } + "KC_B": { + "key": "SI_B", + "label": "B", + } + "KC_N": { + "key": "SI_N", + "label": "N", + } + "KC_M": { + "key": "SI_M", + "label": "M", + } + "KC_COMM": { + "key": "SI_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SI_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SI_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(SI_CEDL)": { + "key": "SI_DIAE", + "label": "¨ (dead)", + } + "S(SI_1)": { + "key": "SI_EXLM", + "label": "!", + } + "S(SI_2)": { + "key": "SI_DQUO", + "label": "\"", + } + "S(SI_3)": { + "key": "SI_HASH", + "label": "#", + } + "S(SI_4)": { + "key": "SI_DLR", + "label": "$", + } + "S(SI_5)": { + "key": "SI_PERC", + "label": "%", + } + "S(SI_6)": { + "key": "SI_AMPR", + "label": "&", + } + "S(SI_7)": { + "key": "SI_SLSH", + "label": "/", + } + "S(SI_8)": { + "key": "SI_LPRN", + "label": "(", + } + "S(SI_9)": { + "key": "SI_RPRN", + "label": ")", + } + "S(SI_0)": { + "key": "SI_EQL", + "label": "=", + } + "S(SI_QUOT)": { + "key": "SI_QUES", + "label": "?", + } + "S(SI_PLUS)": { + "key": "SI_ASTR", + "label": "*", + } + "S(SI_LABK)": { + "key": "SI_RABK", + "label": ">", + } + "S(SI_COMM)": { + "key": "SI_SCLN", + "label": ";", + } + "S(SI_DOT)": { + "key": "SI_COLN", + "label": ":", + } + "S(SI_MINS)": { + "key": "SI_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(SI_1)": { + "key": "SI_TILD", + "label": "~", + } + "ALGR(SI_2)": { + "key": "SI_CARN", + "label": "ˇ (dead)", + } + "ALGR(SI_3)": { + "key": "SI_CIRC", + "label": "^ (dead)", + } + "ALGR(SI_4)": { + "key": "SI_BREV", + "label": "˘ (dead)", + } + "ALGR(SI_5)": { + "key": "SI_RNGA", + "label": "° (dead)", + } + "ALGR(SI_6)": { + "key": "SI_OGON", + "label": "˛ (dead)", + } + "ALGR(SI_7)": { + "key": "SI_GRV", + "label": "`", + } + "ALGR(SI_8)": { + "key": "SI_DOTA", + "label": "˙ (dead)", + } + "ALGR(SI_9)": { + "key": "SI_ACUT", + "label": "´ (dead)", + } + "ALGR(SI_0)": { + "key": "SI_DACU", + "label": "˝ (dead)", + } + "ALGR(SI_Q)": { + "key": "SI_BSLS", + "label": "\\", + } + "ALGR(SI_W)": { + "key": "SI_PIPE", + "label": "|", + } + "ALGR(SI_E)": { + "key": "SI_EURO", + "label": "€", + } + "ALGR(SI_SCAR)": { + "key": "SI_DIV", + "label": "÷", + } + "ALGR(SI_DSTR)": { + "key": "SI_MUL", + "label": "×", + } + "ALGR(SI_F)": { + "key": "SI_LBRC", + "label": "[", + } + "ALGR(SI_G)": { + "key": "SI_RBRC", + "label": "]", + } + "ALGR(SI_K)": { + "key": "SI_LLST", + "label": "ł", + } + "ALGR(SI_L)": { + "key": "SI_CLST", + "label": "Ł", + } + "ALGR(SI_CACU)": { + "key": "SI_SS", + "label": "ß", + } + "ALGR(SI_ZCAR)": { + "key": "SI_CURR", + "label": "¤", + } + "ALGR(SI_V)": { + "key": "SI_AT", + "label": "@", + } + "ALGR(SI_B)": { + "key": "SI_LCBR", + "label": "{", + } + "ALGR(SI_N)": { + "key": "SI_RCBR", + "label": "}", + } + "ALGR(SI_M)": { + "key": "SI_SECT", + "label": "§", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_spanish_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_spanish_0.0.1.hjson new file mode 100644 index 0000000000..db3b068e97 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_spanish_0.0.1.hjson @@ -0,0 +1,359 @@ +{ + "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": "ES_MORD", + "label": "º", + } + "KC_1": { + "key": "ES_1", + "label": "1", + } + "KC_2": { + "key": "ES_2", + "label": "2", + } + "KC_3": { + "key": "ES_3", + "label": "3", + } + "KC_4": { + "key": "ES_4", + "label": "4", + } + "KC_5": { + "key": "ES_5", + "label": "5", + } + "KC_6": { + "key": "ES_6", + "label": "6", + } + "KC_7": { + "key": "ES_7", + "label": "7", + } + "KC_8": { + "key": "ES_8", + "label": "8", + } + "KC_9": { + "key": "ES_9", + "label": "9", + } + "KC_0": { + "key": "ES_0", + "label": "0", + } + "KC_MINS": { + "key": "ES_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "ES_IEXL", + "label": "¡", + } + "KC_Q": { + "key": "ES_Q", + "label": "Q", + } + "KC_W": { + "key": "ES_W", + "label": "W", + } + "KC_E": { + "key": "ES_E", + "label": "E", + } + "KC_R": { + "key": "ES_R", + "label": "R", + } + "KC_T": { + "key": "ES_T", + "label": "T", + } + "KC_Y": { + "key": "ES_Y", + "label": "Y", + } + "KC_U": { + "key": "ES_U", + "label": "U", + } + "KC_I": { + "key": "ES_I", + "label": "I", + } + "KC_O": { + "key": "ES_O", + "label": "O", + } + "KC_P": { + "key": "ES_P", + "label": "P", + } + "KC_LBRC": { + "key": "ES_GRV", + "label": "` (dead)", + } + "KC_RBRC": { + "key": "ES_PLUS", + "label": "+", + } + "KC_A": { + "key": "ES_A", + "label": "A", + } + "KC_S": { + "key": "ES_S", + "label": "S", + } + "KC_D": { + "key": "ES_D", + "label": "D", + } + "KC_F": { + "key": "ES_F", + "label": "F", + } + "KC_G": { + "key": "ES_G", + "label": "G", + } + "KC_H": { + "key": "ES_H", + "label": "H", + } + "KC_J": { + "key": "ES_J", + "label": "J", + } + "KC_K": { + "key": "ES_K", + "label": "K", + } + "KC_L": { + "key": "ES_L", + "label": "L", + } + "KC_SCLN": { + "key": "ES_NTIL", + "label": "Ñ", + } + "KC_QUOT": { + "key": "ES_ACUT", + "label": "´ (dead)", + } + "KC_NUHS": { + "key": "ES_CCED", + "label": "Ç", + } + "KC_NUBS": { + "key": "ES_LABK", + "label": "<", + } + "KC_Z": { + "key": "ES_Z", + "label": "Z", + } + "KC_X": { + "key": "ES_X", + "label": "X", + } + "KC_C": { + "key": "ES_C", + "label": "C", + } + "KC_V": { + "key": "ES_V", + "label": "V", + } + "KC_B": { + "key": "ES_B", + "label": "B", + } + "KC_N": { + "key": "ES_N", + "label": "N", + } + "KC_M": { + "key": "ES_M", + "label": "M", + } + "KC_COMM": { + "key": "ES_COMM", + "label": ",", + } + "KC_DOT": { + "key": "ES_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "ES_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ª │ ! │ " │ · │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¿ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ES_MORD)": { + "key": "ES_FORD", + "label": "ª", + } + "S(ES_1)": { + "key": "ES_EXLM", + "label": "!", + } + "S(ES_2)": { + "key": "ES_DQUO", + "label": "\"", + } + "S(ES_3)": { + "key": "ES_BULT", + "label": "·", + } + "S(ES_4)": { + "key": "ES_DLR", + "label": "$", + } + "S(ES_5)": { + "key": "ES_PERC", + "label": "%", + } + "S(ES_6)": { + "key": "ES_AMPR", + "label": "&", + } + "S(ES_7)": { + "key": "ES_SLSH", + "label": "/", + } + "S(ES_8)": { + "key": "ES_LPRN", + "label": "(", + } + "S(ES_9)": { + "key": "ES_RPRN", + "label": ")", + } + "S(ES_0)": { + "key": "ES_EQL", + "label": "=", + } + "S(ES_QUOT)": { + "key": "ES_QUES", + "label": "?", + } + "S(ES_IEXL)": { + "key": "ES_IQUE", + "label": "¿", + } + "S(ES_GRV)": { + "key": "ES_CIRC", + "label": "^ (dead)", + } + "S(ES_PLUS)": { + "key": "ES_ASTR", + "label": "*", + } + "S(ES_ACUT)": { + "key": "ES_DIAE", + "label": "¨ (dead)", + } + "S(ES_LABK)": { + "key": "ES_RABK", + "label": ">", + } + "S(KC_COMM)": { + "key": "ES_SCLN", + "label": ";", + } + "S(KC_DOT)": { + "key": "ES_COLN", + "label": ":", + } + "S(ES_MINS)": { + "key": "ES_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ \ │ | │ @ │ # │ ~ │ € │ ¬ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(ES_MORD)": { + "key": "ES_BSLS", + "label": "\\", + } + "ALGR(ES_1)": { + "key": "ES_PIPE", + "label": "|", + } + "ALGR(ES_2)": { + "key": "ES_AT", + "label": "@", + } + "ALGR(ES_3)": { + "key": "ES_HASH", + "label": "#", + } + "ALGR(ES_4)": { + "key": "ES_TILD", + "label": "~", + } + "ALGR(ES_5)": { + "key": "ES_EURO", + "label": "€", + } + "ALGR(ES_6)": { + "key": "ES_NOT", + "label": "¬", + } + "ALGR(ES_GRV)": { + "key": "ES_LBRC", + "label": "[", + } + "ALGR(ES_PLUS)": { + "key": "ES_RBRC", + "label": "]", + } + "ALGR(ES_ACUT)": { + "key": "ES_LCBR", + "label": "{", + } + "ALGR(ES_CCED)": { + "key": "ES_RCBR", + "label": "}", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_spanish_dvorak_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_spanish_dvorak_0.0.1.hjson new file mode 100644 index 0000000000..39119a6a91 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_spanish_dvorak_0.0.1.hjson @@ -0,0 +1,359 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ º │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ¡ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ . │ , │ Ñ │ P │ Y │ F │ G │ C │ H │ L │ ` │ + │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ O │ E │ U │ I │ D │ R │ T │ N │ S │ ´ │ Ç │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ - │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "DV_MORD", + "label": "º", + } + "KC_1": { + "key": "DV_1", + "label": "1", + } + "KC_2": { + "key": "DV_2", + "label": "2", + } + "KC_3": { + "key": "DV_3", + "label": "3", + } + "KC_4": { + "key": "DV_4", + "label": "4", + } + "KC_5": { + "key": "DV_5", + "label": "5", + } + "KC_6": { + "key": "DV_6", + "label": "6", + } + "KC_7": { + "key": "DV_7", + "label": "7", + } + "KC_8": { + "key": "DV_8", + "label": "8", + } + "KC_9": { + "key": "DV_9", + "label": "9", + } + "KC_0": { + "key": "DV_0", + "label": "0", + } + "KC_MINS": { + "key": "DV_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "DV_IEXL", + "label": "¡", + } + "KC_Q": { + "key": "DV_DOT", + "label": ".", + } + "KC_W": { + "key": "DV_COMM", + "label": ",", + } + "KC_E": { + "key": "DV_NTIL", + "label": "Ñ", + } + "KC_R": { + "key": "DV_P", + "label": "P", + } + "KC_T": { + "key": "DV_Y", + "label": "Y", + } + "KC_Y": { + "key": "DV_F", + "label": "F", + } + "KC_U": { + "key": "DV_G", + "label": "G", + } + "KC_I": { + "key": "DV_C", + "label": "C", + } + "KC_O": { + "key": "DV_H", + "label": "H", + } + "KC_P": { + "key": "DV_L", + "label": "L", + } + "KC_LBRC": { + "key": "DV_GRV", + "label": "` (dead)", + } + "KC_RBRC": { + "key": "DV_PLUS", + "label": "+", + } + "KC_A": { + "key": "DV_A", + "label": "A", + } + "KC_S": { + "key": "DV_O", + "label": "O", + } + "KC_D": { + "key": "DV_E", + "label": "E", + } + "KC_F": { + "key": "DV_U", + "label": "U", + } + "KC_G": { + "key": "DV_I", + "label": "I", + } + "KC_H": { + "key": "DV_D", + "label": "D", + } + "KC_J": { + "key": "DV_R", + "label": "R", + } + "KC_K": { + "key": "DV_T", + "label": "T", + } + "KC_L": { + "key": "DV_N", + "label": "N", + } + "KC_SCLN": { + "key": "DV_S", + "label": "S", + } + "KC_QUOT": { + "key": "DV_ACUT", + "label": "´ (dead)", + } + "KC_NUHS": { + "key": "DV_CCED", + "label": "Ç", + } + "KC_NUBS": { + "key": "DV_LABK", + "label": "<", + } + "KC_Z": { + "key": "DV_MINS", + "label": "-", + } + "KC_X": { + "key": "DV_Q", + "label": "Q", + } + "KC_C": { + "key": "DV_J", + "label": "J", + } + "KC_V": { + "key": "DV_K", + "label": "K", + } + "KC_B": { + "key": "DV_X", + "label": "X", + } + "KC_N": { + "key": "DV_B", + "label": "B", + } + "KC_M": { + "key": "DV_M", + "label": "M", + } + "KC_COMM": { + "key": "DV_W", + "label": "W", + } + "KC_DOT": { + "key": "DV_V", + "label": "V", + } + "KC_SLSH": { + "key": "DV_Z", + "label": "Z", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ª │ ! │ " │ · │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¿ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ : │ ; │ │ │ │ │ │ │ │ │ ^ │ * │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ _ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(DV_MORD)": { + "key": "DV_FORD", + "label": "ª", + } + "S(DV_1)": { + "key": "DV_EXLM", + "label": "!", + } + "S(DV_2)": { + "key": "DV_DQUO", + "label": "\"", + } + "S(DV_3)": { + "key": "DV_BULT", + "label": "·", + } + "S(DV_4)": { + "key": "DV_DLR", + "label": "$", + } + "S(DV_5)": { + "key": "DV_PERC", + "label": "%", + } + "S(DV_6)": { + "key": "DV_AMPR", + "label": "&", + } + "S(DV_7)": { + "key": "DV_SLSH", + "label": "/", + } + "S(DV_8)": { + "key": "DV_LPRN", + "label": "(", + } + "S(DV_9)": { + "key": "DV_RPRN", + "label": ")", + } + "S(DV_0)": { + "key": "DV_EQL", + "label": "=", + } + "S(DV_QUOT)": { + "key": "DV_QUES", + "label": "?", + } + "S(DV_IEXL)": { + "key": "DV_IQUE", + "label": "¿", + } + "S(DV_DOT)": { + "key": "DV_COLN", + "label": ":", + } + "S(DV_COMM)": { + "key": "DV_SCLN", + "label": ";", + } + "S(DV_GRV)": { + "key": "DV_CIRC", + "label": "^ (dead)", + } + "S(DV_PLUS)": { + "key": "DV_ASTR", + "label": "*", + } + "S(DV_ACUT)": { + "key": "DV_DIAE", + "label": "¨ (dead)", + } + "S(DV_LABK)": { + "key": "DV_RABK", + "label": ">", + } + "S(DV_MINS)": { + "key": "DV_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ \ │ | │ @ │ # │ ~ │ € │ ¬ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(DV_MORD)": { + "key": "DV_BSLS", + "label": "\\", + } + "ALGR(DV_1)": { + "key": "DV_PIPE", + "label": "|", + } + "ALGR(DV_2)": { + "key": "DV_AT", + "label": "@", + } + "ALGR(DV_3)": { + "key": "DV_HASH", + "label": "#", + } + "ALGR(DV_4)": { + "key": "DV_TILD", + "label": "~", + } + "ALGR(DV_5)": { + "key": "DV_EURO", + "label": "€", + } + "ALGR(DV_6)": { + "key": "DV_NOT", + "label": "¬", + } + "ALGR(DV_GRV)": { + "key": "DV_LBRC", + "label": "[", + } + "ALGR(DV_PLUS)": { + "key": "DV_RBRC", + "label": "]", + } + "ALGR(DV_ACUT)": { + "key": "DV_LCBR", + "label": "{", + } + "ALGR(DV_CCED)": { + "key": "DV_RCBR", + "label": "}", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson new file mode 100644 index 0000000000..dcfc562004 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson @@ -0,0 +1,4 @@ +{ + "aliases": { + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swedish_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swedish_0.0.1.hjson new file mode 100644 index 0000000000..6db71ea241 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swedish_0.0.1.hjson @@ -0,0 +1,359 @@ +{ + "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": "SE_SECT", + "label": "§", + } + "KC_1": { + "key": "SE_1", + "label": "1", + } + "KC_2": { + "key": "SE_2", + "label": "2", + } + "KC_3": { + "key": "SE_3", + "label": "3", + } + "KC_4": { + "key": "SE_4", + "label": "4", + } + "KC_5": { + "key": "SE_5", + "label": "5", + } + "KC_6": { + "key": "SE_6", + "label": "6", + } + "KC_7": { + "key": "SE_7", + "label": "7", + } + "KC_8": { + "key": "SE_8", + "label": "8", + } + "KC_9": { + "key": "SE_9", + "label": "9", + } + "KC_0": { + "key": "SE_0", + "label": "0", + } + "KC_MINS": { + "key": "SE_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "SE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "SE_Q", + "label": "Q", + } + "KC_W": { + "key": "SE_W", + "label": "W", + } + "KC_E": { + "key": "SE_E", + "label": "E", + } + "KC_R": { + "key": "SE_R", + "label": "R", + } + "KC_T": { + "key": "SE_T", + "label": "T", + } + "KC_Y": { + "key": "SE_Y", + "label": "Y", + } + "KC_U": { + "key": "SE_U", + "label": "U", + } + "KC_I": { + "key": "SE_I", + "label": "I", + } + "KC_O": { + "key": "SE_O", + "label": "O", + } + "KC_P": { + "key": "SE_P", + "label": "P", + } + "KC_LBRC": { + "key": "SE_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "SE_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "SE_A", + "label": "A", + } + "KC_S": { + "key": "SE_S", + "label": "S", + } + "KC_D": { + "key": "SE_D", + "label": "D", + } + "KC_F": { + "key": "SE_F", + "label": "F", + } + "KC_G": { + "key": "SE_G", + "label": "G", + } + "KC_H": { + "key": "SE_H", + "label": "H", + } + "KC_J": { + "key": "SE_J", + "label": "J", + } + "KC_K": { + "key": "SE_K", + "label": "K", + } + "KC_L": { + "key": "SE_L", + "label": "L", + } + "KC_SCLN": { + "key": "SE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "SE_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "SE_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "SE_LABK", + "label": "<", + } + "KC_Z": { + "key": "SE_Z", + "label": "Z", + } + "KC_X": { + "key": "SE_X", + "label": "X", + } + "KC_C": { + "key": "SE_C", + "label": "C", + } + "KC_V": { + "key": "SE_V", + "label": "V", + } + "KC_B": { + "key": "SE_B", + "label": "B", + } + "KC_N": { + "key": "SE_N", + "label": "N", + } + "KC_M": { + "key": "SE_M", + "label": "M", + } + "KC_COMM": { + "key": "SE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ½ │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(SE_SECT)": { + "key": "SE_HALF", + "label": "½", + } + "S(SE_1)": { + "key": "SE_EXLM", + "label": "!", + } + "S(SE_2)": { + "key": "SE_DQUO", + "label": "\"", + } + "S(SE_3)": { + "key": "SE_HASH", + "label": "#", + } + "S(SE_4)": { + "key": "SE_CURR", + "label": "¤", + } + "S(SE_5)": { + "key": "SE_PERC", + "label": "%", + } + "S(SE_6)": { + "key": "SE_AMPR", + "label": "&", + } + "S(SE_7)": { + "key": "SE_SLSH", + "label": "/", + } + "S(SE_8)": { + "key": "SE_LPRN", + "label": "(", + } + "S(SE_9)": { + "key": "SE_RPRN", + "label": ")", + } + "S(SE_0)": { + "key": "SE_EQL", + "label": "=", + } + "S(SE_PLUS)": { + "key": "SE_QUES", + "label": "?", + } + "S(SE_ACUT)": { + "key": "SE_GRV", + "label": "` (dead)", + } + "S(SE_DIAE)": { + "key": "SE_CIRC", + "label": "^ (dead)", + } + "S(SE_QUOT)": { + "key": "SE_ASTR", + "label": "*", + } + "S(SE_LABK)": { + "key": "SE_RABK", + "label": ">", + } + "S(SE_COMM)": { + "key": "SE_SCLN", + "label": ";", + } + "S(SE_DOT)": { + "key": "SE_COLN", + "label": ":", + } + "S(SE_MINS)": { + "key": "SE_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ \ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(SE_2)": { + "key": "SE_AT", + "label": "@", + } + "ALGR(SE_3)": { + "key": "SE_PND", + "label": "£", + } + "ALGR(SE_4)": { + "key": "SE_DLR", + "label": "$", + } + "ALGR(SE_5)": { + "key": "SE_EURO", + "label": "€", + } + "ALGR(SE_7)": { + "key": "SE_LCBR", + "label": "{", + } + "ALGR(SE_8)": { + "key": "SE_LBRC", + "label": "[", + } + "ALGR(SE_9)": { + "key": "SE_RBRC", + "label": "]", + } + "ALGR(SE_0)": { + "key": "SE_RCBR", + "label": "}", + } + "ALGR(SE_PLUS)": { + "key": "SE_BSLS", + "label": "\\", + } + "ALGR(SE_DIAE)": { + "key": "SE_TILD", + "label": "~ (dead)", + } + "ALGR(SE_LABK)": { + "key": "SE_PIPE", + "label": "|", + } + "ALGR(SE_M)": { + "key": "SE_MICR", + "label": "µ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swedish_mac_ansi_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swedish_mac_ansi_0.0.1.hjson new file mode 100644 index 0000000000..ab7c3ad8d1 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swedish_mac_ansi_0.0.1.hjson @@ -0,0 +1,642 @@ +{ + "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": "SE_LABK", + "label": "<", + } + "KC_1": { + "key": "SE_1", + "label": "1", + } + "KC_2": { + "key": "SE_2", + "label": "2", + } + "KC_3": { + "key": "SE_3", + "label": "3", + } + "KC_4": { + "key": "SE_4", + "label": "4", + } + "KC_5": { + "key": "SE_5", + "label": "5", + } + "KC_6": { + "key": "SE_6", + "label": "6", + } + "KC_7": { + "key": "SE_7", + "label": "7", + } + "KC_8": { + "key": "SE_8", + "label": "8", + } + "KC_9": { + "key": "SE_9", + "label": "9", + } + "KC_0": { + "key": "SE_0", + "label": "0", + } + "KC_MINS": { + "key": "SE_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "SE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "SE_Q", + "label": "Q", + } + "KC_W": { + "key": "SE_W", + "label": "W", + } + "KC_E": { + "key": "SE_E", + "label": "E", + } + "KC_R": { + "key": "SE_R", + "label": "R", + } + "KC_T": { + "key": "SE_T", + "label": "T", + } + "KC_Y": { + "key": "SE_Y", + "label": "Y", + } + "KC_U": { + "key": "SE_U", + "label": "U", + } + "KC_I": { + "key": "SE_I", + "label": "I", + } + "KC_O": { + "key": "SE_O", + "label": "O", + } + "KC_P": { + "key": "SE_P", + "label": "P", + } + "KC_LBRC": { + "key": "SE_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "SE_DIAE", + "label": "¨ (dead)", + } + "KC_NUHS": { + "key": "SE_QUOT", + "label": "'", + } + "KC_A": { + "key": "SE_A", + "label": "A", + } + "KC_S": { + "key": "SE_S", + "label": "S", + } + "KC_D": { + "key": "SE_D", + "label": "D", + } + "KC_F": { + "key": "SE_F", + "label": "F", + } + "KC_G": { + "key": "SE_G", + "label": "G", + } + "KC_H": { + "key": "SE_H", + "label": "H", + } + "KC_J": { + "key": "SE_J", + "label": "J", + } + "KC_K": { + "key": "SE_K", + "label": "K", + } + "KC_L": { + "key": "SE_L", + "label": "L", + } + "KC_SCLN": { + "key": "SE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "SE_ADIA", + "label": "Ä", + } + "KC_Z": { + "key": "SE_Z", + "label": "Z", + } + "KC_X": { + "key": "SE_X", + "label": "X", + } + "KC_C": { + "key": "SE_C", + "label": "C", + } + "KC_V": { + "key": "SE_V", + "label": "V", + } + "KC_B": { + "key": "SE_B", + "label": "B", + } + "KC_N": { + "key": "SE_N", + "label": "N", + } + "KC_M": { + "key": "SE_M", + "label": "M", + } + "KC_COMM": { + "key": "SE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ > │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ * │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(SE_LABK)": { + "key": "SE_RABK", + "label": ">", + } + "S(SE_1)": { + "key": "SE_EXLM", + "label": "!", + } + "S(SE_2)": { + "key": "SE_DQUO", + "label": "\"", + } + "S(SE_3)": { + "key": "SE_HASH", + "label": "#", + } + "S(SE_4)": { + "key": "SE_EURO", + "label": "€", + } + "S(SE_5)": { + "key": "SE_PERC", + "label": "%", + } + "S(SE_6)": { + "key": "SE_AMPR", + "label": "&", + } + "S(SE_7)": { + "key": "SE_SLSH", + "label": "/", + } + "S(SE_8)": { + "key": "SE_LPRN", + "label": "(", + } + "S(SE_9)": { + "key": "SE_RPRN", + "label": ")", + } + "S(SE_0)": { + "key": "SE_EQL", + "label": "=", + } + "S(SE_PLUS)": { + "key": "SE_QUES", + "label": "?", + } + "S(SE_ACUT)": { + "key": "SE_GRV", + "label": "`", + } + "S(SE_DIAE)": { + "key": "SE_CIRC", + "label": "^ (dead)", + } + "S(SE_QUOT)": { + "key": "SE_ASTR", + "label": "*", + } + "S(SE_COMM)": { + "key": "SE_SCLN", + "label": ";", + } + "S(SE_DOT)": { + "key": "SE_COLN", + "label": ":", + } + "S(SE_MINS)": { + "key": "SE_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ≤ │ © │ ™ │ £ │ $ │ ∞ │ § │ | │ [ │ ] │ ≈ │ ± │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ @ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + * + */ + "A(SE_LABK)": { + "key": "SE_LTEQ", + "label": "≤", + } + "A(SE_1)": { + "key": "SE_COPY", + "label": "©", + } + "A(SE_2)": { + "key": "SE_TM", + "label": "™", + } + "A(SE_3)": { + "key": "SE_PND", + "label": "£", + } + "A(SE_4)": { + "key": "SE_DLR", + "label": "$", + } + "A(SE_5)": { + "key": "SE_INFN", + "label": "∞", + } + "A(SE_6)": { + "key": "SE_SECT", + "label": "§", + } + "A(SE_7)": { + "key": "SE_PIPE", + "label": "|", + } + "A(SE_8)": { + "key": "SE_LBRC", + "label": "[", + } + "A(SE_9)": { + "key": "SE_RBRC", + "label": "]", + } + "A(SE_0)": { + "key": "SE_AEQL", + "label": "≈", + } + "A(SE_PLUS)": { + "key": "SE_PLMN", + "label": "±", + } + "A(SE_Q)": { + "key": "SE_BULT", + "label": "•", + } + "A(SE_W)": { + "key": "SE_OMEG", + "label": "Ω", + } + "A(SE_E)": { + "key": "SE_EACU", + "label": "É", + } + "A(SE_R)": { + "key": "SE_REGD", + "label": "®", + } + "A(SE_T)": { + "key": "SE_DAGG", + "label": "†", + } + "A(SE_Y)": { + "key": "SE_MICR", + "label": "µ", + } + "A(SE_U)": { + "key": "SE_UDIA", + "label": "Ü", + } + "A(SE_I)": { + "key": "SE_DLSI", + "label": "ı", + } + "A(SE_O)": { + "key": "SE_OE", + "label": "Œ", + } + "A(SE_P)": { + "key": "SE_PI", + "label": "π", + } + "A(SE_ARNG)": { + "key": "SE_DOTA", + "label": "˙", + } + "A(SE_DIAE)": { + "key": "SE_TILD", + "label": "~ (dead)", + } + "A(SE_QUOT)": { + "key": "SE_AT", + "label": "@", + } + "A(SE_A)": { + "key": "SE_APPL", + "label": " (Apple logo)", + } + "A(SE_S)": { + "key": "SE_SS", + "label": "ß", + } + "A(SE_D)": { + "key": "SE_PDIF", + "label": "∂", + } + "A(SE_F)": { + "key": "SE_FHK", + "label": "ƒ", + } + "A(SE_G)": { + "key": "SE_CEDL", + "label": "¸", + } + "A(SE_H)": { + "key": "SE_OGON", + "label": "˛", + } + "A(SE_J)": { + "key": "SE_SQRT", + "label": "√", + } + "A(SE_K)": { + "key": "SE_FORD", + "label": "ª", + } + "A(SE_L)": { + "key": "SE_FI", + "label": "fi", + } + "A(SE_ODIA)": { + "key": "SE_OSTR", + "label": "Ø", + } + "A(SE_ADIA)": { + "key": "SE_AE", + "label": "Æ", + } + "A(SE_Z)": { + "key": "SE_DIV", + "label": "÷", + } + "A(SE_C)": { + "key": "SE_CCED", + "label": "Ç", + } + "A(SE_V)": { + "key": "SE_LSAQ", + "label": "‹", + } + "A(SE_B)": { + "key": "SE_RSAQ", + "label": "›", + } + "A(SE_N)": { + "key": "SE_LSQU", + "label": "‘", + } + "A(SE_M)": { + "key": "SE_RSQU", + "label": "’", + } + "A(SE_COMM)": { + "key": "SE_SLQU", + "label": "‚", + } + "A(SE_DOT)": { + "key": "SE_ELLP", + "label": "…", + } + "A(SE_MINS)": { + "key": "SE_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ≥ │ ¡ │ │ ¥ │ ¢ │ ‰ │ ¶ │ \ │ { │ } │ ≠ │ ¿ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ ° │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + * + */ + "S(A(SE_LABK))": { + "key": "SE_GTEQ", + "label": "≥", + } + "S(A(SE_1))": { + "key": "SE_IEXL", + "label": "¡", + } + "S(A(SE_3))": { + "key": "SE_YEN", + "label": "¥", + } + "S(A(SE_4))": { + "key": "SE_CENT", + "label": "¢", + } + "S(A(SE_5))": { + "key": "SE_PERM", + "label": "‰", + } + "S(A(SE_6))": { + "key": "SE_PILC", + "label": "¶", + } + "S(A(SE_7))": { + "key": "SE_BSLS", + "label": "\\", + } + "S(A(SE_8))": { + "key": "SE_LCBR", + "label": "{", + } + "S(A(SE_9))": { + "key": "SE_RCBR", + "label": "}", + } + "S(A(SE_0))": { + "key": "SE_NEQL", + "label": "≠", + } + "S(A(SE_PLUS))": { + "key": "SE_IQUE", + "label": "¿", + } + "S(A(SE_Q))": { + "key": "SE_DEG", + "label": "°", + } + "S(A(SE_W))": { + "key": "SE_DACU", + "label": "˝", + } + "S(A(SE_T))": { + "key": "SE_DDAG", + "label": "‡", + } + "S(A(SE_Y))": { + "key": "SE_STIL", + "label": "˜", + } + "S(A(SE_I))": { + "key": "SE_DCIR", + "label": "ˆ", + } + "S(A(SE_P))": { + "key": "SE_NARP", + "label": "∏", + } + "S(A(SE_ARNG))": { + "key": "SE_RNGA", + "label": "˚", + } + "S(A(SE_A))": { + "key": "SE_LOZN", + "label": "◊", + } + "S(A(SE_S))": { + "key": "SE_NARS", + "label": "∑", + } + "S(A(SE_D))": { + "key": "SE_INCR", + "label": "∆", + } + "S(A(SE_F))": { + "key": "SE_INTG", + "label": "∫", + } + "S(A(SE_G))": { + "key": "SE_MACR", + "label": "¯", + } + "S(A(SE_H))": { + "key": "SE_BREV", + "label": "˘", + } + "S(A(SE_J))": { + "key": "SE_NOT", + "label": "¬", + } + "S(A(SE_K))": { + "key": "SE_MORD", + "label": "º", + } + "S(A(SE_L))": { + "key": "SE_FL", + "label": "fl", + } + "S(A(SE_Z))": { + "key": "SE_FRSL", + "label": "⁄", + } + "S(A(SE_X))": { + "key": "SE_CARN", + "label": "ˇ", + } + "S(A(SE_V))": { + "key": "SE_LDAQ", + "label": "«", + } + "S(A(SE_B))": { + "key": "SE_RDAQ", + "label": "»", + } + "S(A(SE_N))": { + "key": "SE_LDQU", + "label": "“", + } + "S(A(SE_M))": { + "key": "SE_RDQU", + "label": "”", + } + "S(A(SE_COMM))": { + "key": "SE_DLQU", + "label": "„", + } + "S(A(SE_DOT))": { + "key": "SE_MDDT", + "label": "·", + } + "S(A(SE_MINS))": { + "key": "SE_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swedish_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swedish_mac_iso_0.0.1.hjson new file mode 100644 index 0000000000..cafd815776 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swedish_mac_iso_0.0.1.hjson @@ -0,0 +1,640 @@ +{ + "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": "SE_SECT", + "label": "§", + } + "KC_1": { + "key": "SE_1", + "label": "1", + } + "KC_2": { + "key": "SE_2", + "label": "2", + } + "KC_3": { + "key": "SE_3", + "label": "3", + } + "KC_4": { + "key": "SE_4", + "label": "4", + } + "KC_5": { + "key": "SE_5", + "label": "5", + } + "KC_6": { + "key": "SE_6", + "label": "6", + } + "KC_7": { + "key": "SE_7", + "label": "7", + } + "KC_8": { + "key": "SE_8", + "label": "8", + } + "KC_9": { + "key": "SE_9", + "label": "9", + } + "KC_0": { + "key": "SE_0", + "label": "0", + } + "KC_MINS": { + "key": "SE_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "SE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "SE_Q", + "label": "Q", + } + "KC_W": { + "key": "SE_W", + "label": "W", + } + "KC_E": { + "key": "SE_E", + "label": "E", + } + "KC_R": { + "key": "SE_R", + "label": "R", + } + "KC_T": { + "key": "SE_T", + "label": "T", + } + "KC_Y": { + "key": "SE_Y", + "label": "Y", + } + "KC_U": { + "key": "SE_U", + "label": "U", + } + "KC_I": { + "key": "SE_I", + "label": "I", + } + "KC_O": { + "key": "SE_O", + "label": "O", + } + "KC_P": { + "key": "SE_P", + "label": "P", + } + "KC_LBRC": { + "key": "SE_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "SE_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "SE_A", + "label": "A", + } + "KC_S": { + "key": "SE_S", + "label": "S", + } + "KC_D": { + "key": "SE_D", + "label": "D", + } + "KC_F": { + "key": "SE_F", + "label": "F", + } + "KC_G": { + "key": "SE_G", + "label": "G", + } + "KC_H": { + "key": "SE_H", + "label": "H", + } + "KC_J": { + "key": "SE_J", + "label": "J", + } + "KC_K": { + "key": "SE_K", + "label": "K", + } + "KC_L": { + "key": "SE_L", + "label": "L", + } + "KC_SCLN": { + "key": "SE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "SE_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "SE_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "SE_LABK", + "label": "<", + } + "KC_Z": { + "key": "SE_Z", + "label": "Z", + } + "KC_X": { + "key": "SE_X", + "label": "X", + } + "KC_C": { + "key": "SE_C", + "label": "C", + } + "KC_V": { + "key": "SE_V", + "label": "V", + } + "KC_B": { + "key": "SE_B", + "label": "B", + } + "KC_N": { + "key": "SE_N", + "label": "N", + } + "KC_M": { + "key": "SE_M", + "label": "M", + } + "KC_COMM": { + "key": "SE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ° │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(SE_SECT)": { + "key": "SE_DEG", + "label": "°", + } + "S(SE_1)": { + "key": "SE_EXLM", + "label": "!", + } + "S(SE_2)": { + "key": "SE_DQUO", + "label": "\"", + } + "S(SE_3)": { + "key": "SE_HASH", + "label": "#", + } + "S(SE_4)": { + "key": "SE_EURO", + "label": "€", + } + "S(SE_5)": { + "key": "SE_PERC", + "label": "%", + } + "S(SE_6)": { + "key": "SE_AMPR", + "label": "&", + } + "S(SE_7)": { + "key": "SE_SLSH", + "label": "/", + } + "S(SE_8)": { + "key": "SE_LPRN", + "label": "(", + } + "S(SE_9)": { + "key": "SE_RPRN", + "label": ")", + } + "S(SE_0)": { + "key": "SE_EQL", + "label": "=", + } + "S(SE_PLUS)": { + "key": "SE_QUES", + "label": "?", + } + "S(SE_ACUT)": { + "key": "SE_GRV", + "label": "`", + } + "S(SE_DIAE)": { + "key": "SE_CIRC", + "label": "^ (dead)", + } + "S(SE_QUOT)": { + "key": "SE_ASTR", + "label": "*", + } + "S(SE_LABK)": { + "key": "SE_RABK", + "label": ">", + } + "S(SE_COMM)": { + "key": "SE_SCLN", + "label": ";", + } + "S(SE_DOT)": { + "key": "SE_COLN", + "label": ":", + } + "S(SE_MINS)": { + "key": "SE_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ¶ │ © │ ™ │ £ │ $ │ ∞ │ │ | │ [ │ ] │ ≈ │ ± │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ @ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≤ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(SE_SECT)": { + "key": "SE_PILC", + "label": "¶", + } + "A(SE_1)": { + "key": "SE_COPY", + "label": "©", + } + "A(SE_2)": { + "key": "SE_TM", + "label": "™", + } + "A(SE_3)": { + "key": "SE_PND", + "label": "£", + } + "A(SE_4)": { + "key": "SE_DLR", + "label": "$", + } + "A(SE_5)": { + "key": "SE_INFN", + "label": "∞", + } + "A(SE_7)": { + "key": "SE_PIPE", + "label": "|", + } + "A(SE_8)": { + "key": "SE_LBRC", + "label": "[", + } + "A(SE_9)": { + "key": "SE_RBRC", + "label": "]", + } + "A(SE_0)": { + "key": "SE_AEQL", + "label": "≈", + } + "A(SE_PLUS)": { + "key": "SE_PLMN", + "label": "±", + } + "A(SE_Q)": { + "key": "SE_BULT", + "label": "•", + } + "A(SE_W)": { + "key": "SE_OMEG", + "label": "Ω", + } + "A(SE_E)": { + "key": "SE_EACU", + "label": "É", + } + "A(SE_R)": { + "key": "SE_REGD", + "label": "®", + } + "A(SE_T)": { + "key": "SE_DAGG", + "label": "†", + } + "A(SE_Y)": { + "key": "SE_MICR", + "label": "µ", + } + "A(SE_U)": { + "key": "SE_UDIA", + "label": "Ü", + } + "A(SE_I)": { + "key": "SE_DLSI", + "label": "ı", + } + "A(SE_O)": { + "key": "SE_OE", + "label": "Œ", + } + "A(SE_P)": { + "key": "SE_PI", + "label": "π", + } + "A(SE_ARNG)": { + "key": "SE_DOTA", + "label": "˙", + } + "A(SE_DIAE)": { + "key": "SE_TILD", + "label": "~ (dead)", + } + "A(SE_A)": { + "key": "SE_APPL", + "label": " (Apple logo)", + } + "A(SE_S)": { + "key": "SE_SS", + "label": "ß", + } + "A(SE_D)": { + "key": "SE_PDIF", + "label": "∂", + } + "A(SE_F)": { + "key": "SE_FHK", + "label": "ƒ", + } + "A(SE_G)": { + "key": "SE_CEDL", + "label": "¸", + } + "A(SE_H)": { + "key": "SE_OGON", + "label": "˛", + } + "A(SE_J)": { + "key": "SE_SQRT", + "label": "√", + } + "A(SE_K)": { + "key": "SE_FORD", + "label": "ª", + } + "A(SE_L)": { + "key": "SE_FI", + "label": "fi", + } + "A(SE_ODIA)": { + "key": "SE_OSTR", + "label": "Ø", + } + "A(SE_ADIA)": { + "key": "SE_AE", + "label": "Æ", + } + "A(SE_QUOT)": { + "key": "SE_AT", + "label": "@", + } + "A(SE_LABK)": { + "key": "SE_LTEQ", + "label": "≤", + } + "A(SE_Z)": { + "key": "SE_DIV", + "label": "÷", + } + "A(SE_C)": { + "key": "SE_CCED", + "label": "Ç", + } + "A(SE_V)": { + "key": "SE_LSAQ", + "label": "‹", + } + "A(SE_B)": { + "key": "SE_RSAQ", + "label": "›", + } + "A(SE_N)": { + "key": "SE_LSQU", + "label": "‘", + } + "A(SE_M)": { + "key": "SE_RSQU", + "label": "’", + } + "A(SE_COMM)": { + "key": "SE_SLQU", + "label": "‚", + } + "A(SE_DOT)": { + "key": "SE_ELLP", + "label": "…", + } + "A(SE_MINS)": { + "key": "SE_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ ¡ │ ” │ ¥ │ ¢ │ ‰ │ │ \ │ { │ } │ ≠ │ ¿ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≥ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(SE_1))": { + "key": "SE_IEXL", + "label": "¡", + } + "S(A(SE_3))": { + "key": "SE_YEN", + "label": "¥", + } + "S(A(SE_4))": { + "key": "SE_CENT", + "label": "¢", + } + "S(A(SE_5))": { + "key": "SE_PERM", + "label": "‰", + } + "S(A(SE_7))": { + "key": "SE_BSLS", + "label": "\\", + } + "S(A(SE_8))": { + "key": "SE_LCBR", + "label": "{", + } + "S(A(SE_9))": { + "key": "SE_RCBR", + "label": "}", + } + "S(A(SE_0))": { + "key": "SE_NEQL", + "label": "≠", + } + "S(A(SE_PLUS))": { + "key": "SE_IQUE", + "label": "¿", + } + "S(A(SE_W))": { + "key": "SE_DACU", + "label": "˝", + } + "S(A(SE_T))": { + "key": "SE_DDAG", + "label": "‡", + } + "S(A(SE_Y))": { + "key": "SE_STIL", + "label": "˜", + } + "S(A(SE_I))": { + "key": "SE_DCIR", + "label": "ˆ", + } + "S(A(SE_P))": { + "key": "SE_NARP", + "label": "∏", + } + "S(A(SE_ARNG))": { + "key": "SE_RNGA", + "label": "˚", + } + "S(A(SE_A))": { + "key": "SE_LOZN", + "label": "◊", + } + "S(A(SE_S))": { + "key": "SE_NARS", + "label": "∑", + } + "S(A(SE_D))": { + "key": "SE_INCR", + "label": "∆", + } + "S(A(SE_F))": { + "key": "SE_INTG", + "label": "∫", + } + "S(A(SE_G))": { + "key": "SE_MACR", + "label": "¯", + } + "S(A(SE_H))": { + "key": "SE_BREV", + "label": "˘", + } + "S(A(SE_J))": { + "key": "SE_NOT", + "label": "¬", + } + "S(A(SE_K))": { + "key": "SE_MORD", + "label": "º", + } + "S(A(SE_L))": { + "key": "SE_FL", + "label": "fl", + } + "S(A(SE_LABK))": { + "key": "SE_GTEQ", + "label": "≥", + } + "S(A(SE_Z))": { + "key": "SE_FRSL", + "label": "⁄", + } + "S(A(SE_X))": { + "key": "SE_CARN", + "label": "ˇ", + } + "S(A(SE_V))": { + "key": "SE_LDAQ", + "label": "«", + } + "S(A(SE_B))": { + "key": "SE_RDAQ", + "label": "»", + } + "S(A(SE_N))": { + "key": "SE_LDQU", + "label": "“", + } + "S(A(SE_M))": { + "key": "SE_RDQU", + "label": "”", + } + "S(A(SE_COMM))": { + "key": "SE_DLQU", + "label": "„", + } + "S(A(SE_DOT))": { + "key": "SE_MDDT", + "label": "·", + } + "S(A(SE_MINS))": { + "key": "SE_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swedish_pro_mac_ansi_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swedish_pro_mac_ansi_0.0.1.hjson new file mode 100644 index 0000000000..c82c79c711 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swedish_pro_mac_ansi_0.0.1.hjson @@ -0,0 +1,642 @@ +{ + "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": "SE_LABK", + "label": "<", + } + "KC_1": { + "key": "SE_1", + "label": "1", + } + "KC_2": { + "key": "SE_2", + "label": "2", + } + "KC_3": { + "key": "SE_3", + "label": "3", + } + "KC_4": { + "key": "SE_4", + "label": "4", + } + "KC_5": { + "key": "SE_5", + "label": "5", + } + "KC_6": { + "key": "SE_6", + "label": "6", + } + "KC_7": { + "key": "SE_7", + "label": "7", + } + "KC_8": { + "key": "SE_8", + "label": "8", + } + "KC_9": { + "key": "SE_9", + "label": "9", + } + "KC_0": { + "key": "SE_0", + "label": "0", + } + "KC_MINS": { + "key": "SE_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "SE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "SE_Q", + "label": "Q", + } + "KC_W": { + "key": "SE_W", + "label": "W", + } + "KC_E": { + "key": "SE_E", + "label": "E", + } + "KC_R": { + "key": "SE_R", + "label": "R", + } + "KC_T": { + "key": "SE_T", + "label": "T", + } + "KC_Y": { + "key": "SE_Y", + "label": "Y", + } + "KC_U": { + "key": "SE_U", + "label": "U", + } + "KC_I": { + "key": "SE_I", + "label": "I", + } + "KC_O": { + "key": "SE_O", + "label": "O", + } + "KC_P": { + "key": "SE_P", + "label": "P", + } + "KC_LBRC": { + "key": "SE_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "SE_DIAE", + "label": "¨ (dead)", + } + "KC_NUHS": { + "key": "SE_QUOT", + "label": "'", + } + "KC_A": { + "key": "SE_A", + "label": "A", + } + "KC_S": { + "key": "SE_S", + "label": "S", + } + "KC_D": { + "key": "SE_D", + "label": "D", + } + "KC_F": { + "key": "SE_F", + "label": "F", + } + "KC_G": { + "key": "SE_G", + "label": "G", + } + "KC_H": { + "key": "SE_H", + "label": "H", + } + "KC_J": { + "key": "SE_J", + "label": "J", + } + "KC_K": { + "key": "SE_K", + "label": "K", + } + "KC_L": { + "key": "SE_L", + "label": "L", + } + "KC_SCLN": { + "key": "SE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "SE_ADIA", + "label": "Ä", + } + "KC_Z": { + "key": "SE_Z", + "label": "Z", + } + "KC_X": { + "key": "SE_X", + "label": "X", + } + "KC_C": { + "key": "SE_C", + "label": "C", + } + "KC_V": { + "key": "SE_V", + "label": "V", + } + "KC_B": { + "key": "SE_B", + "label": "B", + } + "KC_N": { + "key": "SE_N", + "label": "N", + } + "KC_M": { + "key": "SE_M", + "label": "M", + } + "KC_COMM": { + "key": "SE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ > │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ * │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(SE_LABK)": { + "key": "SE_RABK", + "label": ">", + } + "S(SE_1)": { + "key": "SE_EXLM", + "label": "!", + } + "S(SE_2)": { + "key": "SE_DQUO", + "label": "\"", + } + "S(SE_3)": { + "key": "SE_HASH", + "label": "#", + } + "S(SE_4)": { + "key": "SE_EURO", + "label": "€", + } + "S(SE_5)": { + "key": "SE_PERC", + "label": "%", + } + "S(SE_6)": { + "key": "SE_AMPR", + "label": "&", + } + "S(SE_7)": { + "key": "SE_SLSH", + "label": "/", + } + "S(SE_8)": { + "key": "SE_LPRN", + "label": "(", + } + "S(SE_9)": { + "key": "SE_RPRN", + "label": ")", + } + "S(SE_0)": { + "key": "SE_EQL", + "label": "=", + } + "S(SE_PLUS)": { + "key": "SE_QUES", + "label": "?", + } + "S(SE_ACUT)": { + "key": "SE_GRV", + "label": "`", + } + "S(SE_DIAE)": { + "key": "SE_CIRC", + "label": "^ (dead)", + } + "S(SE_QUOT)": { + "key": "SE_ASTR", + "label": "*", + } + "S(SE_COMM)": { + "key": "SE_SCLN", + "label": ";", + } + "S(SE_DOT)": { + "key": "SE_COLN", + "label": ":", + } + "S(SE_MINS)": { + "key": "SE_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ≤ │ © │ @ │ £ │ $ │ ∞ │ § │ | │ [ │ ] │ ≈ │ ± │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ ™ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + * + */ + "A(SE_LABK)": { + "key": "SE_LTEQ", + "label": "≤", + } + "A(SE_1)": { + "key": "SE_COPY", + "label": "©", + } + "A(SE_2)": { + "key": "SE_AT", + "label": "@", + } + "A(SE_3)": { + "key": "SE_PND", + "label": "£", + } + "A(SE_4)": { + "key": "SE_DLR", + "label": "$", + } + "A(SE_5)": { + "key": "SE_INFN", + "label": "∞", + } + "A(SE_6)": { + "key": "SE_SECT", + "label": "§", + } + "A(SE_7)": { + "key": "SE_PIPE", + "label": "|", + } + "A(SE_8)": { + "key": "SE_LBRC", + "label": "[", + } + "A(SE_9)": { + "key": "SE_RBRC", + "label": "]", + } + "A(SE_0)": { + "key": "SE_AEQL", + "label": "≈", + } + "A(SE_PLUS)": { + "key": "SE_PLMN", + "label": "±", + } + "A(SE_Q)": { + "key": "SE_BULT", + "label": "•", + } + "A(SE_W)": { + "key": "SE_OMEG", + "label": "Ω", + } + "A(SE_E)": { + "key": "SE_EACU", + "label": "É", + } + "A(SE_R)": { + "key": "SE_REGD", + "label": "®", + } + "A(SE_T)": { + "key": "SE_DAGG", + "label": "†", + } + "A(SE_Y)": { + "key": "SE_MICR", + "label": "µ", + } + "A(SE_U)": { + "key": "SE_UDIA", + "label": "Ü", + } + "A(SE_I)": { + "key": "SE_DLSI", + "label": "ı", + } + "A(SE_O)": { + "key": "SE_OE", + "label": "Œ", + } + "A(SE_P)": { + "key": "SE_PI", + "label": "π", + } + "A(SE_ARNG)": { + "key": "SE_DOTA", + "label": "˙", + } + "A(SE_DIAE)": { + "key": "SE_TILD", + "label": "~ (dead)", + } + "A(SE_QUOT)": { + "key": "SE_TM", + "label": "™", + } + "A(SE_A)": { + "key": "SE_APPL", + "label": " (Apple logo)", + } + "A(SE_S)": { + "key": "SE_SS", + "label": "ß", + } + "A(SE_D)": { + "key": "SE_PDIF", + "label": "∂", + } + "A(SE_F)": { + "key": "SE_FHK", + "label": "ƒ", + } + "A(SE_G)": { + "key": "SE_CEDL", + "label": "¸", + } + "A(SE_H)": { + "key": "SE_OGON", + "label": "˛", + } + "A(SE_J)": { + "key": "SE_SQRT", + "label": "√", + } + "A(SE_K)": { + "key": "SE_FORD", + "label": "ª", + } + "A(SE_L)": { + "key": "SE_FI", + "label": "fi", + } + "A(SE_ODIA)": { + "key": "SE_OSTR", + "label": "Ø", + } + "A(SE_ADIA)": { + "key": "SE_AE", + "label": "Æ", + } + "A(SE_Z)": { + "key": "SE_DIV", + "label": "÷", + } + "A(SE_C)": { + "key": "SE_CCED", + "label": "Ç", + } + "A(SE_V)": { + "key": "SE_LSAQ", + "label": "‹", + } + "A(SE_B)": { + "key": "SE_RSAQ", + "label": "›", + } + "A(SE_N)": { + "key": "SE_LSQU", + "label": "‘", + } + "A(SE_M)": { + "key": "SE_RSQU", + "label": "’", + } + "A(SE_COMM)": { + "key": "SE_SLQU", + "label": "‚", + } + "A(SE_DOT)": { + "key": "SE_ELLP", + "label": "…", + } + "A(SE_MINS)": { + "key": "SE_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ≥ │ ¡ │ │ ¥ │ ¢ │ ‰ │ ¶ │ \ │ { │ } │ ≠ │ ¿ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ ° │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + * + */ + "S(A(SE_LABK))": { + "key": "SE_GTEQ", + "label": "≥", + } + "S(A(SE_1))": { + "key": "SE_IEXL", + "label": "¡", + } + "S(A(SE_3))": { + "key": "SE_YEN", + "label": "¥", + } + "S(A(SE_4))": { + "key": "SE_CENT", + "label": "¢", + } + "S(A(SE_5))": { + "key": "SE_PERM", + "label": "‰", + } + "S(A(SE_6))": { + "key": "SE_PILC", + "label": "¶", + } + "S(A(SE_7))": { + "key": "SE_BSLS", + "label": "\\", + } + "S(A(SE_8))": { + "key": "SE_LCBR", + "label": "{", + } + "S(A(SE_9))": { + "key": "SE_RCBR", + "label": "}", + } + "S(A(SE_0))": { + "key": "SE_NEQL", + "label": "≠", + } + "S(A(SE_PLUS))": { + "key": "SE_IQUE", + "label": "¿", + } + "S(A(SE_Q))": { + "key": "SE_DEG", + "label": "°", + } + "S(A(SE_W))": { + "key": "SE_DACU", + "label": "˝", + } + "S(A(SE_T))": { + "key": "SE_DDAG", + "label": "‡", + } + "S(A(SE_Y))": { + "key": "SE_STIL", + "label": "˜", + } + "S(A(SE_I))": { + "key": "SE_DCIR", + "label": "ˆ", + } + "S(A(SE_P))": { + "key": "SE_NARP", + "label": "∏", + } + "S(A(SE_ARNG))": { + "key": "SE_RNGA", + "label": "˚", + } + "S(A(SE_A))": { + "key": "SE_LOZN", + "label": "◊", + } + "S(A(SE_S))": { + "key": "SE_NARS", + "label": "∑", + } + "S(A(SE_D))": { + "key": "SE_INCR", + "label": "∆", + } + "S(A(SE_F))": { + "key": "SE_INTG", + "label": "∫", + } + "S(A(SE_G))": { + "key": "SE_MACR", + "label": "¯", + } + "S(A(SE_H))": { + "key": "SE_BREV", + "label": "˘", + } + "S(A(SE_J))": { + "key": "SE_NOT", + "label": "¬", + } + "S(A(SE_K))": { + "key": "SE_MORD", + "label": "º", + } + "S(A(SE_L))": { + "key": "SE_FL", + "label": "fl", + } + "S(A(SE_Z))": { + "key": "SE_FRSL", + "label": "⁄", + } + "S(A(SE_X))": { + "key": "SE_CARN", + "label": "ˇ", + } + "S(A(SE_V))": { + "key": "SE_LDAQ", + "label": "«", + } + "S(A(SE_B))": { + "key": "SE_RDAQ", + "label": "»", + } + "S(A(SE_N))": { + "key": "SE_LDQU", + "label": "“", + } + "S(A(SE_M))": { + "key": "SE_RDQU", + "label": "”", + } + "S(A(SE_COMM))": { + "key": "SE_DLQU", + "label": "„", + } + "S(A(SE_DOT))": { + "key": "SE_MDDT", + "label": "·", + } + "S(A(SE_MINS))": { + "key": "SE_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swedish_pro_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swedish_pro_mac_iso_0.0.1.hjson new file mode 100644 index 0000000000..4555739ccd --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swedish_pro_mac_iso_0.0.1.hjson @@ -0,0 +1,640 @@ +{ + "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": "SE_SECT", + "label": "§", + } + "KC_1": { + "key": "SE_1", + "label": "1", + } + "KC_2": { + "key": "SE_2", + "label": "2", + } + "KC_3": { + "key": "SE_3", + "label": "3", + } + "KC_4": { + "key": "SE_4", + "label": "4", + } + "KC_5": { + "key": "SE_5", + "label": "5", + } + "KC_6": { + "key": "SE_6", + "label": "6", + } + "KC_7": { + "key": "SE_7", + "label": "7", + } + "KC_8": { + "key": "SE_8", + "label": "8", + } + "KC_9": { + "key": "SE_9", + "label": "9", + } + "KC_0": { + "key": "SE_0", + "label": "0", + } + "KC_MINS": { + "key": "SE_PLUS", + "label": "+", + } + "KC_EQL": { + "key": "SE_ACUT", + "label": "´ (dead)", + } + "KC_Q": { + "key": "SE_Q", + "label": "Q", + } + "KC_W": { + "key": "SE_W", + "label": "W", + } + "KC_E": { + "key": "SE_E", + "label": "E", + } + "KC_R": { + "key": "SE_R", + "label": "R", + } + "KC_T": { + "key": "SE_T", + "label": "T", + } + "KC_Y": { + "key": "SE_Y", + "label": "Y", + } + "KC_U": { + "key": "SE_U", + "label": "U", + } + "KC_I": { + "key": "SE_I", + "label": "I", + } + "KC_O": { + "key": "SE_O", + "label": "O", + } + "KC_P": { + "key": "SE_P", + "label": "P", + } + "KC_LBRC": { + "key": "SE_ARNG", + "label": "Å", + } + "KC_RBRC": { + "key": "SE_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "SE_A", + "label": "A", + } + "KC_S": { + "key": "SE_S", + "label": "S", + } + "KC_D": { + "key": "SE_D", + "label": "D", + } + "KC_F": { + "key": "SE_F", + "label": "F", + } + "KC_G": { + "key": "SE_G", + "label": "G", + } + "KC_H": { + "key": "SE_H", + "label": "H", + } + "KC_J": { + "key": "SE_J", + "label": "J", + } + "KC_K": { + "key": "SE_K", + "label": "K", + } + "KC_L": { + "key": "SE_L", + "label": "L", + } + "KC_SCLN": { + "key": "SE_ODIA", + "label": "Ö", + } + "KC_QUOT": { + "key": "SE_ADIA", + "label": "Ä", + } + "KC_NUHS": { + "key": "SE_QUOT", + "label": "'", + } + "KC_NUBS": { + "key": "SE_LABK", + "label": "<", + } + "KC_Z": { + "key": "SE_Z", + "label": "Z", + } + "KC_X": { + "key": "SE_X", + "label": "X", + } + "KC_C": { + "key": "SE_C", + "label": "C", + } + "KC_V": { + "key": "SE_V", + "label": "V", + } + "KC_B": { + "key": "SE_B", + "label": "B", + } + "KC_N": { + "key": "SE_N", + "label": "N", + } + "KC_M": { + "key": "SE_M", + "label": "M", + } + "KC_COMM": { + "key": "SE_COMM", + "label": ",", + } + "KC_DOT": { + "key": "SE_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "SE_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ° │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(SE_SECT)": { + "key": "SE_DEG", + "label": "°", + } + "S(SE_1)": { + "key": "SE_EXLM", + "label": "!", + } + "S(SE_2)": { + "key": "SE_DQUO", + "label": "\"", + } + "S(SE_3)": { + "key": "SE_HASH", + "label": "#", + } + "S(SE_4)": { + "key": "SE_EURO", + "label": "€", + } + "S(SE_5)": { + "key": "SE_PERC", + "label": "%", + } + "S(SE_6)": { + "key": "SE_AMPR", + "label": "&", + } + "S(SE_7)": { + "key": "SE_SLSH", + "label": "/", + } + "S(SE_8)": { + "key": "SE_LPRN", + "label": "(", + } + "S(SE_9)": { + "key": "SE_RPRN", + "label": ")", + } + "S(SE_0)": { + "key": "SE_EQL", + "label": "=", + } + "S(SE_PLUS)": { + "key": "SE_QUES", + "label": "?", + } + "S(SE_ACUT)": { + "key": "SE_GRV", + "label": "`", + } + "S(SE_DIAE)": { + "key": "SE_CIRC", + "label": "^ (dead)", + } + "S(SE_QUOT)": { + "key": "SE_ASTR", + "label": "*", + } + "S(SE_LABK)": { + "key": "SE_RABK", + "label": ">", + } + "S(SE_COMM)": { + "key": "SE_SCLN", + "label": ";", + } + "S(SE_DOT)": { + "key": "SE_COLN", + "label": ":", + } + "S(SE_MINS)": { + "key": "SE_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ ¶ │ © │ @ │ £ │ $ │ ∞ │ │ | │ [ │ ] │ ≈ │ ± │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ ™ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≤ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(SE_SECT)": { + "key": "SE_PILC", + "label": "¶", + } + "A(SE_1)": { + "key": "SE_COPY", + "label": "©", + } + "A(SE_2)": { + "key": "SE_AT", + "label": "@", + } + "A(SE_3)": { + "key": "SE_PND", + "label": "£", + } + "A(SE_4)": { + "key": "SE_DLR", + "label": "$", + } + "A(SE_5)": { + "key": "SE_INFN", + "label": "∞", + } + "A(SE_7)": { + "key": "SE_PIPE", + "label": "|", + } + "A(SE_8)": { + "key": "SE_LBRC", + "label": "[", + } + "A(SE_9)": { + "key": "SE_RBRC", + "label": "]", + } + "A(SE_0)": { + "key": "SE_AEQL", + "label": "≈", + } + "A(SE_PLUS)": { + "key": "SE_PLMN", + "label": "±", + } + "A(SE_Q)": { + "key": "SE_BULT", + "label": "•", + } + "A(SE_W)": { + "key": "SE_OMEG", + "label": "Ω", + } + "A(SE_E)": { + "key": "SE_EACU", + "label": "É", + } + "A(SE_R)": { + "key": "SE_REGD", + "label": "®", + } + "A(SE_T)": { + "key": "SE_DAGG", + "label": "†", + } + "A(SE_Y)": { + "key": "SE_MICR", + "label": "µ", + } + "A(SE_U)": { + "key": "SE_UDIA", + "label": "Ü", + } + "A(SE_I)": { + "key": "SE_DLSI", + "label": "ı", + } + "A(SE_O)": { + "key": "SE_OE", + "label": "Œ", + } + "A(SE_P)": { + "key": "SE_PI", + "label": "π", + } + "A(SE_ARNG)": { + "key": "SE_DOTA", + "label": "˙", + } + "A(SE_DIAE)": { + "key": "SE_TILD", + "label": "~ (dead)", + } + "A(SE_A)": { + "key": "SE_APPL", + "label": " (Apple logo)", + } + "A(SE_S)": { + "key": "SE_SS", + "label": "ß", + } + "A(SE_D)": { + "key": "SE_PDIF", + "label": "∂", + } + "A(SE_F)": { + "key": "SE_FHK", + "label": "ƒ", + } + "A(SE_G)": { + "key": "SE_CEDL", + "label": "¸", + } + "A(SE_H)": { + "key": "SE_OGON", + "label": "˛", + } + "A(SE_J)": { + "key": "SE_SQRT", + "label": "√", + } + "A(SE_K)": { + "key": "SE_FORD", + "label": "ª", + } + "A(SE_L)": { + "key": "SE_FI", + "label": "fi", + } + "A(SE_ODIA)": { + "key": "SE_OSTR", + "label": "Ø", + } + "A(SE_ADIA)": { + "key": "SE_AE", + "label": "Æ", + } + "A(SE_QUOT)": { + "key": "SE_TM", + "label": "™", + } + "A(SE_LABK)": { + "key": "SE_LTEQ", + "label": "≤", + } + "A(SE_Z)": { + "key": "SE_DIV", + "label": "÷", + } + "A(SE_C)": { + "key": "SE_CCED", + "label": "Ç", + } + "A(SE_V)": { + "key": "SE_LSAQ", + "label": "‹", + } + "A(SE_B)": { + "key": "SE_RSAQ", + "label": "›", + } + "A(SE_N)": { + "key": "SE_LSQU", + "label": "‘", + } + "A(SE_M)": { + "key": "SE_RSQU", + "label": "’", + } + "A(SE_COMM)": { + "key": "SE_SLQU", + "label": "‚", + } + "A(SE_DOT)": { + "key": "SE_ELLP", + "label": "…", + } + "A(SE_MINS)": { + "key": "SE_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ ¡ │ ” │ ¥ │ ¢ │ ‰ │ │ \ │ { │ } │ ≠ │ ¿ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ ≥ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(SE_1))": { + "key": "SE_IEXL", + "label": "¡", + } + "S(A(SE_3))": { + "key": "SE_YEN", + "label": "¥", + } + "S(A(SE_4))": { + "key": "SE_CENT", + "label": "¢", + } + "S(A(SE_5))": { + "key": "SE_PERM", + "label": "‰", + } + "S(A(SE_7))": { + "key": "SE_BSLS", + "label": "\\", + } + "S(A(SE_8))": { + "key": "SE_LCBR", + "label": "{", + } + "S(A(SE_9))": { + "key": "SE_RCBR", + "label": "}", + } + "S(A(SE_0))": { + "key": "SE_NEQL", + "label": "≠", + } + "S(A(SE_PLUS))": { + "key": "SE_IQUE", + "label": "¿", + } + "S(A(SE_W))": { + "key": "SE_DACU", + "label": "˝", + } + "S(A(SE_T))": { + "key": "SE_DDAG", + "label": "‡", + } + "S(A(SE_Y))": { + "key": "SE_STIL", + "label": "˜", + } + "S(A(SE_I))": { + "key": "SE_DCIR", + "label": "ˆ", + } + "S(A(SE_P))": { + "key": "SE_NARP", + "label": "∏", + } + "S(A(SE_ARNG))": { + "key": "SE_RNGA", + "label": "˚", + } + "S(A(SE_A))": { + "key": "SE_LOZN", + "label": "◊", + } + "S(A(SE_S))": { + "key": "SE_NARS", + "label": "∑", + } + "S(A(SE_D))": { + "key": "SE_INCR", + "label": "∆", + } + "S(A(SE_F))": { + "key": "SE_INTG", + "label": "∫", + } + "S(A(SE_G))": { + "key": "SE_MACR", + "label": "¯", + } + "S(A(SE_H))": { + "key": "SE_BREV", + "label": "˘", + } + "S(A(SE_J))": { + "key": "SE_NOT", + "label": "¬", + } + "S(A(SE_K))": { + "key": "SE_MORD", + "label": "º", + } + "S(A(SE_L))": { + "key": "SE_FL", + "label": "fl", + } + "S(A(SE_LABK))": { + "key": "SE_GTEQ", + "label": "≥", + } + "S(A(SE_Z))": { + "key": "SE_FRSL", + "label": "⁄", + } + "S(A(SE_X))": { + "key": "SE_CARN", + "label": "ˇ", + } + "S(A(SE_V))": { + "key": "SE_LDAQ", + "label": "«", + } + "S(A(SE_B))": { + "key": "SE_RDAQ", + "label": "»", + } + "S(A(SE_N))": { + "key": "SE_LDQU", + "label": "“", + } + "S(A(SE_M))": { + "key": "SE_RDQU", + "label": "”", + } + "S(A(SE_COMM))": { + "key": "SE_DLQU", + "label": "„", + } + "S(A(SE_DOT))": { + "key": "SE_MDDT", + "label": "·", + } + "S(A(SE_MINS))": { + "key": "SE_MDSH", + "label": "—", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swiss_de_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swiss_de_0.0.1.hjson new file mode 100644 index 0000000000..ae260a5e56 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swiss_de_0.0.1.hjson @@ -0,0 +1,379 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ § │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ü │ ¨ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ö │ ä │ $ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "CH_SECT", + "label": "§", + } + "KC_1": { + "key": "CH_1", + "label": "1", + } + "KC_2": { + "key": "CH_2", + "label": "2", + } + "KC_3": { + "key": "CH_3", + "label": "3", + } + "KC_4": { + "key": "CH_4", + "label": "4", + } + "KC_5": { + "key": "CH_5", + "label": "5", + } + "KC_6": { + "key": "CH_6", + "label": "6", + } + "KC_7": { + "key": "CH_7", + "label": "7", + } + "KC_8": { + "key": "CH_8", + "label": "8", + } + "KC_9": { + "key": "CH_9", + "label": "9", + } + "KC_0": { + "key": "CH_0", + "label": "0", + } + "KC_MINS": { + "key": "CH_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "CH_CIRC", + "label": "^ (dead)", + } + "KC_Q": { + "key": "CH_Q", + "label": "Q", + } + "KC_W": { + "key": "CH_W", + "label": "W", + } + "KC_E": { + "key": "CH_E", + "label": "E", + } + "KC_R": { + "key": "CH_R", + "label": "R", + } + "KC_T": { + "key": "CH_T", + "label": "T", + } + "KC_Y": { + "key": "CH_Z", + "label": "Z", + } + "KC_U": { + "key": "CH_U", + "label": "U", + } + "KC_I": { + "key": "CH_I", + "label": "I", + } + "KC_O": { + "key": "CH_O", + "label": "O", + } + "KC_P": { + "key": "CH_P", + "label": "P", + } + "KC_LBRC": { + "key": "CH_UDIA", + "label": "ü", + } + "KC_RBRC": { + "key": "CH_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "CH_A", + "label": "A", + } + "KC_S": { + "key": "CH_S", + "label": "S", + } + "KC_D": { + "key": "CH_D", + "label": "D", + } + "KC_F": { + "key": "CH_F", + "label": "F", + } + "KC_G": { + "key": "CH_G", + "label": "G", + } + "KC_H": { + "key": "CH_H", + "label": "H", + } + "KC_J": { + "key": "CH_J", + "label": "J", + } + "KC_K": { + "key": "CH_K", + "label": "K", + } + "KC_L": { + "key": "CH_L", + "label": "L", + } + "KC_SCLN": { + "key": "CH_ODIA", + "label": "ö", + } + "KC_QUOT": { + "key": "CH_ADIA", + "label": "ä", + } + "KC_NUHS": { + "key": "CH_DLR", + "label": "$", + } + "KC_NUBS": { + "key": "CH_LABK", + "label": "<", + } + "KC_Z": { + "key": "CH_Y", + "label": "Y", + } + "KC_X": { + "key": "CH_X", + "label": "X", + } + "KC_C": { + "key": "CH_C", + "label": "C", + } + "KC_V": { + "key": "CH_V", + "label": "V", + } + "KC_B": { + "key": "CH_B", + "label": "B", + } + "KC_N": { + "key": "CH_N", + "label": "N", + } + "KC_M": { + "key": "CH_M", + "label": "M", + } + "KC_COMM": { + "key": "CH_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CH_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CH_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ + │ " │ * │ ç │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ è │ ! │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ é │ à │ £ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(CH_SECT)": { + "key": "CH_DEG", + "label": "°", + } + "S(CH_1)": { + "key": "CH_PLUS", + "label": "+", + } + "S(CH_2)": { + "key": "CH_DQUO", + "label": "\"", + } + "S(CH_3)": { + "key": "CH_ASTR", + "label": "*", + } + "S(CH_4)": { + "key": "CH_CCED", + "label": "ç", + } + "S(CH_5)": { + "key": "CH_PERC", + "label": "%", + } + "S(CH_6)": { + "key": "CH_AMPR", + "label": "&", + } + "S(CH_7)": { + "key": "CH_SLSH", + "label": "/", + } + "S(CH_8)": { + "key": "CH_LPRN", + "label": "(", + } + "S(CH_9)": { + "key": "CH_RPRN", + "label": ")", + } + "S(CH_0)": { + "key": "CH_EQL", + "label": "=", + } + "S(CH_QUOT)": { + "key": "CH_QUES", + "label": "?", + } + "S(CH_CIRC)": { + "key": "CH_GRV", + "label": "` (dead)", + } + "S(CH_UDIA)": { + "key": "CH_EGRV", + "label": "è", + } + "S(CH_DIAE)": { + "key": "CH_EXLM", + "label": "!", + } + "S(CH_ODIA)": { + "key": "CH_EACU", + "label": "é", + } + "S(CH_ADIA)": { + "key": "CH_AGRV", + "label": "à", + } + "S(CH_DLR)": { + "key": "CH_PND", + "label": "£", + } + "S(CH_LABK)": { + "key": "CH_RABK", + "label": ">", + } + "S(CH_COMM)": { + "key": "CH_SCLN", + "label": ";", + } + "S(CH_DOT)": { + "key": "CH_COLN", + "label": ":", + } + "S(CH_MINS)": { + "key": "CH_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ¦ │ @ │ # │ │ │ ¬ │ | │ ¢ │ │ │ ´ │ ~ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ \ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(CH_1)": { + "key": "CH_BRKP", + "label": "¦", + } + "ALGR(CH_2)": { + "key": "CH_AT", + "label": "@", + } + "ALGR(CH_3)": { + "key": "CH_HASH", + "label": "#", + } + "ALGR(CH_6)": { + "key": "CH_NOT", + "label": "¬", + } + "ALGR(CH_7)": { + "key": "CH_PIPE", + "label": "|", + } + "ALGR(CH_8)": { + "key": "CH_CENT", + "label": "¢", + } + "ALGR(CH_QUOT)": { + "key": "CH_ACUT", + "label": "´ (dead)", + } + "ALGR(CH_CIRC)": { + "key": "CH_TILD", + "label": "~ (dead)", + } + "ALGR(CH_E)": { + "key": "CH_EURO", + "label": "€", + } + "ALGR(CH_UDIA)": { + "key": "CH_LBRC", + "label": "[", + } + "ALGR(CH_DIAE)": { + "key": "CH_RBRC", + "label": "]", + } + "ALGR(CH_ADIA)": { + "key": "CH_LCBR", + "label": "{", + } + "ALGR(CH_DLR)": { + "key": "CH_RCBR", + "label": "}", + } + "ALGR(CH_LABK)": { + "key": "CH_BSLS", + "label": "\\", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_swiss_fr_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_swiss_fr_0.0.1.hjson new file mode 100644 index 0000000000..83fb86e49c --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_swiss_fr_0.0.1.hjson @@ -0,0 +1,379 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ § │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ è │ ¨ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ é │ à │ $ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "CH_SECT", + "label": "§", + } + "KC_1": { + "key": "CH_1", + "label": "1", + } + "KC_2": { + "key": "CH_2", + "label": "2", + } + "KC_3": { + "key": "CH_3", + "label": "3", + } + "KC_4": { + "key": "CH_4", + "label": "4", + } + "KC_5": { + "key": "CH_5", + "label": "5", + } + "KC_6": { + "key": "CH_6", + "label": "6", + } + "KC_7": { + "key": "CH_7", + "label": "7", + } + "KC_8": { + "key": "CH_8", + "label": "8", + } + "KC_9": { + "key": "CH_9", + "label": "9", + } + "KC_0": { + "key": "CH_0", + "label": "0", + } + "KC_MINS": { + "key": "CH_QUOT", + "label": "'", + } + "KC_EQL": { + "key": "CH_CIRC", + "label": "^ (dead)", + } + "KC_Q": { + "key": "CH_Q", + "label": "Q", + } + "KC_W": { + "key": "CH_W", + "label": "W", + } + "KC_E": { + "key": "CH_E", + "label": "E", + } + "KC_R": { + "key": "CH_R", + "label": "R", + } + "KC_T": { + "key": "CH_T", + "label": "T", + } + "KC_Y": { + "key": "CH_Z", + "label": "Z", + } + "KC_U": { + "key": "CH_U", + "label": "U", + } + "KC_I": { + "key": "CH_I", + "label": "I", + } + "KC_O": { + "key": "CH_O", + "label": "O", + } + "KC_P": { + "key": "CH_P", + "label": "P", + } + "KC_LBRC": { + "key": "CH_EGRV", + "label": "è", + } + "KC_RBRC": { + "key": "CH_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "CH_A", + "label": "A", + } + "KC_S": { + "key": "CH_S", + "label": "S", + } + "KC_D": { + "key": "CH_D", + "label": "D", + } + "KC_F": { + "key": "CH_F", + "label": "F", + } + "KC_G": { + "key": "CH_G", + "label": "G", + } + "KC_H": { + "key": "CH_H", + "label": "H", + } + "KC_J": { + "key": "CH_J", + "label": "J", + } + "KC_K": { + "key": "CH_K", + "label": "K", + } + "KC_L": { + "key": "CH_L", + "label": "L", + } + "KC_SCLN": { + "key": "CH_EACU", + "label": "é", + } + "KC_QUOT": { + "key": "CH_AGRV", + "label": "à", + } + "KC_NUHS": { + "key": "CH_DLR", + "label": "$", + } + "KC_NUBS": { + "key": "CH_LABK", + "label": "<", + } + "KC_Z": { + "key": "CH_Y", + "label": "Y", + } + "KC_X": { + "key": "CH_X", + "label": "X", + } + "KC_C": { + "key": "CH_C", + "label": "C", + } + "KC_V": { + "key": "CH_V", + "label": "V", + } + "KC_B": { + "key": "CH_B", + "label": "B", + } + "KC_N": { + "key": "CH_N", + "label": "N", + } + "KC_M": { + "key": "CH_M", + "label": "M", + } + "KC_COMM": { + "key": "CH_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CH_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CH_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ + │ " │ * │ ç │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ü │ ! │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ ö │ ä │ £ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(CH_SECT)": { + "key": "CH_DEG", + "label": "°", + } + "S(CH_1)": { + "key": "CH_PLUS", + "label": "+", + } + "S(CH_2)": { + "key": "CH_DQUO", + "label": "\"", + } + "S(CH_3)": { + "key": "CH_ASTR", + "label": "*", + } + "S(CH_4)": { + "key": "CH_CCED", + "label": "ç", + } + "S(CH_5)": { + "key": "CH_PERC", + "label": "%", + } + "S(CH_6)": { + "key": "CH_AMPR", + "label": "&", + } + "S(CH_7)": { + "key": "CH_SLSH", + "label": "/", + } + "S(CH_8)": { + "key": "CH_LPRN", + "label": "(", + } + "S(CH_9)": { + "key": "CH_RPRN", + "label": ")", + } + "S(CH_0)": { + "key": "CH_EQL", + "label": "=", + } + "S(CH_QUOT)": { + "key": "CH_QUES", + "label": "?", + } + "S(CH_CIRC)": { + "key": "CH_GRV", + "label": "` (dead)", + } + "S(CH_EGRV)": { + "key": "CH_UDIA", + "label": "ü", + } + "S(CH_DIAE)": { + "key": "CH_EXLM", + "label": "!", + } + "S(CH_EACU)": { + "key": "CH_ODIA", + "label": "ö", + } + "S(CH_AGRV)": { + "key": "CH_ADIA", + "label": "ä", + } + "S(CH_DLR)": { + "key": "CH_PND", + "label": "£", + } + "S(CH_LABK)": { + "key": "CH_RABK", + "label": ">", + } + "S(CH_COMM)": { + "key": "CH_SCLN", + "label": ";", + } + "S(CH_DOT)": { + "key": "CH_COLN", + "label": ":", + } + "S(CH_MINS)": { + "key": "CH_UNDS", + "label": "_", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ¦ │ @ │ # │ │ │ ¬ │ | │ ¢ │ │ │ ´ │ ~ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ \ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(CH_1)": { + "key": "CH_BRKP", + "label": "¦", + } + "ALGR(CH_2)": { + "key": "CH_AT", + "label": "@", + } + "ALGR(CH_3)": { + "key": "CH_HASH", + "label": "#", + } + "ALGR(CH_6)": { + "key": "CH_NOT", + "label": "¬", + } + "ALGR(CH_7)": { + "key": "CH_PIPE", + "label": "|", + } + "ALGR(CH_8)": { + "key": "CH_CENT", + "label": "¢", + } + "ALGR(CH_QUOT)": { + "key": "CH_ACUT", + "label": "´ (dead)", + } + "ALGR(CH_CIRC)": { + "key": "CH_TILD", + "label": "~ (dead)", + } + "ALGR(CH_E)": { + "key": "CH_EURO", + "label": "€", + } + "ALGR(CH_EGRV)": { + "key": "CH_LBRC", + "label": "[", + } + "ALGR(CH_DIAE)": { + "key": "CH_RBRC", + "label": "]", + } + "ALGR(CH_AGRV)": { + "key": "CH_LCBR", + "label": "{", + } + "ALGR(CH_DLR)": { + "key": "CH_RCBR", + "label": "}", + } + "ALGR(CH_LABK)": { + "key": "CH_BSLS", + "label": "\\", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_turkish_f_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_turkish_f_0.0.1.hjson new file mode 100644 index 0000000000..2689f10dbe --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_turkish_f_0.0.1.hjson @@ -0,0 +1,480 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ + │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ / │ - │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ F │ G │ Ğ │ I │ O │ D │ R │ N │ H │ P │ Q │ W │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ U │ İ │ E │ A │ Ü │ T │ K │ M │ L │ Y │ Ş │ X │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ < │ J │ Ö │ V │ C │ Ç │ Z │ S │ B │ . │ , │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "TR_PLUS", + "label": "+", + } + "KC_1": { + "key": "TR_1", + "label": "1", + } + "KC_2": { + "key": "TR_2", + "label": "2", + } + "KC_3": { + "key": "TR_3", + "label": "3", + } + "KC_4": { + "key": "TR_4", + "label": "4", + } + "KC_5": { + "key": "TR_5", + "label": "5", + } + "KC_6": { + "key": "TR_6", + "label": "6", + } + "KC_7": { + "key": "TR_7", + "label": "7", + } + "KC_8": { + "key": "TR_8", + "label": "8", + } + "KC_9": { + "key": "TR_9", + "label": "9", + } + "KC_0": { + "key": "TR_0", + "label": "0", + } + "KC_MINS": { + "key": "TR_SLSH", + "label": "/", + } + "KC_EQL": { + "key": "TR_MINS", + "label": "-", + } + "KC_Q": { + "key": "TR_F", + "label": "F", + } + "KC_W": { + "key": "TR_G", + "label": "G", + } + "KC_E": { + "key": "TR_GBRV", + "label": "Ğ", + } + "KC_R": { + "key": "TR_I", + "label": "I", + } + "KC_T": { + "key": "TR_O", + "label": "O", + } + "KC_Y": { + "key": "TR_D", + "label": "D", + } + "KC_U": { + "key": "TR_R", + "label": "R", + } + "KC_I": { + "key": "TR_N", + "label": "N", + } + "KC_O": { + "key": "TR_H", + "label": "H", + } + "KC_P": { + "key": "TR_P", + "label": "P", + } + "KC_LBRC": { + "key": "TR_Q", + "label": "Q", + } + "KC_RBRC": { + "key": "TR_W", + "label": "W", + } + "KC_A": { + "key": "TR_U", + "label": "U", + } + "KC_S": { + "key": "TR_IDOT", + "label": "İ", + } + "KC_D": { + "key": "TR_E", + "label": "E", + } + "KC_F": { + "key": "TR_A", + "label": "A", + } + "KC_G": { + "key": "TR_UDIA", + "label": "Ü", + } + "KC_H": { + "key": "TR_T", + "label": "T", + } + "KC_J": { + "key": "TR_K", + "label": "K", + } + "KC_K": { + "key": "TR_M", + "label": "M", + } + "KC_L": { + "key": "TR_L", + "label": "L", + } + "KC_SCLN": { + "key": "TR_Y", + "label": "Y", + } + "KC_QUOT": { + "key": "TR_SCED", + "label": "Ş", + } + "KC_NUHS": { + "key": "TR_X", + "label": "X", + } + "KC_NUBS": { + "key": "TR_LABK", + "label": "<", + } + "KC_Z": { + "key": "TR_J", + "label": "J", + } + "KC_X": { + "key": "TR_ODIA", + "label": "Ö", + } + "KC_C": { + "key": "TR_V", + "label": "V", + } + "KC_V": { + "key": "TR_C", + "label": "C", + } + "KC_B": { + "key": "TR_CCED", + "label": "Ç", + } + "KC_N": { + "key": "TR_Z", + "label": "Z", + } + "KC_M": { + "key": "TR_S", + "label": "S", + } + "KC_COMM": { + "key": "TR_B", + "label": "B", + } + "KC_DOT": { + "key": "TR_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "TR_COMM", + "label": ",", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ * │ ! │ " │ ^ │ $ │ % │ & │ ' │ ( │ ) │ = │ ? │ _ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ │ : │ ; │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(TR_PLUS)": { + "key": "TR_ASTR", + "label": "*", + } + "S(TR_1)": { + "key": "TR_EXLM", + "label": "!", + } + "S(TR_2)": { + "key": "TR_DQUO", + "label": "\"", + } + "S(TR_3)": { + "key": "TR_CIRC", + "label": "^ (dead)", + } + "S(TR_4)": { + "key": "TR_DLR", + "label": "$", + } + "S(TR_5)": { + "key": "TR_PERC", + "label": "%", + } + "S(TR_6)": { + "key": "TR_AMPR", + "label": "&", + } + "S(TR_7)": { + "key": "TR_QUOT", + "label": "'", + } + "S(TR_8)": { + "key": "TR_LPRN", + "label": "(", + } + "S(TR_9)": { + "key": "TR_RPRN", + "label": ")", + } + "S(TR_0)": { + "key": "TR_EQL", + "label": "=", + } + "S(TR_SLSH)": { + "key": "TR_QUES", + "label": "?", + } + "S(TR_MINS)": { + "key": "TR_UNDS", + "label": "_", + } + "S(TR_LABK)": { + "key": "TR_RABK", + "label": ">", + } + "S(TR_DOT)": { + "key": "TR_COLN", + "label": ":", + } + "S(TR_COMM)": { + "key": "TR_SCLN", + "label": ";", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¬ │ ¹ │ ² │ # │ ¼ │ ½ │ ¾ │ { │ [ │ ] │ } │ \ │ | │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ @ │ │ │ ¶ │ │ ¥ │ │ │ Ø │ £ │ ¨ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Æ │ ß │ € │ │ │ ₺ │ │ │ │ ´ │ │ ` │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ « │ » │ ¢ │ │ │ │ µ │ × │ ÷ │ - │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(TR_PLUS)": { + "key": "TR_NOT", + "label": "¬", + } + "ALGR(TR_1)": { + "key": "TR_SUP1", + "label": "¹", + } + "ALGR(TR_2)": { + "key": "TR_SUP2", + "label": "²", + } + "ALGR(TR_3)": { + "key": "TR_HASH", + "label": "#", + } + "ALGR(TR_4)": { + "key": "TR_QRTR", + "label": "¼", + } + "ALGR(TR_5)": { + "key": "TR_HALF", + "label": "½", + } + "ALGR(TR_6)": { + "key": "TR_TQTR", + "label": "¾", + } + "ALGR(TR_7)": { + "key": "TR_LCBR", + "label": "{", + } + "ALGR(TR_8)": { + "key": "TR_LBRC", + "label": "[", + } + "ALGR(TR_9)": { + "key": "TR_RBRC", + "label": "]", + } + "ALGR(TR_0)": { + "key": "TR_RCBR", + "label": "}", + } + "ALGR(TR_SLSH)": { + "key": "TR_BSLS", + "label": "\\", + } + "ALGR(TR_MINS)": { + "key": "TR_PIPE", + "label": "|", + } + "ALGR(TR_F)": { + "key": "TR_AT", + "label": "@", + } + "ALGR(TR_I)": { + "key": "TR_PILC", + "label": "¶", + } + "ALGR(TR_D)": { + "key": "TR_YEN", + "label": "¥", + } + "ALGR(TR_H)": { + "key": "TR_OSTR", + "label": "Ø", + } + "ALGR(TR_P)": { + "key": "TR_PND", + "label": "£", + } + "ALGR(TR_Q)": { + "key": "TR_DIAE", + "label": "¨ (dead)", + } + "ALGR(TR_W)": { + "key": "TR_TILD", + "label": "~ (dead)", + } + "ALGR(TR_U)": { + "key": "TR_AE", + "label": "Æ", + } + "ALGR(TR_IDOT)": { + "key": "TR_SS", + "label": "ß", + } + "ALGR(TR_E)": { + "key": "TR_EURO", + "label": "€", + } + "ALGR(TR_T)": { + "key": "TR_LIRA", + "label": "₺", + } + "ALGR(TR_Y)": { + "key": "TR_ACUT", + "label": "´ (dead)", + } + "ALGR(TR_X)": { + "key": "TR_GRV", + "label": "` (dead)", + } + "ALGR(TR_J)": { + "key": "TR_LDAQ", + "label": "«", + } + "ALGR(TR_ODIA)": { + "key": "TR_RDAQ", + "label": "»", + } + "ALGR(TR_V)": { + "key": "TR_CENT", + "label": "¢", + } + "ALGR(TR_S)": { + "key": "TR_MICR", + "label": "µ", + } + "ALGR(TR_B)": { + "key": "TR_MUL", + "label": "×", + } + "ALGR(TR_DOT)": { + "key": "TR_DIV", + "label": "÷", + } + "ALGR(TR_COMM)": { + "key": "TR_SHYP", + "label": "­ (soft hyphen)", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ ³ │ ¤ │ │ │ │ │ │ │ ¿ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ ® │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ § │ │ ª │ │ │ │ │ │ │ │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ ¦ │ │ │ © │ │ │ │ º │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(TR_3))": { + "key": "TR_SUP3", + "label": "³", + } + "S(ALGR(TR_4))": { + "key": "TR_CURR", + "label": "¤", + } + "S(ALGR(TR_SLSH))": { + "key": "TR_IQUE", + "label": "¿", + } + "S(ALGR(TR_I))": { + "key": "TR_REGD", + "label": "®", + } + "S(ALGR(TR_IDOT))": { + "key": "TR_SECT", + "label": "§", + } + "S(ALGR(TR_A))": { + "key": "TR_FORD", + "label": "ª", + } + "S(ALGR(TR_LABK))": { + "key": "TR_BRKP", + "label": "¦", + } + "S(ALGR(TR_V))": { + "key": "TR_COPY", + "label": "©", + } + "S(ALGR(TR_S))": { + "key": "TR_MORD", + "label": "º", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_turkish_q_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_turkish_q_0.0.1.hjson new file mode 100644 index 0000000000..e00cee9ce3 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_turkish_q_0.0.1.hjson @@ -0,0 +1,375 @@ +{ + "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": "TR_DQUO", + "label": "\"", + } + "KC_1": { + "key": "TR_1", + "label": "1", + } + "KC_2": { + "key": "TR_2", + "label": "2", + } + "KC_3": { + "key": "TR_3", + "label": "3", + } + "KC_4": { + "key": "TR_4", + "label": "4", + } + "KC_5": { + "key": "TR_5", + "label": "5", + } + "KC_6": { + "key": "TR_6", + "label": "6", + } + "KC_7": { + "key": "TR_7", + "label": "7", + } + "KC_8": { + "key": "TR_8", + "label": "8", + } + "KC_9": { + "key": "TR_9", + "label": "9", + } + "KC_0": { + "key": "TR_0", + "label": "0", + } + "KC_MINS": { + "key": "TR_ASTR", + "label": "*", + } + "KC_EQL": { + "key": "TR_MINS", + "label": "-", + } + "KC_Q": { + "key": "TR_Q", + "label": "Q", + } + "KC_W": { + "key": "TR_W", + "label": "W", + } + "KC_E": { + "key": "TR_E", + "label": "E", + } + "KC_R": { + "key": "TR_R", + "label": "R", + } + "KC_T": { + "key": "TR_T", + "label": "T", + } + "KC_Y": { + "key": "TR_Y", + "label": "Y", + } + "KC_U": { + "key": "TR_U", + "label": "U", + } + "KC_I": { + "key": "TR_I", + "label": "I", + } + "KC_O": { + "key": "TR_O", + "label": "O", + } + "KC_P": { + "key": "TR_P", + "label": "P", + } + "KC_LBRC": { + "key": "TR_GBRV", + "label": "Ğ", + } + "KC_RBRC": { + "key": "TR_UDIA", + "label": "Ü", + } + "KC_A": { + "key": "TR_A", + "label": "A", + } + "KC_S": { + "key": "TR_S", + "label": "S", + } + "KC_D": { + "key": "TR_D", + "label": "D", + } + "KC_F": { + "key": "TR_F", + "label": "F", + } + "KC_G": { + "key": "TR_G", + "label": "G", + } + "KC_H": { + "key": "TR_H", + "label": "H", + } + "KC_J": { + "key": "TR_J", + "label": "J", + } + "KC_K": { + "key": "TR_K", + "label": "K", + } + "KC_L": { + "key": "TR_L", + "label": "L", + } + "KC_SCLN": { + "key": "TR_SCED", + "label": "Ş", + } + "KC_QUOT": { + "key": "TR_IDOT", + "label": "İ", + } + "KC_NUHS": { + "key": "TR_COMM", + "label": ",", + } + "KC_NUBS": { + "key": "TR_LABK", + "label": "<", + } + "KC_Z": { + "key": "TR_Z", + "label": "Z", + } + "KC_X": { + "key": "TR_X", + "label": "X", + } + "KC_C": { + "key": "TR_C", + "label": "C", + } + "KC_V": { + "key": "TR_V", + "label": "V", + } + "KC_B": { + "key": "TR_B", + "label": "B", + } + "KC_N": { + "key": "TR_N", + "label": "N", + } + "KC_M": { + "key": "TR_M", + "label": "M", + } + "KC_COMM": { + "key": "TR_ODIA", + "label": "Ö", + } + "KC_DOT": { + "key": "TR_CCED", + "label": "Ç", + } + "KC_SLSH": { + "key": "TR_DOT", + "label": ".", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ é │ ! │ ' │ ^ │ + │ % │ & │ / │ ( │ ) │ = │ ? │ _ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ ; │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ > │ │ │ │ │ │ │ │ │ │ : │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(TR_DQUO)": { + "key": "TR_EACU", + "label": "é", + } + "S(TR_1)": { + "key": "TR_EXLM", + "label": "!", + } + "S(TR_2)": { + "key": "TR_QUOT", + "label": "'", + } + "S(TR_3)": { + "key": "TR_CIRC", + "label": "^ (dead)", + } + "S(TR_4)": { + "key": "TR_PLUS", + "label": "+", + } + "S(TR_5)": { + "key": "TR_PERC", + "label": "%", + } + "S(TR_6)": { + "key": "TR_AMPR", + "label": "&", + } + "S(TR_7)": { + "key": "TR_SLSH", + "label": "/", + } + "S(TR_8)": { + "key": "TR_LPRN", + "label": "(", + } + "S(TR_9)": { + "key": "TR_RPRN", + "label": ")", + } + "S(TR_0)": { + "key": "TR_EQL", + "label": "=", + } + "S(TR_ASTR)": { + "key": "TR_QUES", + "label": "?", + } + "S(TR_MINS)": { + "key": "TR_UNDS", + "label": "_", + } + "S(TR_COMM)": { + "key": "TR_SCLN", + "label": ";", + } + "S(TR_LABK)": { + "key": "TR_RABK", + "label": ">", + } + "S(TR_DOT)": { + "key": "TR_COLN", + "label": ":", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ £ │ # │ $ │ ½ │ │ { │ [ │ ] │ } │ \ │ | │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ @ │ │ € │ │ ₺ │ │ │ │ │ │ ¨ │ ~ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Æ │ ß │ │ │ │ │ │ │ │ ´ │ │ ` │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(TR_2)": { + "key": "TR_PND", + "label": "£", + } + "ALGR(TR_3)": { + "key": "TR_HASH", + "label": "#", + } + "ALGR(TR_4)": { + "key": "TR_DLR", + "label": "$", + } + "ALGR(TR_5)": { + "key": "TR_HALF", + "label": "½", + } + "ALGR(TR_7)": { + "key": "TR_LCBR", + "label": "{", + } + "ALGR(TR_8)": { + "key": "TR_LBRC", + "label": "[", + } + "ALGR(TR_9)": { + "key": "TR_RBRC", + "label": "]", + } + "ALGR(TR_0)": { + "key": "TR_RCBR", + "label": "}", + } + "ALGR(TR_ASTR)": { + "key": "TR_BSLS", + "label": "\\", + } + "ALGR(TR_MINS)": { + "key": "TR_PIPE", + "label": "|", + } + "ALGR(TR_Q)": { + "key": "TR_AT", + "label": "@", + } + "ALGR(TR_E)": { + "key": "TR_EURO", + "label": "€", + } + "ALGR(TR_T)": { + "key": "TR_LIRA", + "label": "₺", + } + "ALGR(TR_GBRV)": { + "key": "TR_DIAE", + "label": "¨ (dead)", + } + "ALGR(TR_UDIA)": { + "key": "TR_TILD", + "label": "~ (dead)", + } + "ALGR(TR_A)": { + "key": "TR_AE", + "label": "Æ", + } + "ALGR(TR_S)": { + "key": "TR_SS", + "label": "ß", + } + "ALGR(TR_SCED)": { + "key": "TR_ACUT", + "label": "´ (dead)", + } + "ALGR(TR_COMM)": { + "key": "TR_GRV", + "label": "` (dead)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_ukrainian_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_ukrainian_0.0.1.hjson new file mode 100644 index 0000000000..2e8629f58b --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_ukrainian_0.0.1.hjson @@ -0,0 +1,295 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ' │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Й │ Ц │ У │ К │ Е │ Н │ Г │ Ш │ Щ │ З │ Х │ Ї │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ Ф │ І │ В │ А │ П │ Р │ О │ Л │ Д │ Ж │ Є │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Я │ Ч │ С │ М │ И │ Т │ Ь │ Б │ Ю │ . │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "UA_QUOT", + "label": "'", + } + "KC_1": { + "key": "UA_1", + "label": "1", + } + "KC_2": { + "key": "UA_2", + "label": "2", + } + "KC_3": { + "key": "UA_3", + "label": "3", + } + "KC_4": { + "key": "UA_4", + "label": "4", + } + "KC_5": { + "key": "UA_5", + "label": "5", + } + "KC_6": { + "key": "UA_6", + "label": "6", + } + "KC_7": { + "key": "UA_7", + "label": "7", + } + "KC_8": { + "key": "UA_8", + "label": "8", + } + "KC_9": { + "key": "UA_9", + "label": "9", + } + "KC_0": { + "key": "UA_0", + "label": "0", + } + "KC_MINS": { + "key": "UA_MINS", + "label": "-", + } + "KC_EQL": { + "key": "UA_EQL", + "label": "=", + } + "KC_Q": { + "key": "UA_YOT", + "label": "Й", + } + "KC_W": { + "key": "UA_TSE", + "label": "Ц", + } + "KC_E": { + "key": "UA_U", + "label": "У", + } + "KC_R": { + "key": "UA_KA", + "label": "К", + } + "KC_T": { + "key": "UA_E", + "label": "Е", + } + "KC_Y": { + "key": "UA_EN", + "label": "Н", + } + "KC_U": { + "key": "UA_HE", + "label": "Г", + } + "KC_I": { + "key": "UA_SHA", + "label": "Ш", + } + "KC_O": { + "key": "UA_SHCH", + "label": "Щ", + } + "KC_P": { + "key": "UA_ZE", + "label": "З", + } + "KC_LBRC": { + "key": "UA_KHA", + "label": "Х", + } + "KC_RBRC": { + "key": "UA_YI", + "label": "Ї", + } + "KC_BSLS": { + "key": "UA_BSLS", + "label": "\\", + } + "KC_A": { + "key": "UA_EF", + "label": "Ф", + } + "KC_S": { + "key": "UA_I", + "label": "І", + } + "KC_D": { + "key": "UA_VE", + "label": "В", + } + "KC_F": { + "key": "UA_A", + "label": "А", + } + "KC_G": { + "key": "UA_PE", + "label": "П", + } + "KC_H": { + "key": "UA_ER", + "label": "Р", + } + "KC_J": { + "key": "UA_O", + "label": "О", + } + "KC_K": { + "key": "UA_EL", + "label": "Л", + } + "KC_L": { + "key": "UA_DE", + "label": "Д", + } + "KC_SCLN": { + "key": "UA_ZHE", + "label": "Ж", + } + "KC_QUOT": { + "key": "UA_YE", + "label": "Є", + } + "KC_Z": { + "key": "UA_YA", + "label": "Я", + } + "KC_X": { + "key": "UA_CHE", + "label": "Ч", + } + "KC_C": { + "key": "UA_ES", + "label": "С", + } + "KC_V": { + "key": "UA_EM", + "label": "М", + } + "KC_B": { + "key": "UA_Y", + "label": "И", + } + "KC_N": { + "key": "UA_TE", + "label": "Т", + } + "KC_M": { + "key": "UA_SOFT", + "label": "Ь", + } + "KC_COMM": { + "key": "UA_BE", + "label": "Б", + } + "KC_DOT": { + "key": "UA_YU", + "label": "Ю", + } + "KC_SLSH": { + "key": "UA_DOT", + "label": ".", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ₴ │ ! │ " │ № │ ; │ % │ : │ ? │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ / │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ , │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(UA_QUOT)": { + "key": "UA_HRYV", + "label": "₴", + } + "S(UA_1)": { + "key": "UA_EXLM", + "label": "!", + } + "S(UA_2)": { + "key": "UA_DQUO", + "label": "\"", + } + "S(UA_3)": { + "key": "UA_NUM", + "label": "№", + } + "S(UA_4)": { + "key": "UA_SCLN", + "label": ";", + } + "S(UA_5)": { + "key": "UA_PERC", + "label": "%", + } + "S(UA_6)": { + "key": "UA_COLN", + "label": ":", + } + "S(UA_7)": { + "key": "UA_QUES", + "label": "?", + } + "S(UA_8)": { + "key": "UA_ASTR", + "label": "*", + } + "S(UA_9)": { + "key": "UA_LPRN", + "label": "(", + } + "S(UA_0)": { + "key": "UA_RPRN", + "label": ")", + } + "S(UA_MINS)": { + "key": "UA_UNDS", + "label": "_", + } + "S(UA_EQL)": { + "key": "UA_PLUS", + "label": "+", + } + "S(UA_BSLS)": { + "key": "UA_SLSH", + "label": "/", + } + "S(UA_DOT)": { + "key": "UA_COMM", + "label": ",", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ ґ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(UA_HE)": { + "key": "UA_GE", + "label": "ґ", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_us_extended_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_us_extended_0.0.1.hjson new file mode 100644 index 0000000000..ecac6ca161 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_us_extended_0.0.1.hjson @@ -0,0 +1,588 @@ +{ + "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": "US_GRV", + "label": "`", + } + "KC_1": { + "key": "US_1", + "label": "1", + } + "KC_2": { + "key": "US_2", + "label": "2", + } + "KC_3": { + "key": "US_3", + "label": "3", + } + "KC_4": { + "key": "US_4", + "label": "4", + } + "KC_5": { + "key": "US_5", + "label": "5", + } + "KC_6": { + "key": "US_6", + "label": "6", + } + "KC_7": { + "key": "US_7", + "label": "7", + } + "KC_8": { + "key": "US_8", + "label": "8", + } + "KC_9": { + "key": "US_9", + "label": "9", + } + "KC_0": { + "key": "US_0", + "label": "0", + } + "KC_MINS": { + "key": "US_MINS", + "label": "-", + } + "KC_EQL": { + "key": "US_EQL", + "label": "=", + } + "KC_Q": { + "key": "US_Q", + "label": "Q", + } + "KC_W": { + "key": "US_W", + "label": "W", + } + "KC_E": { + "key": "US_E", + "label": "E", + } + "KC_R": { + "key": "US_R", + "label": "R", + } + "KC_T": { + "key": "US_T", + "label": "T", + } + "KC_Y": { + "key": "US_Y", + "label": "Y", + } + "KC_U": { + "key": "US_U", + "label": "U", + } + "KC_I": { + "key": "US_I", + "label": "I", + } + "KC_O": { + "key": "US_O", + "label": "O", + } + "KC_P": { + "key": "US_P", + "label": "P", + } + "KC_LBRC": { + "key": "US_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "US_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "US_BSLS", + "label": "\\", + } + "KC_A": { + "key": "US_A", + "label": "A", + } + "KC_S": { + "key": "US_S", + "label": "S", + } + "KC_D": { + "key": "US_D", + "label": "D", + } + "KC_F": { + "key": "US_F", + "label": "F", + } + "KC_G": { + "key": "US_G", + "label": "G", + } + "KC_H": { + "key": "US_H", + "label": "H", + } + "KC_J": { + "key": "US_J", + "label": "J", + } + "KC_K": { + "key": "US_K", + "label": "K", + } + "KC_L": { + "key": "US_L", + "label": "L", + } + "KC_SCLN": { + "key": "US_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "US_QUOT", + "label": "'", + } + "KC_Z": { + "key": "US_Z", + "label": "Z", + } + "KC_X": { + "key": "US_X", + "label": "X", + } + "KC_C": { + "key": "US_C", + "label": "C", + } + "KC_V": { + "key": "US_V", + "label": "V", + } + "KC_B": { + "key": "US_B", + "label": "B", + } + "KC_N": { + "key": "US_N", + "label": "N", + } + "KC_M": { + "key": "US_M", + "label": "M", + } + "KC_COMM": { + "key": "US_COMM", + "label": ",", + } + "KC_DOT": { + "key": "US_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "US_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(US_GRV)": { + "key": "US_TILD", + "label": "~", + } + "S(US_1)": { + "key": "US_EXLM", + "label": "!", + } + "S(US_2)": { + "key": "US_AT", + "label": "@", + } + "S(US_3)": { + "key": "US_HASH", + "label": "#", + } + "S(US_4)": { + "key": "US_DLR", + "label": "$", + } + "S(US_5)": { + "key": "US_PERC", + "label": "%", + } + "S(US_6)": { + "key": "US_CIRC", + "label": "^", + } + "S(US_7)": { + "key": "US_AMPR", + "label": "&", + } + "S(US_8)": { + "key": "US_ASTR", + "label": "*", + } + "S(US_9)": { + "key": "US_LPRN", + "label": "(", + } + "S(US_0)": { + "key": "US_RPRN", + "label": ")", + } + "S(US_MINS)": { + "key": "US_UNDS", + "label": "_", + } + "S(US_EQL)": { + "key": "US_PLUS", + "label": "+", + } + "S(US_LBRC)": { + "key": "US_LCBR", + "label": "{", + } + "S(US_RBRC)": { + "key": "US_RCBR", + "label": "}", + } + "S(US_BSLS)": { + "key": "US_PIPE", + "label": "|", + } + "S(US_SCLN)": { + "key": "US_COLN", + "label": ":", + } + "S(US_QUOT)": { + "key": "US_DQUO", + "label": "\"", + } + "S(US_COMM)": { + "key": "US_LABK", + "label": "<", + } + "S(US_DOT)": { + "key": "US_RABK", + "label": ">", + } + "S(US_SLSH)": { + "key": "US_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ ¹ │ ² │ ³ │ ¤ │ € │ ^ │ ̛ │ ¾ │ ‘ │ ’ │ ¥ │ × │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Ä │ Å │ É │ ® │ Þ │ Ü │ Ú │ Í │ Ó │ Ö │ « │ » │ ¬ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ Á │ ß │ Ð │ │ │ │ Ï │ Œ │ Ø │ ¶ │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Æ │ │ © │ │ │ Ñ │ µ │ Ç │ ˙ │ ¿ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(US_GRV)": { + "key": "US_DGRV", + "label": "` (dead)", + } + "ALGR(US_1)": { + "key": "US_SUP1", + "label": "¹", + } + "ALGR(US_2)": { + "key": "US_SUP2", + "label": "²", + } + "ALGR(US_3)": { + "key": "US_SUP3", + "label": "³", + } + "ALGR(US_4)": { + "key": "US_CURR", + "label": "¤", + } + "ALGR(US_5)": { + "key": "US_EURO", + "label": "€", + } + "ALGR(US_6)": { + "key": "US_DCIR", + "label": "^ (dead)", + } + "ALGR(US_7)": { + "key": "US_HORN", + "label": "̛ (dead)", + } + "ALGR(US_8)": { + "key": "US_OGON", + "label": "˛ (dead)", + } + "ALGR(US_9)": { + "key": "US_LSQU", + "label": "‘", + } + "ALGR(US_0)": { + "key": "US_RSQU", + "label": "’", + } + "ALGR(US_MINS)": { + "key": "US_YEN", + "label": "¥", + } + "ALGR(US_EQL)": { + "key": "US_MUL", + "label": "×", + } + "ALGR(US_Q)": { + "key": "US_ADIA", + "label": "Ä", + } + "ALGR(US_W)": { + "key": "US_ARNG", + "label": "Å", + } + "ALGR(US_E)": { + "key": "US_EACU", + "label": "É", + } + "ALGR(US_R)": { + "key": "US_EDIA", + "label": "Ë", + } + "ALGR(US_T)": { + "key": "US_THRN", + "label": "Þ", + } + "ALGR(US_Y)": { + "key": "US_UDIA", + "label": "Ü", + } + "ALGR(US_U)": { + "key": "US_UACU", + "label": "Ú", + } + "ALGR(US_I)": { + "key": "US_IACU", + "label": "Í", + } + "ALGR(US_O)": { + "key": "US_OACU", + "label": "Ó", + } + "ALGR(US_P)": { + "key": "US_ODIA", + "label": "Ö", + } + "ALGR(US_LBRC)": { + "key": "US_LDAQ", + "label": "«", + } + "ALGR(US_RBRC)": { + "key": "US_RDAQ", + "label": "»", + } + "ALGR(US_BSLS)": { + "key": "US_NOT", + "label": "¬", + } + "ALGR(US_A)": { + "key": "US_AACU", + "label": "Á", + } + "ALGR(US_S)": { + "key": "US_SS", + "label": "ß", + } + "ALGR(US_D)": { + "key": "US_ETH", + "label": "Ð", + } + "ALGR(US_J)": { + "key": "US_IDIA", + "label": "Ï", + } + "ALGR(US_K)": { + "key": "US_OE", + "label": "Œ", + } + "ALGR(US_L)": { + "key": "US_OSTR", + "label": "Ø", + } + "ALGR(US_SCLN)": { + "key": "US_PILC", + "label": "¶", + } + "ALGR(US_QUOT)": { + "key": "US_ACUT", + "label": "´ (dead)", + } + "ALGR(US_Z)": { + "key": "US_AE", + "label": "Æ", + } + "ALGR(US_X)": { + "key": "US_OE_2", + "label": "Œ", + } + "ALGR(US_C)": { + "key": "US_COPY", + "label": "©", + } + "ALGR(US_V)": { + "key": "US_REGD", + "label": "®", + } + "ALGR(US_N)": { + "key": "US_NTIL", + "label": "Ñ", + } + "ALGR(US_M)": { + "key": "US_MICR", + "label": "µ", + } + "ALGR(US_COMM)": { + "key": "US_CCED", + "label": "Ç", + } + "ALGR(US_DOT)": { + "key": "US_DOTA", + "label": "˙ (dead)", + } + "ALGR(US_SLSH)": { + "key": "US_IQUE", + "label": "¿", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ¡ │ ˝ │ ¯ │ £ │ ¸ │ ¼ │ ½ │ ¾ │ ˘ │ ° │ ̣ │ ÷ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ “ │ ” │ ¦ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ § │ │ │ │ │ │ │ │ ° │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ ¢ │ │ │ │ │ │ ˇ │ ̉ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(US_GRV))": { + "key": "US_DTIL", + "label": "~ (dead)", + } + "S(ALGR(US_1))": { + "key": "US_IEXL", + "label": "¡", + } + "S(ALGR(US_2))": { + "key": "US_DACU", + "label": "˝ (dead)", + } + "S(ALGR(US_3))": { + "key": "US_MACR", + "label": "¯ (dead)", + } + "S(ALGR(US_4))": { + "key": "US_PND", + "label": "£", + } + "S(ALGR(US_5))": { + "key": "US_CEDL", + "label": "¸ (dead)", + } + "S(ALGR(US_6))": { + "key": "US_QRTR", + "label": "¼", + } + "S(ALGR(US_7))": { + "key": "US_HALF", + "label": "½", + } + "S(ALGR(US_8))": { + "key": "US_TQTR", + "label": "¾", + } + "S(ALGR(US_9))": { + "key": "US_BREV", + "label": "˘ (dead)", + } + "S(ALGR(US_0))": { + "key": "US_RNGA", + "label": "° (dead)", + } + "S(ALGR(US_MINS))": { + "key": "US_DOTB", + "label": "̣ (dead)", + } + "S(ALGR(US_EQL))": { + "key": "US_DIV", + "label": "÷", + } + "S(ALGR(US_LBRC))": { + "key": "US_LDQU", + "label": "“", + } + "S(ALGR(US_RBRC))": { + "key": "US_RDQU", + "label": "”", + } + "S(ALGR(US_BSLS))": { + "key": "US_BRKP", + "label": "¦", + } + "S(ALGR(US_S))": { + "key": "US_SECT", + "label": "§", + } + "S(ALGR(US_SCLN))": { + "key": "US_DEG", + "label": "°", + } + "S(ALGR(US_QUOT))": { + "key": "US_DIAE", + "label": "¨ (dead)", + } + "S(ALGR(US_C))": { + "key": "US_CENT", + "label": "¢", + } + "S(ALGR(US_DOT))": { + "key": "US_CARN", + "label": "ˇ (dead)", + } + "S(ALGR(US_SLSH))": { + "key": "US_HOKA", + "label": "̉ (dead)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_us_international_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_us_international_0.0.1.hjson new file mode 100644 index 0000000000..36a574a4ad --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_us_international_0.0.1.hjson @@ -0,0 +1,508 @@ +{ + "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": "US_DGRV", + "label": "` (dead)", + } + "KC_1": { + "key": "US_1", + "label": "1", + } + "KC_2": { + "key": "US_2", + "label": "2", + } + "KC_3": { + "key": "US_3", + "label": "3", + } + "KC_4": { + "key": "US_4", + "label": "4", + } + "KC_5": { + "key": "US_5", + "label": "5", + } + "KC_6": { + "key": "US_6", + "label": "6", + } + "KC_7": { + "key": "US_7", + "label": "7", + } + "KC_8": { + "key": "US_8", + "label": "8", + } + "KC_9": { + "key": "US_9", + "label": "9", + } + "KC_0": { + "key": "US_0", + "label": "0", + } + "KC_MINS": { + "key": "US_MINS", + "label": "-", + } + "KC_EQL": { + "key": "US_EQL", + "label": "=", + } + "KC_Q": { + "key": "US_Q", + "label": "Q", + } + "KC_W": { + "key": "US_W", + "label": "W", + } + "KC_E": { + "key": "US_E", + "label": "E", + } + "KC_R": { + "key": "US_R", + "label": "R", + } + "KC_T": { + "key": "US_T", + "label": "T", + } + "KC_Y": { + "key": "US_Y", + "label": "Y", + } + "KC_U": { + "key": "US_U", + "label": "U", + } + "KC_I": { + "key": "US_I", + "label": "I", + } + "KC_O": { + "key": "US_O", + "label": "O", + } + "KC_P": { + "key": "US_P", + "label": "P", + } + "KC_LBRC": { + "key": "US_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "US_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "US_BSLS", + "label": "\\", + } + "KC_A": { + "key": "US_A", + "label": "A", + } + "KC_S": { + "key": "US_S", + "label": "S", + } + "KC_D": { + "key": "US_D", + "label": "D", + } + "KC_F": { + "key": "US_F", + "label": "F", + } + "KC_G": { + "key": "US_G", + "label": "G", + } + "KC_H": { + "key": "US_H", + "label": "H", + } + "KC_J": { + "key": "US_J", + "label": "J", + } + "KC_K": { + "key": "US_K", + "label": "K", + } + "KC_L": { + "key": "US_L", + "label": "L", + } + "KC_SCLN": { + "key": "US_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "US_ACUT", + "label": "´ (dead)", + } + "KC_Z": { + "key": "US_Z", + "label": "Z", + } + "KC_X": { + "key": "US_X", + "label": "X", + } + "KC_C": { + "key": "US_C", + "label": "C", + } + "KC_V": { + "key": "US_V", + "label": "V", + } + "KC_B": { + "key": "US_B", + "label": "B", + } + "KC_N": { + "key": "US_N", + "label": "N", + } + "KC_M": { + "key": "US_M", + "label": "M", + } + "KC_COMM": { + "key": "US_COMM", + "label": ",", + } + "KC_DOT": { + "key": "US_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "US_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ ¨ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(US_DGRV)": { + "key": "US_DTIL", + "label": "~ (dead)", + } + "S(US_1)": { + "key": "US_EXLM", + "label": "!", + } + "S(US_2)": { + "key": "US_AT", + "label": "@", + } + "S(US_3)": { + "key": "US_HASH", + "label": "#", + } + "S(US_4)": { + "key": "US_DLR", + "label": "$", + } + "S(US_5)": { + "key": "US_PERC", + "label": "%", + } + "S(US_6)": { + "key": "US_DCIR", + "label": "^ (dead)", + } + "S(US_7)": { + "key": "US_AMPR", + "label": "&", + } + "S(US_8)": { + "key": "US_ASTR", + "label": "*", + } + "S(US_9)": { + "key": "US_LPRN", + "label": "(", + } + "S(US_0)": { + "key": "US_RPRN", + "label": ")", + } + "S(US_MINS)": { + "key": "US_UNDS", + "label": "_", + } + "S(US_EQL)": { + "key": "US_PLUS", + "label": "+", + } + "S(US_LBRC)": { + "key": "US_LCBR", + "label": "{", + } + "S(US_RBRC)": { + "key": "US_RCBR", + "label": "}", + } + "S(US_BSLS)": { + "key": "US_PIPE", + "label": "|", + } + "S(US_SCLN)": { + "key": "US_COLN", + "label": ":", + } + "S(US_ACUT)": { + "key": "US_DIAE", + "label": "¨ (dead)", + } + "S(US_COMM)": { + "key": "US_LABK", + "label": "<", + } + "S(US_DOT)": { + "key": "US_RABK", + "label": ">", + } + "S(US_SLSH)": { + "key": "US_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ¡ │ ² │ ³ │ ¤ │ € │ ¼ │ ½ │ ¾ │ ‘ │ ’ │ ¥ │ × │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Ä │ Å │ É │ ® │ Þ │ Ü │ Ú │ Í │ Ó │ Ö │ « │ » │ ¬ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ Á │ ß │ Ð │ │ │ │ │ │ Ø │ ¶ │ ´ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Æ │ │ © │ │ │ Ñ │ µ │ Ç │ │ ¿ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(US_1)": { + "key": "US_IEXL", + "label": "¡", + } + "ALGR(US_2)": { + "key": "US_SUP2", + "label": "²", + } + "ALGR(US_3)": { + "key": "US_SUP3", + "label": "³", + } + "ALGR(US_4)": { + "key": "US_CURR", + "label": "¤", + } + "ALGR(US_5)": { + "key": "US_EURO", + "label": "€", + } + "ALGR(US_6)": { + "key": "US_QRTR", + "label": "¼", + } + "ALGR(US_7)": { + "key": "US_HALF", + "label": "½", + } + "ALGR(US_8)": { + "key": "US_TQTR", + "label": "¾", + } + "ALGR(US_9)": { + "key": "US_LSQU", + "label": "‘", + } + "ALGR(US_0)": { + "key": "US_RSQU", + "label": "’", + } + "ALGR(US_MINS)": { + "key": "US_YEN", + "label": "¥", + } + "ALGR(US_EQL)": { + "key": "US_MUL", + "label": "×", + } + "ALGR(US_Q)": { + "key": "US_ADIA", + "label": "Ä", + } + "ALGR(US_W)": { + "key": "US_ARNG", + "label": "Å", + } + "ALGR(US_E)": { + "key": "US_EACU", + "label": "É", + } + "ALGR(US_R)": { + "key": "US_REGD", + "label": "®", + } + "ALGR(US_T)": { + "key": "US_THRN", + "label": "Þ", + } + "ALGR(US_Y)": { + "key": "US_UDIA", + "label": "Ü", + } + "ALGR(US_U)": { + "key": "US_UACU", + "label": "Ú", + } + "ALGR(US_I)": { + "key": "US_IACU", + "label": "Í", + } + "ALGR(US_O)": { + "key": "US_OACU", + "label": "Ó", + } + "ALGR(US_P)": { + "key": "US_ODIA", + "label": "Ö", + } + "ALGR(US_LBRC)": { + "key": "US_LDAQ", + "label": "«", + } + "ALGR(US_RBRC)": { + "key": "US_RDAQ", + "label": "»", + } + "ALGR(US_BSLS)": { + "key": "US_NOT", + "label": "¬", + } + "ALGR(US_A)": { + "key": "US_AACU", + "label": "Á", + } + "ALGR(US_S)": { + "key": "US_SS", + "label": "ß", + } + "ALGR(US_D)": { + "key": "US_ETH", + "label": "Ð", + } + "ALGR(US_L)": { + "key": "US_OSTR", + "label": "Ø", + } + "ALGR(US_SCLN)": { + "key": "US_PILC", + "label": "¶", + } + "ALGR(US_ACUT)": { + "key": "US_NDAC", + "label": "´", + } + "ALGR(US_Z)": { + "key": "US_AE", + "label": "Æ", + } + "ALGR(US_C)": { + "key": "US_COPY", + "label": "©", + } + "ALGR(US_N)": { + "key": "US_NTIL", + "label": "Ñ", + } + "ALGR(US_M)": { + "key": "US_MICR", + "label": "µ", + } + "ALGR(US_COMM)": { + "key": "US_CCED", + "label": "Ç", + } + "ALGR(US_SLSH)": { + "key": "US_IQUE", + "label": "¿", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ ¹ │ │ │ £ │ │ │ │ │ │ │ │ ÷ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ ¦ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ § │ │ │ │ │ │ │ │ ° │ ¨ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ ¢ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(US_1))": { + "key": "US_SUP1", + "label": "¹", + } + "S(ALGR(US_4))": { + "key": "US_PND", + "label": "£", + } + "S(ALGR(US_EQL))": { + "key": "US_DIV", + "label": "÷", + } + "S(ALGR(US_BSLS))": { + "key": "US_BRKP", + "label": "¦", + } + "S(ALGR(US_S))": { + "key": "US_SECT", + "label": "§", + } + "S(ALGR(US_SCLN))": { + "key": "US_DEG", + "label": "°", + } + "S(ALGR(US_ACUT))": { + "key": "US_NDDR", + "label": "¨", + } + "S(ALGR(US_C))": { + "key": "US_CENT", + "label": "¢", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_us_international_linux_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_us_international_linux_0.0.1.hjson new file mode 100644 index 0000000000..d6bdf2e02d --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_us_international_linux_0.0.1.hjson @@ -0,0 +1,576 @@ +{ + "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": "US_DGRV", + "label": "` (dead)", + } + "KC_1": { + "key": "US_1", + "label": "1", + } + "KC_2": { + "key": "US_2", + "label": "2", + } + "KC_3": { + "key": "US_3", + "label": "3", + } + "KC_4": { + "key": "US_4", + "label": "4", + } + "KC_5": { + "key": "US_5", + "label": "5", + } + "KC_6": { + "key": "US_6", + "label": "6", + } + "KC_7": { + "key": "US_7", + "label": "7", + } + "KC_8": { + "key": "US_8", + "label": "8", + } + "KC_9": { + "key": "US_9", + "label": "9", + } + "KC_0": { + "key": "US_0", + "label": "0", + } + "KC_MINS": { + "key": "US_MINS", + "label": "-", + } + "KC_EQL": { + "key": "US_EQL", + "label": "=", + } + "KC_Q": { + "key": "US_Q", + "label": "Q", + } + "KC_W": { + "key": "US_W", + "label": "W", + } + "KC_E": { + "key": "US_E", + "label": "E", + } + "KC_R": { + "key": "US_R", + "label": "R", + } + "KC_T": { + "key": "US_T", + "label": "T", + } + "KC_Y": { + "key": "US_Y", + "label": "Y", + } + "KC_U": { + "key": "US_U", + "label": "U", + } + "KC_I": { + "key": "US_I", + "label": "I", + } + "KC_O": { + "key": "US_O", + "label": "O", + } + "KC_P": { + "key": "US_P", + "label": "P", + } + "KC_LBRC": { + "key": "US_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "US_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "US_BSLS", + "label": "\\", + } + "KC_A": { + "key": "US_A", + "label": "A", + } + "KC_S": { + "key": "US_S", + "label": "S", + } + "KC_D": { + "key": "US_D", + "label": "D", + } + "KC_F": { + "key": "US_F", + "label": "F", + } + "KC_G": { + "key": "US_G", + "label": "G", + } + "KC_H": { + "key": "US_H", + "label": "H", + } + "KC_J": { + "key": "US_J", + "label": "J", + } + "KC_K": { + "key": "US_K", + "label": "K", + } + "KC_L": { + "key": "US_L", + "label": "L", + } + "KC_SCLN": { + "key": "US_SCLN", + "label": ";", + } + "KC_QUOT": { + "key": "US_ACUT", + "label": "´ (dead)", + } + "KC_Z": { + "key": "US_Z", + "label": "Z", + } + "KC_X": { + "key": "US_X", + "label": "X", + } + "KC_C": { + "key": "US_C", + "label": "C", + } + "KC_V": { + "key": "US_V", + "label": "V", + } + "KC_B": { + "key": "US_B", + "label": "B", + } + "KC_N": { + "key": "US_N", + "label": "N", + } + "KC_M": { + "key": "US_M", + "label": "M", + } + "KC_COMM": { + "key": "US_COMM", + "label": ",", + } + "KC_DOT": { + "key": "US_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "US_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ ¨ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(US_DGRV)": { + "key": "US_DTIL", + "label": "~ (dead)", + } + "S(US_1)": { + "key": "US_EXLM", + "label": "!", + } + "S(US_2)": { + "key": "US_AT", + "label": "@", + } + "S(US_3)": { + "key": "US_HASH", + "label": "#", + } + "S(US_4)": { + "key": "US_DLR", + "label": "$", + } + "S(US_5)": { + "key": "US_PERC", + "label": "%", + } + "S(US_6)": { + "key": "US_DCIR", + "label": "^ (dead)", + } + "S(US_7)": { + "key": "US_AMPR", + "label": "&", + } + "S(US_8)": { + "key": "US_ASTR", + "label": "*", + } + "S(US_9)": { + "key": "US_LPRN", + "label": "(", + } + "S(US_0)": { + "key": "US_RPRN", + "label": ")", + } + "S(US_MINS)": { + "key": "US_UNDS", + "label": "_", + } + "S(US_EQL)": { + "key": "US_PLUS", + "label": "+", + } + "S(US_LBRC)": { + "key": "US_LCBR", + "label": "{", + } + "S(US_RBRC)": { + "key": "US_RCBR", + "label": "}", + } + "S(US_BSLS)": { + "key": "US_PIPE", + "label": "|", + } + "S(US_SCLN)": { + "key": "US_COLN", + "label": ":", + } + "S(US_ACUT)": { + "key": "US_DIAE", + "label": "¨ (dead)", + } + "S(US_COMM)": { + "key": "US_LABK", + "label": "<", + } + "S(US_DOT)": { + "key": "US_RABK", + "label": ">", + } + "S(US_SLSH)": { + "key": "US_QUES", + "label": "?", + } +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ ¡ │ ² │ ³ │ ¤ │ € │ ¼ │ ½ │ ¾ │ ‘ │ ’ │ ¥ │ × │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Ä │ Å │ É │ ® │ Þ │ Ü │ Ú │ Í │ Ó │ Ö │ « │ » │ ¬ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ Á │ ß │ Ð │ │ │ │ │ Œ │ Ø │ ¶ │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Æ │ │ © │ │ │ Ñ │ µ │ Ç │ ˙ │ ¿ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "ALGR(US_DGRV)": { + "key": "US_GRV", + "label": "`", + } + "ALGR(US_1)": { + "key": "US_IEXL", + "label": "¡", + } + "ALGR(US_2)": { + "key": "US_SUP2", + "label": "²", + } + "ALGR(US_3)": { + "key": "US_SUP3", + "label": "³", + } + "ALGR(US_4)": { + "key": "US_CURR", + "label": "¤", + } + "ALGR(US_5)": { + "key": "US_EURO", + "label": "€", + } + "ALGR(US_6)": { + "key": "US_QRTR", + "label": "¼", + } + "ALGR(US_7)": { + "key": "US_HALF", + "label": "½", + } + "ALGR(US_8)": { + "key": "US_TQTR", + "label": "¾", + } + "ALGR(US_9)": { + "key": "US_LSQU", + "label": "‘", + } + "ALGR(US_0)": { + "key": "US_RSQU", + "label": "’", + } + "ALGR(US_MINS)": { + "key": "US_YEN", + "label": "¥", + } + "ALGR(US_EQL)": { + "key": "US_MUL", + "label": "×", + } + "ALGR(US_Q)": { + "key": "US_ADIA", + "label": "Ä", + } + "ALGR(US_W)": { + "key": "US_ARNG", + "label": "Å", + } + "ALGR(US_E)": { + "key": "US_EACU", + "label": "É", + } + "ALGR(US_R)": { + "key": "US_REGD", + "label": "®", + } + "ALGR(US_T)": { + "key": "US_THRN", + "label": "Þ", + } + "ALGR(US_Y)": { + "key": "US_UDIA", + "label": "Ü", + } + "ALGR(US_U)": { + "key": "US_UACU", + "label": "Ú", + } + "ALGR(US_I)": { + "key": "US_IACU", + "label": "Í", + } + "ALGR(US_O)": { + "key": "US_OACU", + "label": "Ó", + } + "ALGR(US_P)": { + "key": "US_ODIA", + "label": "Ö", + } + "ALGR(US_LBRC)": { + "key": "US_LDAQ", + "label": "«", + } + "ALGR(US_RBRC)": { + "key": "US_RDAQ", + "label": "»", + } + "ALGR(US_BSLS)": { + "key": "US_NOT", + "label": "¬", + } + "ALGR(US_A)": { + "key": "US_AACU", + "label": "Á", + } + "ALGR(US_S)": { + "key": "US_SS", + "label": "ß", + } + "ALGR(US_D)": { + "key": "US_ETH", + "label": "Ð", + } + "ALGR(US_K)": { + "key": "US_OE", + "label": "Œ", + } + "ALGR(US_L)": { + "key": "US_OSTR", + "label": "Ø", + } + "ALGR(US_SCLN)": { + "key": "US_PILC", + "label": "¶", + } + "ALGR(US_ACUT)": { + "key": "US_QUOT", + "label": "'", + } + "ALGR(US_Z)": { + "key": "US_AE", + "label": "Æ", + } + "ALGR(US_C)": { + "key": "US_COPY", + "label": "©", + } + "ALGR(US_N)": { + "key": "US_NTIL", + "label": "Ñ", + } + "ALGR(US_M)": { + "key": "US_MICR", + "label": "µ", + } + "ALGR(US_COMM)": { + "key": "US_CCED", + "label": "Ç", + } + "ALGR(US_DOT)": { + "key": "US_DOTA", + "label": "˙ (dead)", + } + "ALGR(US_SLSH)": { + "key": "US_IQUE", + "label": "¿", + } +/* Shift+AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ¹ │ ˝ │ ¯ │ £ │ ¸ │ ^ │ ̛ │ ˛ │ ˘ │ ° │ ̣ │ ÷ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ “ │ ” │ ¦ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ § │ │ │ │ │ │ │ │ ° │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ ¢ │ │ │ │ │ │ ˇ │ ̉ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(ALGR(US_DGRV))": { + "key": "US_TILD", + "label": "~", + } + "S(ALGR(US_1))": { + "key": "US_SUP1", + "label": "¹", + } + "S(ALGR(US_2))": { + "key": "US_DACU", + "label": "˝ (dead)", + } + "S(ALGR(US_3))": { + "key": "US_MACR", + "label": "¯ (dead)", + } + "S(ALGR(US_4))": { + "key": "US_PND", + "label": "£", + } + "S(ALGR(US_5))": { + "key": "US_CEDL", + "label": "¸ (dead)", + } + "S(ALGR(US_6))": { + "key": "US_CIRC", + "label": "^", + } + "S(ALGR(US_7))": { + "key": "US_HORN", + "label": "̛ (dead)", + } + "S(ALGR(US_8))": { + "key": "US_OGON", + "label": "˛ (dead)", + } + "S(ALGR(US_9))": { + "key": "US_BREV", + "label": "˘ (dead)", + } + "S(ALGR(US_0))": { + "key": "US_RNGA", + "label": "° (dead)", + } + "S(ALGR(US_MINS))": { + "key": "US_DOTB", + "label": "̣ (dead)", + } + "S(ALGR(US_EQL))": { + "key": "US_DIV", + "label": "÷", + } + "S(ALGR(US_LBRC))": { + "key": "US_LDQU", + "label": "“", + } + "S(ALGR(US_RBRC))": { + "key": "US_RDQU", + "label": "”", + } + "S(ALGR(US_BSLS))": { + "key": "US_BRKP", + "label": "¦", + } + "S(ALGR(US_S))": { + "key": "US_SECT", + "label": "§", + } + "S(ALGR(US_SCLN))": { + "key": "US_DEG", + "label": "°", + } + "S(ALGR(US_ACUT))": { + "key": "US_DQUO", + "label": "\"", + } + "S(ALGR(US_C))": { + "key": "US_CENT", + "label": "¢", + } + "S(ALGR(US_DOT))": { + "key": "US_CARN", + "label": "ˇ (dead)", + } + "S(ALGR(US_SLSH))": { + "key": "US_HOKA", + "label": "̉ (dead)", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_workman_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_workman_0.0.1.hjson new file mode 100644 index 0000000000..27471a15e4 --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_workman_0.0.1.hjson @@ -0,0 +1,302 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ D │ R │ W │ B │ J │ F │ U │ P │ ; │ [ │ ] │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ A │ S │ H │ T │ G │ Y │ N │ E │ O │ I │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Z │ X │ M │ C │ V │ K │ L │ , │ . │ / │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "WK_GRV", + "label": "`", + } + "KC_1": { + "key": "WK_1", + "label": "1", + } + "KC_2": { + "key": "WK_2", + "label": "2", + } + "KC_3": { + "key": "WK_3", + "label": "3", + } + "KC_4": { + "key": "WK_4", + "label": "4", + } + "KC_5": { + "key": "WK_5", + "label": "5", + } + "KC_6": { + "key": "WK_6", + "label": "6", + } + "KC_7": { + "key": "WK_7", + "label": "7", + } + "KC_8": { + "key": "WK_8", + "label": "8", + } + "KC_9": { + "key": "WK_9", + "label": "9", + } + "KC_0": { + "key": "WK_0", + "label": "0", + } + "KC_MINS": { + "key": "WK_MINS", + "label": "-", + } + "KC_EQL": { + "key": "WK_EQL", + "label": "=", + } + "KC_Q": { + "key": "WK_Q", + "label": "Q", + } + "KC_W": { + "key": "WK_D", + "label": "D", + } + "KC_E": { + "key": "WK_R", + "label": "R", + } + "KC_R": { + "key": "WK_W", + "label": "W", + } + "KC_T": { + "key": "WK_B", + "label": "B", + } + "KC_Y": { + "key": "WK_J", + "label": "J", + } + "KC_U": { + "key": "WK_F", + "label": "F", + } + "KC_I": { + "key": "WK_U", + "label": "U", + } + "KC_O": { + "key": "WK_P", + "label": "P", + } + "KC_P": { + "key": "WK_SCLN", + "label": ";", + } + "KC_LBRC": { + "key": "WK_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "WK_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "WK_BSLS", + "label": "\\", + } + "KC_A": { + "key": "WK_A", + "label": "A", + } + "KC_S": { + "key": "WK_S", + "label": "S", + } + "KC_D": { + "key": "WK_H", + "label": "H", + } + "KC_F": { + "key": "WK_T", + "label": "T", + } + "KC_G": { + "key": "WK_G", + "label": "G", + } + "KC_H": { + "key": "WK_Y", + "label": "Y", + } + "KC_J": { + "key": "WK_N", + "label": "N", + } + "KC_K": { + "key": "WK_E", + "label": "E", + } + "KC_L": { + "key": "WK_O", + "label": "O", + } + "KC_SCLN": { + "key": "WK_I", + "label": "I", + } + "KC_QUOT": { + "key": "WK_QUOT", + "label": "'", + } + "KC_Z": { + "key": "WK_Z", + "label": "Z", + } + "KC_X": { + "key": "WK_X", + "label": "X", + } + "KC_C": { + "key": "WK_M", + "label": "M", + } + "KC_V": { + "key": "WK_C", + "label": "C", + } + "KC_B": { + "key": "WK_V", + "label": "V", + } + "KC_N": { + "key": "WK_K", + "label": "K", + } + "KC_M": { + "key": "WK_L", + "label": "L", + } + "KC_COMM": { + "key": "WK_COMM", + "label": ",", + } + "KC_DOT": { + "key": "WK_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "WK_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(WK_GRV)": { + "key": "WK_TILD", + "label": "~", + } + "S(WK_1)": { + "key": "WK_EXLM", + "label": "!", + } + "S(WK_2)": { + "key": "WK_AT", + "label": "@", + } + "S(WK_3)": { + "key": "WK_HASH", + "label": "#", + } + "S(WK_4)": { + "key": "WK_DLR", + "label": "$", + } + "S(WK_5)": { + "key": "WK_PERC", + "label": "%", + } + "S(WK_6)": { + "key": "WK_CIRC", + "label": "^", + } + "S(WK_7)": { + "key": "WK_AMPR", + "label": "&", + } + "S(WK_8)": { + "key": "WK_ASTR", + "label": "*", + } + "S(WK_9)": { + "key": "WK_LPRN", + "label": "(", + } + "S(WK_0)": { + "key": "WK_RPRN", + "label": ")", + } + "S(WK_MINS)": { + "key": "WK_UNDS", + "label": "_", + } + "S(WK_EQL)": { + "key": "WK_PLUS", + "label": "+", + } + "S(WK_SCLN)": { + "key": "WK_COLN", + "label": ":", + } + "S(WK_LBRC)": { + "key": "WK_LCBR", + "label": "{", + } + "S(WK_RBRC)": { + "key": "WK_RCBR", + "label": "}", + } + "S(WK_BSLS)": { + "key": "WK_PIPE", + "label": "|", + } + "S(WK_QUOT)": { + "key": "WK_DQUO", + "label": "\"", + } + "S(WK_COMM)": { + "key": "WK_LABK", + "label": "<", + } + "S(WK_DOT)": { + "key": "WK_RABK", + "label": ">", + } + "S(WK_SLSH)": { + "key": "WK_QUES", + "label": "?", + } + } +} \ No newline at end of file diff --git a/data/constants/keycodes/extras/keycodes_workman_zxcvm_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_workman_zxcvm_0.0.1.hjson new file mode 100644 index 0000000000..86f6a5bffb --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_workman_zxcvm_0.0.1.hjson @@ -0,0 +1,302 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ Q │ D │ R │ W │ B │ J │ F │ U │ P │ ; │ [ │ ] │ \ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ A │ S │ H │ T │ G │ Y │ N │ E │ O │ I │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ Z │ X │ C │ V │ M │ K │ L │ , │ . │ / │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "KC_GRV": { + "key": "WK_GRV", + "label": "`", + } + "KC_1": { + "key": "WK_1", + "label": "1", + } + "KC_2": { + "key": "WK_2", + "label": "2", + } + "KC_3": { + "key": "WK_3", + "label": "3", + } + "KC_4": { + "key": "WK_4", + "label": "4", + } + "KC_5": { + "key": "WK_5", + "label": "5", + } + "KC_6": { + "key": "WK_6", + "label": "6", + } + "KC_7": { + "key": "WK_7", + "label": "7", + } + "KC_8": { + "key": "WK_8", + "label": "8", + } + "KC_9": { + "key": "WK_9", + "label": "9", + } + "KC_0": { + "key": "WK_0", + "label": "0", + } + "KC_MINS": { + "key": "WK_MINS", + "label": "-", + } + "KC_EQL": { + "key": "WK_EQL", + "label": "=", + } + "KC_Q": { + "key": "WK_Q", + "label": "Q", + } + "KC_W": { + "key": "WK_D", + "label": "D", + } + "KC_E": { + "key": "WK_R", + "label": "R", + } + "KC_R": { + "key": "WK_W", + "label": "W", + } + "KC_T": { + "key": "WK_B", + "label": "B", + } + "KC_Y": { + "key": "WK_J", + "label": "J", + } + "KC_U": { + "key": "WK_F", + "label": "F", + } + "KC_I": { + "key": "WK_U", + "label": "U", + } + "KC_O": { + "key": "WK_P", + "label": "P", + } + "KC_P": { + "key": "WK_SCLN", + "label": ";", + } + "KC_LBRC": { + "key": "WK_LBRC", + "label": "[", + } + "KC_RBRC": { + "key": "WK_RBRC", + "label": "]", + } + "KC_BSLS": { + "key": "WK_BSLS", + "label": "\\", + } + "KC_A": { + "key": "WK_A", + "label": "A", + } + "KC_S": { + "key": "WK_S", + "label": "S", + } + "KC_D": { + "key": "WK_H", + "label": "H", + } + "KC_F": { + "key": "WK_T", + "label": "T", + } + "KC_G": { + "key": "WK_G", + "label": "G", + } + "KC_H": { + "key": "WK_Y", + "label": "Y", + } + "KC_J": { + "key": "WK_N", + "label": "N", + } + "KC_K": { + "key": "WK_E", + "label": "E", + } + "KC_L": { + "key": "WK_O", + "label": "O", + } + "KC_SCLN": { + "key": "WK_I", + "label": "I", + } + "KC_QUOT": { + "key": "WK_QUOT", + "label": "'", + } + "KC_Z": { + "key": "WK_Z", + "label": "Z", + } + "KC_X": { + "key": "WK_X", + "label": "X", + } + "KC_C": { + "key": "WK_C", + "label": "C", + } + "KC_V": { + "key": "WK_V", + "label": "V", + } + "KC_B": { + "key": "WK_M", + "label": "M", + } + "KC_N": { + "key": "WK_K", + "label": "K", + } + "KC_M": { + "key": "WK_L", + "label": "L", + } + "KC_COMM": { + "key": "WK_COMM", + "label": ",", + } + "KC_DOT": { + "key": "WK_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "WK_SLSH", + "label": "/", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ + "S(WK_GRV)": { + "key": "WK_TILD", + "label": "~", + } + "S(WK_1)": { + "key": "WK_EXLM", + "label": "!", + } + "S(WK_2)": { + "key": "WK_AT", + "label": "@", + } + "S(WK_3)": { + "key": "WK_HASH", + "label": "#", + } + "S(WK_4)": { + "key": "WK_DLR", + "label": "$", + } + "S(WK_5)": { + "key": "WK_PERC", + "label": "%", + } + "S(WK_6)": { + "key": "WK_CIRC", + "label": "^", + } + "S(WK_7)": { + "key": "WK_AMPR", + "label": "&", + } + "S(WK_8)": { + "key": "WK_ASTR", + "label": "*", + } + "S(WK_9)": { + "key": "WK_LPRN", + "label": "(", + } + "S(WK_0)": { + "key": "WK_RPRN", + "label": ")", + } + "S(WK_MINS)": { + "key": "WK_UNDS", + "label": "_", + } + "S(WK_EQL)": { + "key": "WK_PLUS", + "label": "+", + } + "S(WK_SCLN)": { + "key": "WK_COLN", + "label": ":", + } + "S(WK_LBRC)": { + "key": "WK_LCBR", + "label": "{", + } + "S(WK_RBRC)": { + "key": "WK_RCBR", + "label": "}", + } + "S(WK_BSLS)": { + "key": "WK_PIPE", + "label": "|", + } + "S(WK_QUOT)": { + "key": "WK_DQUO", + "label": "\"", + } + "S(WK_COMM)": { + "key": "WK_LABK", + "label": "<", + } + "S(WK_DOT)": { + "key": "WK_RABK", + "label": ">", + } + "S(WK_SLSH)": { + "key": "WK_QUES", + "label": "?", + } + } +} \ No newline at end of file diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py index cf80689708..2ed84cd589 100644 --- a/lib/python/qmk/cli/generate/keycodes.py +++ b/lib/python/qmk/cli/generate/keycodes.py @@ -91,9 +91,10 @@ def _generate_aliases(lines, keycodes): for key, value in keycodes["aliases"].items(): define = _render_key(value.get("key")) val = _render_key(key) - label = _render_label(value.get("label")) - - lines.append(f'#define {define} {val} // {label}') + if 'label' in value: + lines.append(f'#define {define} {val} // {_render_label(value.get("label"))}') + else: + lines.append(f'#define {define} {val}') lines.append('') for key, value in keycodes["aliases"].items(): diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h index 207905b291..235ebde30e 100644 --- a/quantum/keymap_extras/keymap_belgian.h +++ b/quantum/keymap_extras/keymap_belgian.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ² │ & │ é │ " │ ' │ ( │ § │ è │ ! │ ç │ à │ ) │ - │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ µ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ = │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define BE_SUP2 KC_GRV // ² #define BE_AMPR KC_1 // & #define BE_EACU KC_2 // é @@ -47,7 +41,6 @@ #define BE_AGRV KC_0 // à #define BE_RPRN KC_MINS // ) #define BE_MINS KC_EQL // - -// Row 2 #define BE_A KC_Q // A #define BE_Z KC_W // Z #define BE_E KC_E // E @@ -60,7 +53,6 @@ #define BE_P KC_P // P #define BE_DCIR KC_LBRC // ^ (dead) #define BE_DLR KC_RBRC // $ -// Row 3 #define BE_Q KC_A // Q #define BE_S KC_S // S #define BE_D KC_D // D @@ -73,7 +65,6 @@ #define BE_M KC_SCLN // M #define BE_UGRV KC_QUOT // ù #define BE_MICR KC_NUHS // µ -// Row 4 #define BE_LABK KC_NUBS // < #define BE_W KC_Z // W #define BE_X KC_X // X @@ -85,21 +76,6 @@ #define BE_SCLN KC_COMM // ; #define BE_COLN KC_DOT // : #define BE_EQL KC_SLSH // = - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ³ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ _ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ % │ £ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ ? │ . │ / │ + │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define BE_SUP3 S(BE_SUP2) // ³ #define BE_1 S(BE_AMPR) // 1 #define BE_2 S(BE_EACU) // 2 @@ -113,46 +89,25 @@ #define BE_0 S(BE_AGRV) // 0 #define BE_DEG S(BE_RPRN) // ° #define BE_UNDS S(BE_MINS) // _ -// Row 2 #define BE_DIAE S(BE_DCIR) // ¨ (dead) #define BE_ASTR S(BE_DLR) // * -// Row 3 #define BE_PERC S(BE_UGRV) // % #define BE_PND S(BE_MICR) // £ -// Row 4 #define BE_RABK S(BE_LABK) // > #define BE_QUES S(BE_COMM) // ? #define BE_DOT S(BE_SCLN) // . #define BE_SLSH S(BE_COLN) // / #define BE_PLUS S(BE_EQL) // + - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ | │ @ │ # │ │ │ ^ │ │ │ { │ } │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ´ │ ` │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ \ │ │ │ │ │ │ │ │ │ │ ~ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define BE_PIPE ALGR(BE_AMPR) // | #define BE_AT ALGR(BE_EACU) // @ #define BE_HASH ALGR(BE_DQUO) // # #define BE_CIRC ALGR(BE_SECT) // ^ #define BE_LCBR ALGR(BE_CCED) // { #define BE_RCBR ALGR(BE_AGRV) // } -// Row 2 #define BE_EURO ALGR(BE_E) // € #define BE_LBRC ALGR(BE_DCIR) // [ #define BE_RBRC ALGR(BE_DLR) // ] -// Row 3 #define BE_ACUT ALGR(BE_UGRV) // ´ (dead) #define BE_GRV ALGR(BE_MICR) // ` (dead) -// Row 4 #define BE_BSLS ALGR(BE_LABK) // (backslash) #define BE_TILD ALGR(BE_EQL) // ~ diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h index 6361823242..7dc2aa9095 100644 --- a/quantum/keymap_extras/keymap_bepo.h +++ b/quantum/keymap_extras/keymap_bepo.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ $ │ " │ « │ » │ ( │ ) │ @ │ + │ - │ / │ * │ = │ % │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ B │ É │ P │ O │ È │ ^ │ V │ D │ L │ J │ Z │ W │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ U │ I │ E │ , │ C │ T │ S │ R │ N │ M │ Ç │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ Ê │ À │ Y │ X │ . │ K │ ' │ Q │ G │ H │ F │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define BP_DLR KC_GRV // $ #define BP_DQUO KC_1 // " #define BP_LDAQ KC_2 // « @@ -47,7 +41,6 @@ #define BP_ASTR KC_0 // * #define BP_EQL KC_MINS // = #define BP_PERC KC_EQL // % -// Row 2 #define BP_B KC_Q // B #define BP_EACU KC_W // É #define BP_P KC_E // P @@ -60,7 +53,6 @@ #define BP_J KC_P // J #define BP_Z KC_LBRC // Z #define BP_W KC_RBRC // W -// Row 3 #define BP_A KC_A // A #define BP_U KC_S // U #define BP_I KC_D // I @@ -73,7 +65,6 @@ #define BP_N KC_SCLN // N #define BP_M KC_QUOT // M #define BP_CCED KC_BSLS // Ç -// Row 4 #define BP_ECIR KC_NUBS // Ê #define BP_AGRV KC_Z // À #define BP_Y KC_X // Y @@ -85,21 +76,6 @@ #define BP_G KC_COMM // G #define BP_H KC_DOT // H #define BP_F KC_SLSH // F - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ ! │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ ; │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ : │ │ ? │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define BP_HASH S(BP_DLR) // # #define BP_1 S(BP_DQUO) // 1 #define BP_2 S(BP_LDAQ) // 2 @@ -113,30 +89,11 @@ #define BP_0 S(BP_ASTR) // 0 #define BP_DEG S(BP_EQL) // ° #define BP_GRV S(BP_PERC) // ` -// Row 2 #define BP_EXLM S(BP_DCIR) // ! -// Row 3 #define BP_SCLN S(BP_COMM) // ; -// Row 4 #define BP_COLN S(BP_DOT) // : #define BP_QUES S(BP_QUOT) // ? -// Row 5 -#define BP_NBSP S(KC_SPC) //   (non-breaking space) - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ – │ — │ < │ > │ [ │ ] │ ^ │ ± │ − │ ÷ │ × │ ≠ │ ‰ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ | │ ´ │ & │ Œ │ ` │ ¡ │ ˇ │ Ð │ / │ IJ │ Ə │ ˘ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Æ │ Ù │ ¨ │ € │ │ © │ Þ │ ẞ │ ® │ ~ │ ¯ │ ¸ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ \ │ { │ } │ … │ ~ │ ¿ │ ° │ │ † │ ˛ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ _ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +#define BP_NBSP S(KC_SPC) // (non-breaking space) #define BP_NDSH ALGR(BP_DLR) // – #define BP_MDSH ALGR(BP_DQUO) // — #define BP_LABK ALGR(BP_LDAQ) // < @@ -150,7 +107,6 @@ #define BP_MUL ALGR(BP_ASTR) // × #define BP_NEQL ALGR(BP_EQL) // ≠ #define BP_PERM ALGR(BP_PERC) // ‰ -// Row 2 #define BP_PIPE ALGR(BP_B) // | #define BP_ACUT ALGR(BP_EACU) // ´ (dead) #define BP_AMPR ALGR(BP_P) // & @@ -163,7 +119,6 @@ #define BP_IJ ALGR(BP_J) // IJ #define BP_SCHW ALGR(BP_Z) // Ə #define BP_BREV ALGR(BP_W) // ˘ (dead) -// Row 3 #define BP_AE ALGR(BP_A) // Æ #define BP_UGRV ALGR(BP_U) // Ù #define BP_DIAE ALGR(BP_I) // ¨ (dead) @@ -175,7 +130,6 @@ #define BP_DTIL ALGR(BP_N) // ~ (dead) #define BP_MACR ALGR(BP_M) // ¯ (dead) #define BP_CEDL ALGR(BP_CCED) // ¸ (dead) -// Row 4 #define BP_BSLS ALGR(BP_AGRV) // (backslash) #define BP_LCBR ALGR(BP_Y) // { #define BP_RCBR ALGR(BP_X) // } @@ -186,23 +140,7 @@ #define BP_DGRK ALGR(BP_G) // µ (dead Greek key) #define BP_DAGG ALGR(BP_H) // † #define BP_OGON ALGR(BP_F) // ˛ (dead) -// Row 5 #define BP_UNDS ALGR(KC_SPC) // _ - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¶ │ „ │ “ │ ” │ ≤ │ ≥ │ │ ¬ │ ¼ │ ½ │ ¾ │ ′ │ ″ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ ¦ │ ˝ │ § │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ ˙ │ ¤ │ ̛ │ ſ │ │ │ ™ │ │ º │ , │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ ‘ │ ’ │ · │ ⌨ │ ̉ │ ̣ │ │ ‡ │ ª │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define BP_PARA S(ALGR(BP_DLR)) // ¶ #define BP_DLQU S(ALGR(BP_DQUO)) // „ #define BP_LDQU S(ALGR(BP_LDAQ)) // “ @@ -215,26 +153,22 @@ #define BP_TQTR S(ALGR(BP_ASTR)) // ¾ #define BP_PRIM S(ALGR(BP_EQL)) // ′ #define BP_DPRM S(ALGR(BP_PERC)) // ″ -// Row 2 #define BP_BRKP S(ALGR(BP_B)) // ¦ #define BP_DACU S(ALGR(BP_EACU)) // ˝ (dead) #define BP_SECT S(ALGR(BP_P)) // § -// Row 3 #define BP_DOTA S(ALGR(BP_I)) // ˙ (dead) #define BP_CURR S(ALGR(BP_E)) // ¤ (dead) -#define BP_HORN S(ALGR(BP_COMM)) // ̛ (dead) +#define BP_HORN S(ALGR(BP_COMM)) // ̛ (dead) #define BP_LNGS S(ALGR(BP_C)) // ſ #define BP_TM S(ALGR(BP_R)) // ™ #define BP_MORD S(ALGR(BP_M)) // º #define BP_DCMM S(ALGR(BP_CCED)) // , (dead) -// Row 4 #define BP_LSQU S(ALGR(BP_Y)) // ‘ #define BP_RSQU S(ALGR(BP_X)) // ’ #define BP_MDDT S(ALGR(BP_DOT)) // · #define BP_KEYB S(ALGR(BP_K)) // ⌨ -#define BP_HOKA S(ALGR(BP_QUOT)) // ̉ (dead) -#define BP_DOTB S(ALGR(BP_Q)) // ̣ (dead) +#define BP_HOKA S(ALGR(BP_QUOT)) // ̉ (dead) +#define BP_DOTB S(ALGR(BP_Q)) // ̣ (dead) #define BP_DDAG S(ALGR(BP_H)) // ‡ #define BP_FORD S(ALGR(BP_F)) // ª -// Row 5 -#define BP_NNBS S(ALGR(KC_SPC)) //   (narrow non-breaking space) +#define BP_NNBS S(ALGR(KC_SPC)) // (narrow non-breaking space) diff --git a/quantum/keymap_extras/keymap_brazilian_abnt2.h b/quantum/keymap_extras/keymap_brazilian_abnt2.h index b5892183be..64395bf017 100644 --- a/quantum/keymap_extras/keymap_brazilian_abnt2.h +++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h @@ -1,39 +1,33 @@ -/* Copyright 2017 Potiguar Faga - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ' │ 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 │ , │ . │ ; │ / │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define BR_QUOT KC_GRV // ' #define BR_1 KC_1 // 1 #define BR_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define BR_0 KC_0 // 0 #define BR_MINS KC_MINS // - #define BR_EQL KC_EQL // = -// Row 2 #define BR_Q KC_Q // Q #define BR_W KC_W // W #define BR_E KC_E // E @@ -60,7 +53,6 @@ #define BR_P KC_P // P #define BR_ACUT KC_LBRC // ´ (dead) #define BR_LBRC KC_RBRC // [ -// Row 3 #define BR_A KC_A // A #define BR_S KC_S // S #define BR_D KC_D // D @@ -73,7 +65,6 @@ #define BR_CCED KC_SCLN // Ç #define BR_TILD KC_QUOT // ~ (dead) #define BR_RBRC KC_BSLS // ] -// Row 4 #define BR_BSLS KC_NUBS // (backslash) #define BR_Z KC_Z // Z #define BR_X KC_X // X @@ -86,24 +77,8 @@ #define BR_DOT KC_DOT // . #define BR_SCLN KC_SLSH // ; #define BR_SLSH KC_INT1 // / -// Numpad #define BR_PDOT KC_PCMM // . #define BR_PCMM KC_PDOT // , - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ " │ ! │ @ │ # │ $ │ % │ ¨ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ` │ { │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ } │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ - * │ │ | │ │ │ │ │ │ │ │ < │ > │ : │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define BR_DQUO S(BR_QUOT) // " #define BR_EXLM S(BR_1) // ! #define BR_AT S(BR_2) // @ @@ -117,33 +92,15 @@ #define BR_RPRN S(BR_0) // ) #define BR_UNDS S(BR_MINS) // _ #define BR_PLUS S(BR_EQL) // + -// Row 2 #define BR_GRV S(BR_ACUT) // ` (dead) #define BR_LCBR S(BR_LBRC) // { -// Row 3 #define BR_CIRC S(BR_TILD) // ^ (dead) #define BR_RCBR S(BR_RBRC) // } -// Row 4 #define BR_PIPE S(BR_BSLS) // | #define BR_LABK S(BR_COMM) // < #define BR_RABK S(BR_DOT) // > #define BR_COLN S(BR_SCLN) // : #define BR_QUES S(BR_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ¹ │ ² │ ³ │ £ │ ¢ │ ¬ │ │ │ │ │ │ § │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ ° │ │ │ │ │ │ │ │ │ ª │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ º │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ - * │ │ │ │ │ ₢ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define BR_SUP1 ALGR(BR_1) // ¹ #define BR_SUP2 ALGR(BR_2) // ² #define BR_SUP3 ALGR(BR_3) // ³ @@ -151,10 +108,7 @@ #define BR_CENT ALGR(BR_5) // ¢ #define BR_NOT ALGR(BR_6) // ¬ #define BR_SECT ALGR(BR_EQL) // § -// Row 2 #define BR_DEG ALGR(BR_E) // ° #define BR_FORD ALGR(BR_LBRC) // ª -// Row 3 #define BR_MORD ALGR(BR_RBRC) // º -// Row 4 #define BR_CRUZ ALGR(BR_C) // ₢ diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h index e328cf65e6..1a7223644c 100644 --- a/quantum/keymap_extras/keymap_canadian_multilingual.h +++ b/quantum/keymap_extras/keymap_canadian_multilingual.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ / │ 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 │ , │ . │ É │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define CA_SLSH KC_GRV // / #define CA_1 KC_1 // 1 #define CA_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define CA_0 KC_0 // 0 #define CA_MINS KC_MINS // - #define CA_EQL KC_EQL // = -// Row 2 #define CA_Q KC_Q // Q #define CA_W KC_W // W #define CA_E KC_E // E @@ -60,7 +53,6 @@ #define CA_P KC_P // P #define CA_CIRC KC_LBRC // ^ (dead) #define CA_CCED KC_RBRC // Ç -// Row 3 #define CA_A KC_A // A #define CA_S KC_S // S #define CA_D KC_D // D @@ -73,7 +65,6 @@ #define CA_SCLN KC_SCLN // ; #define CA_EGRV KC_QUOT // É #define CA_AGRV KC_NUHS // À -// Row 4 #define CA_UGRV KC_NUBS // Ù #define CA_Z KC_Z // Z #define CA_X KC_X // X @@ -85,21 +76,6 @@ #define CA_COMM KC_COMM // , #define CA_DOT KC_DOT // . #define CA_EACU KC_SLSH // É - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ \ │ ! │ @ │ # │ $ │ % │ ? │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ : │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ ' │ " │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CA_BSLS S(CA_SLSH) // (backslash) #define CA_EXLM S(CA_1) // ! #define CA_AT S(CA_2) // @ @@ -113,28 +89,10 @@ #define CA_RPRN S(CA_0) // ) #define CA_UNDS S(CA_MINS) // _ #define CA_PLUS S(CA_EQL) // + -// Row 2 #define CA_DIAE S(CA_CIRC) // ¨ (dead) -// Row 3 #define CA_COLN S(CA_SCLN) // : -// Row 4 #define CA_QUOT S(CA_COMM) // ' #define CA_DQUO S(CA_DOT) // " - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ | │ │ │ │ ¤ │ │ │ { │ } │ [ │ ] │ │ ¬ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ ` │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ ° │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ « │ » │ │ │ │ │ │ < │ > │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CA_PIPE ALGR(CA_SLSH) // | #define CA_CURR ALGR(CA_4) // ¤ #define CA_LCBR ALGR(CA_7) // { @@ -142,32 +100,14 @@ #define CA_LBRC ALGR(CA_9) // [ #define CA_RBRC ALGR(CA_0) // ] #define CA_NOT ALGR(CA_EQL) // ¬ -// Row 2 #define CA_EURO ALGR(CA_E) // € #define CA_GRV ALGR(CA_CIRC) // ` (dead) #define CA_DTIL ALGR(CA_CCED) // ~ (dead) -// Row 3 #define CA_DEG ALGR(CA_SCLN) // ° -// Row 4 #define CA_LDAQ ALGR(CA_Z) // « #define CA_RDAQ ALGR(CA_X) // » #define CA_LABK ALGR(CA_COMM) // < #define CA_RABK ALGR(CA_DOT) // > - -/* Right Ctrl symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ¹ │ ² │ ³ │ ¼ │ ½ │ ¾ │ │ │ │ │ │ ¸ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Ω │ Ł │ Œ │ ¶ │ Ŧ │ ← │ ↓ │ → │ Ø │ Þ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Æ │ ß │ Ð │ │ Ŋ │ Ħ │ IJ │ ĸ │ Ŀ │ ´ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ ¢ │ “ │ ” │ ʼn │ μ │ ― │ ˙ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CA_SUP1 RCTL(CA_1) // ¹ #define CA_SUP2 RCTL(CA_2) // ² #define CA_SUP3 RCTL(CA_3) // ³ @@ -175,7 +115,6 @@ #define CA_HALF RCTL(CA_5) // ½ #define CA_TQTR RCTL(CA_6) // ¾ #define CA_CEDL RCTL(CA_EQL) // ¸ (dead) -// Row 2 #define CA_OMEG RCTL(CA_Q) // Ω #define CA_LSTR RCTL(CA_W) // Ł #define CA_OE RCTL(CA_E) // Œ @@ -187,7 +126,6 @@ #define CA_OSTR RCTL(CA_O) // Ø #define CA_THRN RCTL(CA_P) // Þ #define CA_TILD RCTL(CA_CCED) // ~ -// Row 3 #define CA_AE RCTL(CA_A) // Æ #define CA_SS RCTL(CA_S) // ß #define CA_ETH RCTL(CA_D) // Ð @@ -197,7 +135,6 @@ #define CA_KRA RCTL(CA_K) // ĸ #define CA_LMDT RCTL(CA_L) // Ŀ #define CA_ACUT RCTL(CA_SCLN) // ´ (dead) -// Row 4 #define CA_CENT RCTL(CA_C) // ¢ #define CA_LDQU RCTL(CA_V) // “ #define CA_RDQU RCTL(CA_B) // ” @@ -205,21 +142,6 @@ #define CA_MICR RCTL(CA_M) // μ #define CA_HRZB RCTL(CA_COMM) // ― #define CA_DOTA RCTL(CA_DOT) // ˙ (dead) - -/* Shift+Right Ctrl symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ - │ ¡ │ │ £ │ │ ⅜ │ ⅝ │ ⅞ │ ™ │ ± │ │ ¿ │ ˛ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ ® │ │ ¥ │ ↑ │ ı │ │ │ ° │ ¯ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ § │ │ ª │ │ │ │ │ │ ˝ │ ˇ │ ˘ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ ¦ │ │ │ © │ ‘ │ ’ │ ♪ │ º │ × │ ÷ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CA_SHYP RCTL(S(CA_SLSH)) // ­ (soft hyphen) #define CA_IEXL RCTL(S(CA_1)) // ¡ #define CA_PND RCTL(S(CA_3)) // £ @@ -230,20 +152,17 @@ #define CA_PLMN RCTL(S(CA_9)) // ± #define CA_IQUE RCTL(S(CA_MINS)) // ¿ #define CA_OGON RCTL(S(CA_EQL)) // ˛ (dead) -// Row 2 #define CA_REGD RCTL(S(CA_R)) // ® #define CA_YEN RCTL(S(CA_Y)) // ¥ #define CA_UARR RCTL(S(CA_U)) // ↑ #define CA_DLSI RCTL(S(CA_I)) // ı #define CA_RNGA RCTL(S(CA_CIRC)) // ° (dead) #define CA_MACR RCTL(S(CA_CCED)) // ¯ (dead) -// Row 3 #define CA_SECT RCTL(S(CA_S)) // § #define CA_FORD RCTL(S(CA_F)) // ª #define CA_DACU RCTL(S(CA_SCLN)) // ˝ (dead) #define CA_CARN RCTL(S(CA_EGRV)) // ˇ (dead) #define CA_BREV RCTL(S(CA_AGRV)) // ˘ (dead) -// Row 4 #define CA_BRKP RCTL(S(CA_UGRV)) // ¦ #define CA_COPY RCTL(S(CA_C)) // © #define CA_LSQU RCTL(S(CA_V)) // ‘ diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h index e7b5c97ccb..1363751ff1 100644 --- a/quantum/keymap_extras/keymap_colemak.h +++ b/quantum/keymap_extras/keymap_colemak.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ F │ P │ G │ J │ L │ U │ Y │ ; │ [ │ ] │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ A │ R │ S │ T │ D │ H │ N │ E │ I │ O │ ' │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Z │ X │ C │ V │ B │ K │ M │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define CM_GRV KC_GRV // ` #define CM_1 KC_1 // 1 #define CM_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define CM_0 KC_0 // 0 #define CM_MINS KC_MINS // - #define CM_EQL KC_EQL // = -// Row 2 #define CM_Q KC_Q // Q #define CM_W KC_W // W #define CM_F KC_E // F @@ -61,7 +54,6 @@ #define CM_LBRC KC_LBRC // [ #define CM_RBRC KC_RBRC // ] #define CM_BSLS KC_BSLS // (backslash) -// Row 3 #define CM_A KC_A // A #define CM_R KC_S // R #define CM_S KC_D // S @@ -73,7 +65,6 @@ #define CM_I KC_L // I #define CM_O KC_SCLN // O #define CM_QUOT KC_QUOT // ' -// Row 4 #define CM_Z KC_Z // Z #define CM_X KC_X // X #define CM_C KC_C // C @@ -84,21 +75,6 @@ #define CM_COMM KC_COMM // , #define CM_DOT KC_DOT // . #define CM_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CM_TILD S(CM_GRV) // ~ #define CM_EXLM S(CM_1) // ! #define CM_AT S(CM_2) // @ @@ -112,14 +88,11 @@ #define CM_RPRN S(CM_0) // ) #define CM_UNDS S(CM_MINS) // _ #define CM_PLUS S(CM_EQL) // + -// Row 2 #define CM_COLN S(CM_SCLN) // : #define CM_LCBR S(CM_LBRC) // { #define CM_RCBR S(CM_RBRC) // } #define CM_PIPE S(CM_BSLS) // | -// Row 3 #define CM_DQUO S(CM_QUOT) // " -// Row 4 #define CM_LABK S(CM_COMM) // < #define CM_RABK S(CM_DOT) // > #define CM_QUES S(CM_SLSH) // ? diff --git a/quantum/keymap_extras/keymap_croatian.h b/quantum/keymap_extras/keymap_croatian.h index e67b99a9a2..3151d4cffb 100644 --- a/quantum/keymap_extras/keymap_croatian.h +++ b/quantum/keymap_extras/keymap_croatian.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¸ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define HR_CEDL KC_GRV // ¸ (dead) #define HR_1 KC_1 // 1 #define HR_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define HR_0 KC_0 // 0 #define HR_QUOT KC_MINS // ' #define HR_PLUS KC_EQL // + -// Row 2 #define HR_Q KC_Q // Q #define HR_W KC_W // W #define HR_E KC_E // E @@ -60,7 +53,6 @@ #define HR_P KC_P // P #define HR_SCAR KC_LBRC // Š #define HR_DSTR KC_RBRC // Đ -// Row 3 #define HR_A KC_A // A #define HR_S KC_S // S #define HR_D KC_D // D @@ -73,7 +65,6 @@ #define HR_CCAR KC_SCLN // Č #define HR_CACU KC_QUOT // Ć #define HR_ZCAR KC_NUHS // Ž -// Row 4 #define HR_LABK KC_NUBS // < #define HR_Y KC_Z // Y #define HR_X KC_X // X @@ -85,21 +76,6 @@ #define HR_COMM KC_COMM // , #define HR_DOT KC_DOT // . #define HR_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define HR_DIAE S(HR_CEDL) // ¨ (dead) #define HR_EXLM S(HR_1) // ! #define HR_DQUO S(HR_2) // " @@ -113,26 +89,10 @@ #define HR_EQL S(HR_0) // = #define HR_QUES S(HR_QUOT) // ? #define HR_ASTR S(HR_PLUS) // * -// Row 4 #define HR_RABK S(HR_LABK) // > #define HR_SCLN S(HR_COMM) // ; #define HR_COLN S(HR_DOT) // : #define HR_UNDS S(HR_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define HR_TILD ALGR(HR_1) // ~ #define HR_CARN ALGR(HR_2) // ˇ (dead) #define HR_CIRC ALGR(HR_3) // ^ (dead) @@ -143,20 +103,17 @@ #define HR_DOTA ALGR(HR_8) // ˙ (dead) #define HR_ACUT ALGR(HR_9) // ´ (dead) #define HR_DACU ALGR(HR_0) // ˝ (dead) -// Row 2 #define HR_BSLS ALGR(HR_Q) // (backslash) #define HR_PIPE ALGR(HR_W) // | #define HR_EURO ALGR(HR_E) // € #define HR_DIV ALGR(HR_SCAR) // ÷ #define HR_MUL ALGR(HR_DSTR) // × -// Row 3 #define HR_LBRC ALGR(HR_F) // [ #define HR_RBRC ALGR(HR_G) // ] #define HR_LLST ALGR(HR_K) // ł #define HR_CLST ALGR(HR_L) // Ł #define HR_SS ALGR(HR_CACU) // ß #define HR_CURR ALGR(HR_ZCAR) // ¤ -// Row 4 #define HR_AT ALGR(HR_V) // @ #define HR_LCBR ALGR(HR_B) // { #define HR_RCBR ALGR(HR_N) // } diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h index a8f522d31c..dadfc9c59b 100644 --- a/quantum/keymap_extras/keymap_czech.h +++ b/quantum/keymap_extras/keymap_czech.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ; │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ´ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define CZ_SCLN KC_GRV // ; #define CZ_PLUS KC_1 // + #define CZ_ECAR KC_2 // ě @@ -47,7 +41,6 @@ #define CZ_EACU KC_0 // é #define CZ_EQL KC_MINS // = #define CZ_ACUT KC_EQL // ´ (dead) -// Row 2 #define CZ_Q KC_Q // Q #define CZ_W KC_W // W #define CZ_E KC_E // E @@ -60,7 +53,6 @@ #define CZ_P KC_P // P #define CZ_UACU KC_LBRC // ú #define CZ_RPRN KC_RBRC // ) -// Row 3 #define CZ_A KC_A // A #define CZ_S KC_S // S #define CZ_D KC_D // D @@ -73,7 +65,6 @@ #define CZ_URNG KC_SCLN // ů #define CZ_SECT KC_QUOT // § #define CZ_DIAE KC_NUHS // ¨ (dead) -// Row 4 #define CZ_BSLS KC_NUBS // (backslash) #define CZ_Y KC_Z // Y #define CZ_X KC_X // X @@ -85,21 +76,6 @@ #define CZ_COMM KC_COMM // , #define CZ_DOT KC_DOT // . #define CZ_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ " │ ! │ ' │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ │ ? │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CZ_RNGA S(CZ_SCLN) // ° (dead) #define CZ_1 S(CZ_PLUS) // 1 #define CZ_2 S(CZ_ECAR) // 2 @@ -113,33 +89,15 @@ #define CZ_0 S(CZ_EACU) // 0 #define CZ_PERC S(CZ_EQL) // % #define CZ_CARN S(CZ_ACUT) // ˇ (dead) -// Row 2 #define CZ_SLSH S(CZ_UACU) // / #define CZ_LPRN S(CZ_RPRN) // ( -// Row 3 #define CZ_DQUO S(CZ_URNG) // " #define CZ_EXLM S(CZ_SECT) // ! #define CZ_QUOT S(CZ_DIAE) // ' -// Row 4 #define CZ_PIPE S(CZ_BSLS) // | #define CZ_QUES S(CZ_COMM) // ? #define CZ_COLN S(CZ_DOT) // : #define CZ_UNDS S(CZ_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ~ │ │ ^ │ ˘ │ │ ˛ │ ` │ ˙ │ │ ˝ │ │ ¸ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ # │ & │ @ │ { │ } │ │ < │ > │ * │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CZ_TILD ALGR(CZ_PLUS) // ~ #define CZ_CIRC ALGR(CZ_SCAR) // ^ (dead) #define CZ_BREV ALGR(CZ_CCAR) // ˘ (dead) @@ -148,11 +106,9 @@ #define CZ_DOTA ALGR(CZ_AACU) // ˙ (dead) #define CZ_DACU ALGR(CZ_EACU) // ˝ (dead) #define CZ_CEDL ALGR(CZ_ACUT) // ¸ (dead) -// Row 2 #define CZ_EURO ALGR(CZ_E) // € #define CZ_DIV ALGR(CZ_UACU) // ÷ #define CZ_MUL ALGR(CZ_RPRN) // × -// Row 3 #define CZ_LDST ALGR(CZ_S) // đ #define CZ_CDST ALGR(CZ_D) // Đ #define CZ_LBRC ALGR(CZ_F) // [ @@ -162,7 +118,6 @@ #define CZ_DLR ALGR(CZ_URNG) // $ #define CZ_SS ALGR(CZ_SECT) // ß #define CZ_CURR ALGR(CZ_DIAE) // ¤ -// Row 4 #define CZ_HASH ALGR(CZ_X) // # #define CZ_AMPR ALGR(CZ_C) // & #define CZ_AT ALGR(CZ_V) // @ diff --git a/quantum/keymap_extras/keymap_danish.h b/quantum/keymap_extras/keymap_danish.h index 9cf688d6f5..de45c4e864 100644 --- a/quantum/keymap_extras/keymap_danish.h +++ b/quantum/keymap_extras/keymap_danish.h @@ -1,39 +1,33 @@ -/* Copyright 2019 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ½ │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define DK_HALF KC_GRV // ½ #define DK_1 KC_1 // 1 #define DK_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define DK_0 KC_0 // 0 #define DK_PLUS KC_MINS // + #define DK_ACUT KC_EQL // ´ (dead) -// Row 2 #define DK_Q KC_Q // Q #define DK_W KC_W // W #define DK_E KC_E // E @@ -60,7 +53,6 @@ #define DK_P KC_P // P #define DK_ARNG KC_LBRC // Å #define DK_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define DK_A KC_A // A #define DK_S KC_S // S #define DK_D KC_D // D @@ -73,7 +65,6 @@ #define DK_AE KC_SCLN // Æ #define DK_OSTR KC_QUOT // Ø #define DK_QUOT KC_NUHS // ' -// Row 4 #define DK_LABK KC_NUBS // < #define DK_Z KC_Z // Z #define DK_X KC_X // X @@ -85,21 +76,6 @@ #define DK_COMM KC_COMM // , #define DK_DOT KC_DOT // . #define DK_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DK_SECT S(DK_HALF) // § #define DK_EXLM S(DK_1) // ! #define DK_DQUO S(DK_2) // " @@ -113,30 +89,12 @@ #define DK_EQL S(DK_0) // = #define DK_QUES S(DK_PLUS) // ? #define DK_GRV S(DK_ACUT) // ` (dead) -// Row 2 #define DK_CIRC S(DK_DIAE) // ^ (dead) -// Row 3 #define DK_ASTR S(DK_QUOT) // * -// Row 4 #define DK_RABK S(DK_LABK) // > #define DK_SCLN S(DK_COMM) // ; #define DK_COLN S(DK_DOT) // : #define DK_UNDS S(DK_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ │ | │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ \ │ │ │ │ │ │ │ µ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DK_AT ALGR(DK_2) // @ #define DK_PND ALGR(DK_3) // £ #define DK_DLR ALGR(DK_4) // $ @@ -146,8 +104,6 @@ #define DK_RBRC ALGR(DK_9) // ] #define DK_RCBR ALGR(DK_0) // } #define DK_PIPE ALGR(DK_ACUT) // | -// Row 2 #define DK_TILD ALGR(DK_DIAE) // ~ (dead) -// Row 4 #define DK_BSLS ALGR(DK_LABK) // (backslash) #define DK_MICR ALGR(DK_M) // µ diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h index 7aa112ebcc..83fd59a6f9 100644 --- a/quantum/keymap_extras/keymap_dvorak.h +++ b/quantum/keymap_extras/keymap_dvorak.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ [ │ ] │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ ; │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define DV_GRV KC_GRV // ` #define DV_1 KC_1 // 1 #define DV_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define DV_0 KC_0 // 0 #define DV_LBRC KC_MINS // [ #define DV_RBRC KC_EQL // ] -// Row 2 #define DV_QUOT KC_Q // ' #define DV_COMM KC_W // , #define DV_DOT KC_E // . @@ -61,7 +54,6 @@ #define DV_SLSH KC_LBRC // / #define DV_EQL KC_RBRC // = #define DV_BSLS KC_BSLS // (backslash) -// Row 3 #define DV_A KC_A // A #define DV_O KC_S // O #define DV_E KC_D // E @@ -73,7 +65,6 @@ #define DV_N KC_L // N #define DV_S KC_SCLN // S #define DV_MINS KC_QUOT // - -// Row 4 #define DV_SCLN KC_Z // ; #define DV_Q KC_X // Q #define DV_J KC_C // J @@ -84,21 +75,6 @@ #define DV_W KC_COMM // W #define DV_V KC_DOT // V #define DV_Z KC_SLSH // Z - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ { │ } │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ " │ < │ > │ │ │ │ │ │ │ │ ? │ + │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ _ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ : │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DV_TILD S(DV_GRV) // ~ #define DV_EXLM S(DV_1) // ! #define DV_AT S(DV_2) // @ @@ -112,14 +88,11 @@ #define DV_RPRN S(DV_0) // ) #define DV_LCBR S(DV_LBRC) // { #define DV_RCBR S(DV_RBRC) // } -// Row 2 #define DV_DQUO S(DV_QUOT) // " #define DV_LABK S(DV_COMM) // < #define DV_RABK S(DV_DOT) // > #define DV_QUES S(DV_SLSH) // ? #define DV_PLUS S(DV_EQL) // + #define DV_PIPE S(DV_BSLS) // | -// Row 3 #define DV_UNDS S(DV_MINS) // _ -// Row 4 #define DV_COLN S(DV_SCLN) // : diff --git a/quantum/keymap_extras/keymap_dvorak_fr.h b/quantum/keymap_extras/keymap_dvorak_fr.h index 2dee8e32e7..a305e7bf09 100644 --- a/quantum/keymap_extras/keymap_dvorak_fr.h +++ b/quantum/keymap_extras/keymap_dvorak_fr.h @@ -1,47 +1,33 @@ -/* Copyright 2020 Guillaume Gérard - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -/* Dvorak for the French language - * Version: 2 - * - * The layout is designed by Francis Leboutte - * - * Source: https://algo.be/ergo/dvorak-fr.html - */ +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ #pragma once - #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ « │ » │ / │ - │ è │ \ │ ^ │ ( │ ` │ ) │ _ │ [ │ ] │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ : │ ' │ é │ G │ . │ H │ V │ C │ M │ K │ Z │ ¨ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ O │ A │ U │ E │ B │ F │ S │ T │ N │ D │ W │ ~ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ à │ ; │ Q │ , │ I │ Y │ X │ R │ L │ P │ J │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define DV_LDAQ KC_GRV // « #define DV_RDAQ KC_1 // » #define DV_SLSH KC_2 // / @@ -55,7 +41,6 @@ #define DV_UNDS KC_0 // _ #define DV_LBRC KC_MINS // [ #define DV_RBRC KC_EQL // ] -// Row 2 #define DV_COLN KC_Q // : #define DV_QUOT KC_W // ' #define DV_EACU KC_E // é @@ -68,7 +53,6 @@ #define DV_K KC_P // K #define DV_Z KC_LBRC // Z #define DV_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define DV_O KC_A // O #define DV_A KC_S // A #define DV_U KC_D // U @@ -81,7 +65,6 @@ #define DV_D KC_SCLN // D #define DV_W KC_QUOT // W #define DV_TILD KC_NUHS // ~ (dead) -// Row 4 #define DV_AGRV KC_NUBS // à #define DV_SCLN KC_Z // ; #define DV_Q KC_X // Q @@ -93,21 +76,6 @@ #define DV_L KC_COMM // L #define DV_P KC_DOT // P #define DV_J KC_SLSH // J - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ * │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 0 │ 0 │ + │ % │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ ? │ < │ > │ │ ! │ │ │ │ │ │ │ = │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ # │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ ç │ | │ │ @ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DV_ASTR S(DV_LDAQ) // * #define DV_1 S(DV_RDAQ) // 1 #define DV_2 S(DV_SLSH) // 2 @@ -121,15 +89,12 @@ #define DV_0 S(DV_UNDS) // 0 #define DV_PLUS S(DV_LBRC) // + #define DV_PERC S(DV_RBRC) // % -// Row 2 #define DV_QUES S(DV_COLN) // ? #define DV_LABK S(DV_QUOT) // < #define DV_RABK S(DV_EACU) // > #define DV_EXLM S(DV_DOT) // ! #define DV_EQL S(DV_DIAE) // = -// Row 3 #define DV_HASH S(DV_TILD) // # -// Row 4 #define DV_CCED S(DV_AGRV) // ç #define DV_PIPE S(DV_SCLN) // | #define DV_AT S(DV_COMM) // @ diff --git a/quantum/keymap_extras/keymap_dvorak_programmer.h b/quantum/keymap_extras/keymap_dvorak_programmer.h index 6de7033cb4..b6e754e3d0 100644 --- a/quantum/keymap_extras/keymap_dvorak_programmer.h +++ b/quantum/keymap_extras/keymap_dvorak_programmer.h @@ -1,39 +1,33 @@ -/* Copyright 2016 Artyom Mironov - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ $ │ & │ [ │ { │ } │ ( │ = │ * │ ) │ + │ ] │ ! │ # │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ ; │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ @ │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ ' │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define DP_DLR KC_GRV // $ #define DP_AMPR KC_1 // & #define DP_LBRC KC_2 // [ @@ -47,7 +41,6 @@ #define DP_RBRC KC_0 // ] #define DP_EXLM KC_MINS // ! #define DP_HASH KC_EQL // # -// Row 2 #define DP_SCLN KC_Q // ; #define DP_COMM KC_W // , #define DP_DOT KC_E // . @@ -61,7 +54,6 @@ #define DP_SLSH KC_LBRC // / #define DP_AT KC_RBRC // @ #define DP_BSLS KC_BSLS // (backslash) -// Row 3 #define DP_A KC_A // A #define DP_O KC_S // O #define DP_E KC_D // E @@ -73,7 +65,6 @@ #define DP_N KC_L // N #define DP_S KC_SCLN // S #define DP_MINS KC_QUOT // - -// Row 4 #define DP_QUOT KC_Z // ' #define DP_Q KC_X // Q #define DP_J KC_C // J @@ -84,21 +75,6 @@ #define DP_W KC_COMM // W #define DP_V KC_DOT // V #define DP_Z KC_SLSH // Z - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ % │ 7 │ 5 │ 3 │ 1 │ 9 │ 0 │ 2 │ 4 │ 6 │ 8 │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ : │ < │ > │ │ │ │ │ │ │ │ ? │ ^ │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ _ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ " │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DP_TILD S(DP_DLR) // ~ #define DP_PERC S(DP_AMPR) // % #define DP_7 S(DP_LBRC) // 7 @@ -112,14 +88,11 @@ #define DP_6 S(DP_RBRC) // 6 #define DP_8 S(DP_EXLM) // 8 #define DP_GRV S(DP_HASH) // ` -// Row 2 #define DP_COLN S(DP_SCLN) // : #define DP_LABK S(DP_COMM) // < #define DP_RABK S(DP_DOT) // > #define DP_QUES S(DP_SLSH) // ? #define DP_CIRC S(DP_AT) // ^ #define DP_PIPE S(DP_BSLS) // | -// Row 3 #define DP_UNDS S(DP_MINS) // _ -// Row 4 #define DP_DQUO S(DP_QUOT) // " diff --git a/quantum/keymap_extras/keymap_estonian.h b/quantum/keymap_extras/keymap_estonian.h index 6951baed5a..b59ecc3351 100644 --- a/quantum/keymap_extras/keymap_estonian.h +++ b/quantum/keymap_extras/keymap_estonian.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ˇ │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define EE_CARN KC_GRV // ˇ (dead) #define EE_1 KC_1 // 1 #define EE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define EE_0 KC_0 // 0 #define EE_PLUS KC_MINS // + #define EE_ACUT KC_EQL // ´ (dead) -// Row 2 #define EE_Q KC_Q // Q #define EE_W KC_W // W #define EE_E KC_E // E @@ -60,7 +53,6 @@ #define EE_P KC_P // P #define EE_UDIA KC_LBRC // Ü #define EE_OTIL KC_RBRC // Õ -// Row 3 #define EE_A KC_A // A #define EE_S KC_S // S #define EE_D KC_D // D @@ -73,7 +65,6 @@ #define EE_ODIA KC_SCLN // Ö #define EE_ADIA KC_QUOT // Ä #define EE_QUOT KC_NUHS // ' -// Row 4 #define EE_LABK KC_NUBS // < #define EE_Z KC_Z // Z #define EE_X KC_X // X @@ -85,21 +76,6 @@ #define EE_COMM KC_COMM // , #define EE_DOT KC_DOT // . #define EE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define EE_TILD S(EE_CARN) // ~ (dead) #define EE_EXLM S(EE_1) // ! #define EE_DQUO S(EE_2) // " @@ -113,28 +89,11 @@ #define EE_EQL S(EE_0) // = #define EE_QUES S(EE_PLUS) // ? #define EE_GRV S(EE_ACUT) // ` (dead) -// Row 3 #define EE_ASTR S(EE_QUOT) // * -// Row 4 #define EE_RABK S(EE_LABK) // > #define EE_SCLN S(EE_COMM) // ; #define EE_COLN S(EE_DOT) // : #define EE_UNDS S(EE_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ \ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ § │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ š │ │ │ │ │ │ │ │ │ ^ │ ½ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ ž │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define EE_AT ALGR(EE_2) // @ #define EE_PND ALGR(EE_3) // £ #define EE_DLR ALGR(EE_4) // $ @@ -144,12 +103,9 @@ #define EE_RBRC ALGR(EE_9) // ] #define EE_RCBR ALGR(EE_0) // } #define EE_BSLS ALGR(EE_PLUS) // (backslash) -// Row 2 #define EE_SECT ALGR(EE_OTIL) // § -// Row 3 #define EE_SCAR ALGR(EE_S) // š #define EE_CIRC ALGR(EE_ADIA) // ^ (dead) #define EE_HALF ALGR(EE_QUOT) // ½ -// Row 4 #define EE_PIPE ALGR(EE_LABK) // | #define EE_ZCAR ALGR(EE_Z) // ž diff --git a/quantum/keymap_extras/keymap_finnish.h b/quantum/keymap_extras/keymap_finnish.h index faca4e01d4..6d9cd09868 100644 --- a/quantum/keymap_extras/keymap_finnish.h +++ b/quantum/keymap_extras/keymap_finnish.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define FI_SECT KC_GRV // § #define FI_1 KC_1 // 1 #define FI_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define FI_0 KC_0 // 0 #define FI_PLUS KC_MINS // + #define FI_ACUT KC_EQL // ´ (dead) -// Row 2 #define FI_Q KC_Q // Q #define FI_W KC_W // W #define FI_E KC_E // E @@ -60,7 +53,6 @@ #define FI_P KC_P // P #define FI_ARNG KC_LBRC // Å #define FI_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define FI_A KC_A // A #define FI_S KC_S // S #define FI_D KC_D // D @@ -73,7 +65,6 @@ #define FI_ODIA KC_SCLN // Ö #define FI_ADIA KC_QUOT // Ä #define FI_QUOT KC_NUHS // ' -// Row 4 #define FI_LABK KC_NUBS // < #define FI_Z KC_Z // Z #define FI_X KC_X // X @@ -85,21 +76,6 @@ #define FI_COMM KC_COMM // , #define FI_DOT KC_DOT // . #define FI_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ½ │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define FI_HALF S(FI_SECT) // ½ #define FI_EXLM S(FI_1) // ! #define FI_DQUO S(FI_2) // " @@ -113,30 +89,12 @@ #define FI_EQL S(FI_0) // = #define FI_QUES S(FI_PLUS) // ? #define FI_GRV S(FI_ACUT) // ` (dead) -// Row 2 #define FI_CIRC S(FI_DIAE) // ^ (dead) -// Row 3 #define FI_ASTR S(FI_QUOT) // * -// Row 4 #define FI_RABK S(FI_LABK) // > #define FI_SCLN S(FI_COMM) // ; #define FI_COLN S(FI_DOT) // : #define FI_UNDS S(FI_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ \ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define FI_AT ALGR(FI_2) // @ #define FI_PND ALGR(FI_3) // £ #define FI_DLR ALGR(FI_4) // $ @@ -146,8 +104,6 @@ #define FI_RBRC ALGR(FI_9) // ] #define FI_RCBR ALGR(FI_0) // } #define FI_BSLS ALGR(FI_PLUS) // (backslash) -// Row 2 #define FI_TILD ALGR(FI_DIAE) // ~ (dead) -// Row 4 #define FI_PIPE ALGR(FI_LABK) // | #define FI_MICR ALGR(FI_M) // µ diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h index 0be53f0a9c..b08cee68ad 100644 --- a/quantum/keymap_extras/keymap_french.h +++ b/quantum/keymap_extras/keymap_french.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ² │ & │ é │ " │ ' │ ( │ - │ è │ _ │ ç │ à │ ) │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ ! │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define FR_SUP2 KC_GRV // ² #define FR_AMPR KC_1 // & #define FR_EACU KC_2 // é @@ -47,7 +41,6 @@ #define FR_AGRV KC_0 // à #define FR_RPRN KC_MINS // ) #define FR_EQL KC_EQL // = -// Row 2 #define FR_A KC_Q // A #define FR_Z KC_W // Z #define FR_E KC_E // E @@ -60,7 +53,6 @@ #define FR_P KC_P // P #define FR_CIRC KC_LBRC // ^ (dead) #define FR_DLR KC_RBRC // $ -// Row 3 #define FR_Q KC_A // Q #define FR_S KC_S // S #define FR_D KC_D // D @@ -73,7 +65,6 @@ #define FR_M KC_SCLN // M #define FR_UGRV KC_QUOT // ù #define FR_ASTR KC_NUHS // * -// Row 4 #define FR_LABK KC_NUBS // < #define FR_W KC_Z // W #define FR_X KC_X // X @@ -85,21 +76,6 @@ #define FR_SCLN KC_COMM // ; #define FR_COLN KC_DOT // : #define FR_EXLM KC_SLSH // ! - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ £ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ % │ µ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ ? │ . │ / │ § │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define FR_1 S(FR_AMPR) // 1 #define FR_2 S(FR_EACU) // 2 #define FR_3 S(FR_DQUO) // 3 @@ -112,33 +88,15 @@ #define FR_0 S(FR_AGRV) // 0 #define FR_DEG S(FR_RPRN) // ° #define FR_PLUS S(FR_EQL) // + -// Row 2 #define FR_DIAE S(FR_CIRC) // ¨ (dead) #define FR_PND S(FR_DLR) // £ -// Row 3 #define FR_PERC S(FR_UGRV) // % #define FR_MICR S(FR_ASTR) // µ -// Row 4 #define FR_RABK S(FR_LABK) // > #define FR_QUES S(FR_COMM) // ? #define FR_DOT S(FR_SCLN) // . #define FR_SLSH S(FR_COLN) // / #define FR_SECT S(FR_EXLM) // § - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ ~ │ # │ { │ [ │ | │ ` │ \ │ │ @ │ ] │ } │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ │ ¤ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define FR_TILD ALGR(FR_EACU) // ~ (dead) #define FR_HASH ALGR(FR_DQUO) // # #define FR_LCBR ALGR(FR_QUOT) // { @@ -149,6 +107,5 @@ #define FR_AT ALGR(FR_AGRV) // @ #define FR_RBRC ALGR(FR_RPRN) // ] #define FR_RCBR ALGR(FR_EQL) // } -// Row 2 -#define FR_EURO ALGR(KC_E) // € -#define FR_CURR ALGR(FR_DLR) // ¤ +#define FR_EURO ALGR(KC_E) // € +#define FR_CURR ALGR(FR_DLR) // ¤ diff --git a/quantum/keymap_extras/keymap_french_afnor.h b/quantum/keymap_extras/keymap_french_afnor.h index 4b7961724f..46f64bfb98 100644 --- a/quantum/keymap_extras/keymap_french_afnor.h +++ b/quantum/keymap_extras/keymap_french_afnor.h @@ -1,63 +1,33 @@ -/* Copyright 2020 Guillaume Gérard - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -/* French AZERTY - AFNOR NF Z71-300 - * - * A standard for the French keyboard - * - * The project was launched at the end of 2015 on the proposal of the General - * Delegation for the French language and the languages of France (Ministry - * of Culture), starting from the observation that the current "azerty" - * keyboards constrain the writing of French, languages regional and European - * languages with Latin alphabet. - * - * For the first time, a standard (NF Z71-300) defines the placement of - * characters on the French keyboard. It offers two layouts, one of which - * closely follows the QWERTY keyboard used by most people who write in French. - * - * However, it is in many ways superior to the old keyboard: - * - * - it contains all the characters required to enter text in French (for example É, œ and ") - * - it is designed to be more ergonomic and allow faster typing - * - it includes almost 60 additional characters for entering foreign languages, technical content, etc - * - however, the characters remain easy to locate thanks to intuitive groupings - * - * Source: https://norme-azerty.fr - */ +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ #pragma once - #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ @ │ à │ é │ è │ ê │ ( │ ) │ ‘ │ ’ │ « │ » │ ' │ ^ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ - │ + │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ / │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ W │ X │ C │ V │ B │ N │ . │ , │ : │ ; │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define FR_AT KC_GRV // @ #define FR_AGRV KC_1 // à #define FR_EACU KC_2 // é @@ -71,7 +41,6 @@ #define FR_RDAQ KC_0 // » #define FR_QUOT KC_MINS // ' #define FR_DCIR KC_EQL // ^ (dead) -// Row 2 #define FR_A KC_Q // A #define FR_Z KC_W // Z #define FR_E KC_E // E @@ -84,7 +53,6 @@ #define FR_P KC_P // P #define FR_MINS KC_LBRC // - #define FR_PLUS KC_RBRC // + -// Row 3 #define FR_Q KC_A // Q #define FR_S KC_S // S #define FR_D KC_D // D @@ -97,7 +65,6 @@ #define FR_M KC_SCLN // M #define FR_SLSH KC_QUOT // / #define FR_ASTR KC_NUHS // * -// Row 4 #define FR_LABK KC_NUBS // < #define FR_W KC_Z // W #define FR_X KC_X // X @@ -109,21 +76,6 @@ #define FR_COMM KC_COMM // , #define FR_COLN KC_DOT // : #define FR_SCLN KC_SLSH // ; - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ " │ ¨ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ – │ ± │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ \ │ ½ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ ? │ ! │ … │ = │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define FR_HASH S(FR_AT) // # #define FR_1 S(FR_AGRV) // 1 #define FR_2 S(FR_EACU) // 2 @@ -137,33 +89,15 @@ #define FR_0 S(FR_RDAQ) // 0 #define FR_DQUO S(FR_QUOT) // " #define FR_DIAE S(FR_DCIR) // ¨ (dead) -// Row 2 #define FR_NDSH S(FR_MINS) // – #define FR_PLMN S(FR_PLUS) // ± -// Row 3 #define FR_BSLS S(FR_SLSH) // (backslash) #define FR_HALF S(FR_ASTR) // ½ -// Row 4 #define FR_RABK S(FR_LABK) // > #define FR_QUES S(FR_DOT) // ? #define FR_EXLM S(FR_COMM) // ! #define FR_ELLP S(FR_COLN) // … #define FR_EQL S(FR_SCLN) // = - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ˘ │ § │ ´ │ ` │ & │ [ │ ] │ ¯ │ _ │ “ │ ” │ ° │ ˇ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ æ │ £ │ € │ ® │ { │ } │ ù │ ˙ │ œ │ % │ − │ † │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ θ │ ß │ $ │ ¤ │ µ │ Eu│ │ ∕ │ | │ ∞ │ ÷ │ × │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ ≤ │ ʒ │ © │ ç │ ¸ │ − │ ~ │ ¿ │ ¡ │ · │ ≃ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define FR_BREV ALGR(FR_AT) // ˘ (dead) #define FR_SECT ALGR(FR_AGRV) // § #define FR_ACUT ALGR(FR_EACU) // ´ (dead) @@ -177,7 +111,6 @@ #define FR_RDQU ALGR(FR_RDAQ) // ” #define FR_DEG ALGR(FR_QUOT) // ° #define FR_CARN ALGR(FR_DCIR) // ˇ (dead) -// Row 2 #define FR_AE ALGR(FR_A) // æ #define FR_PND ALGR(FR_Z) // £ #define FR_EURO ALGR(FR_E) // € @@ -190,7 +123,6 @@ #define FR_PERC ALGR(FR_P) // % #define FR_MMNS ALGR(FR_MINS) // − #define FR_DAGG ALGR(FR_PLUS) // † -// Row 3 #define FR_THET ALGR(FR_Q) // θ #define FR_SS ALGR(FR_S) // ß #define FR_DLR ALGR(FR_D) // $ @@ -202,7 +134,6 @@ #define FR_INFN ALGR(FR_M) // ∞ #define FR_DIV ALGR(FR_SLSH) // ÷ #define FR_MUL ALGR(FR_ASTR) // × -// Row 4 #define FR_LEQL ALGR(FR_LABK) // ≤ #define FR_EZH ALGR(FR_W) // ʒ #define FR_COPY ALGR(FR_X) // © @@ -214,40 +145,22 @@ #define FR_IEXL ALGR(FR_COMM) // ¡ #define FR_MDDT ALGR(FR_COLN) // · #define FR_AEQL ALGR(FR_SCLN) // ≃ - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ̑ │ │ │ │ │ ˝ │ ̏ │ │ — │ ‹ │ › │ ˚ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ ™ │ │ │ ̣ │ │ ‰ │ ‑ │ ‡ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ ˍ │ │ │ │ │ √ │ ¼ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ ≥ │ │ │ │ ˛ │ │ │ │ ̦ │ │ ≠ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 -#define FR_IBRV S(ALGR(FR_AT)) // ̑ (dead) +#define FR_IBRV S(ALGR(FR_AT)) // ̑ (dead) #define FR_DACU S(ALGR(FR_LPRN)) // ˝ (dead) -#define FR_DGRV S(ALGR(FR_RPRN)) // ̏ (dead) +#define FR_DGRV S(ALGR(FR_RPRN)) // ̏ (dead) #define FR_MDSH S(ALGR(FR_RSQU)) // — #define FR_LSAQ S(ALGR(FR_LDAQ)) // ‹ #define FR_RSAQ S(ALGR(FR_RDAQ)) // › #define FR_RNGA S(ALGR(FR_QUOT)) // ˚ (dead) -// Row 2 #define FR_TM S(ALGR(FR_T)) // ™ -#define FR_DOTB S(ALGR(FR_I)) // ̣ (dead) +#define FR_DOTB S(ALGR(FR_I)) // ̣ (dead) #define FR_PERM S(ALGR(FR_P)) // ‰ #define FR_NBHY S(ALGR(FR_MINS)) // ‑ (non-breaking hyphen) #define FR_DDAG S(ALGR(FR_PLUS)) // ‡ -// Row 3 #define FR_MACB S(ALGR(FR_H)) // ˍ (dead) #define FR_SQRT S(ALGR(FR_SLSH)) // √ #define FR_QRTR S(ALGR(FR_ASTR)) // ¼ -// Row 4 #define FR_GEQL S(ALGR(FR_LABK)) // ≥ #define FR_OGON S(ALGR(FR_V)) // ˛ (dead) -#define FR_DCMM S(ALGR(FR_COMM)) // ̦ (dead) +#define FR_DCMM S(ALGR(FR_COMM)) // ̦ (dead) #define FR_NEQL S(ALGR(FR_SCLN)) // ≠ diff --git a/quantum/keymap_extras/keymap_french_mac_iso.h b/quantum/keymap_extras/keymap_french_mac_iso.h index 590a57e55c..91fbdef7ab 100644 --- a/quantum/keymap_extras/keymap_french_mac_iso.h +++ b/quantum/keymap_extras/keymap_french_mac_iso.h @@ -1,39 +1,33 @@ -/* Copyright 2016 Sébastien Pérochon - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ @ │ & │ é │ " │ ' │ ( │ § │ è │ ! │ ç │ à │ ) │ - │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ A │ Z │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ $ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Q │ S │ D │ F │ G │ H │ J │ K │ L │ M │ ù │ ` │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ < │ W │ X │ C │ V │ B │ N │ , │ ; │ : │ = │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define FR_AT KC_GRV // @ #define FR_AMPR KC_1 // & #define FR_LEAC KC_2 // é @@ -47,7 +41,6 @@ #define FR_LAGR KC_0 // à #define FR_RPRN KC_MINS // ) #define FR_MINS KC_EQL // - -// Row 2 #define FR_A KC_Q // A #define FR_Z KC_W // Z #define FR_E KC_E // E @@ -60,7 +53,6 @@ #define FR_P KC_P // P #define FR_CIRC KC_LBRC // ^ #define FR_DLR KC_RBRC // $ -// Row 3 #define FR_Q KC_A // Q #define FR_S KC_S // S #define FR_D KC_D // D @@ -73,7 +65,6 @@ #define FR_M KC_SCLN // M #define FR_LUGR KC_QUOT // ù #define FR_GRV KC_NUHS // ` -// Row 4 #define FR_LABK KC_NUBS // < #define FR_W KC_Z // W #define FR_X KC_X // X @@ -85,21 +76,6 @@ #define FR_SCLN KC_COMM // ; #define FR_COLN KC_DOT // : #define FR_EQL KC_SLSH // = - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ° │ _ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ % │ £ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ > │ │ │ │ │ │ │ ? │ . │ / │ + │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define FR_HASH S(FR_AT) // # #define FR_1 S(FR_AMPR) // 1 #define FR_2 S(FR_LEAC) // 2 @@ -113,33 +89,15 @@ #define FR_0 S(FR_LAGR) // 0 #define FR_DEG S(FR_RPRN) // ° #define FR_UNDS S(FR_MINS) // _ -// Row 2 #define FR_DIAE S(FR_CIRC) // ¨ (dead) #define FR_ASTR S(FR_DLR) // * -// Row 3 #define FR_PERC S(FR_LUGR) // % #define FR_PND S(FR_GRV) // £ -// Row 4 #define FR_RABK S(FR_LABK) // > #define FR_QUES S(FR_COMM) // ? #define FR_DOT S(FR_SCLN) // . #define FR_SLSH S(FR_COLN) // / #define FR_PLUS S(FR_EQL) // + - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ • │  │ ë │ “ │ ‘ │ { │ ¶ │ « │ ¡ │ Ç │ Ø │ } │ — │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ Æ │  │ Ê │ ® │ † │ Ú │ º │ î │ Œ │ π │ Ô │ € │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ ‡ │ Ò │ ∂ │ ƒ │ fi │ Ì │ Ï │ È │ ¬ │ µ │ Ù │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≤ │ ‹ │ ≈ │ © │ ◊ │ ß │ ~ │ ∞ │ … │ ÷ │ ≠ │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define FR_BULT A(FR_AT) // • #define FR_APPL A(FR_AMPR) //  (Apple logo) #define FR_LEDI A(FR_LEAC) // ë @@ -153,7 +111,6 @@ #define FR_OSTR A(FR_LAGR) // Ø #define FR_RCBR A(FR_RPRN) // } #define FR_MDSH A(FR_MINS) // — -// Row 2 #define FR_AE A(FR_A) // Æ #define FR_CACI A(FR_Z) //  #define FR_ECIR A(FR_E) // Ê @@ -166,7 +123,6 @@ #define FR_PI A(FR_P) // π #define FR_OCIR A(FR_CIRC) // Ô #define FR_EURO A(FR_DLR) // € -// Row 3 #define FR_DDAG A(FR_Q) // ‡ #define FR_COGR A(FR_S) // Ò #define FR_PDIF A(FR_D) // ∂ @@ -178,7 +134,6 @@ #define FR_NOT A(FR_L) // ¬ #define FR_MICR A(FR_M) // µ #define FR_CUGR A(FR_LUGR) // Ù -// Row 4 #define FR_LTEQ A(FR_LABK) // ≤ #define FR_LSAQ A(FR_W) // ‹ #define FR_AEQL A(FR_X) // ≈ @@ -190,21 +145,6 @@ #define FR_ELLP A(FR_SCLN) // … #define FR_DIV A(FR_COLN) // ÷ #define FR_NEQL A(FR_EQL) // ≠ - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ Ÿ │ ´ │ „ │ │ │ [ │ å │ » │ Û │ Á │ │ ] │ – │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ Å │ │ ‚ │ ™ │ │ ª │ ï │ │ ∏ │ │ ¥ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Ω │ ∑ │ ∆ │ · │ fl │ Î │ Í │ Ë │ | │ Ó │ ‰ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≥ │ › │ ⁄ │ ¢ │ √ │ ∫ │ ı │ ¿ │ │ \ │ ± │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define FR_CYDI S(A(FR_AT)) // Ÿ #define FR_ACUT S(A(FR_AMPR)) // ´ (dead) #define FR_DLQU S(A(FR_LEAC)) // „ @@ -215,7 +155,6 @@ #define FR_CAAC S(A(FR_LCCE)) // Á #define FR_RBRC S(A(FR_RPRN)) // ] #define FR_NDSH S(A(FR_MINS)) // – -// Row 2 #define FR_CARI S(A(FR_Z)) // Å #define FR_SLQU S(A(FR_R)) // ‚ #define FR_TM S(A(FR_T)) // ™ @@ -223,7 +162,6 @@ #define FR_LIDI S(A(FR_I)) // ï #define FR_NARP S(A(FR_P)) // ∏ #define FR_YEN S(A(FR_DLR)) // ¥ -// Row 3 #define FR_OMEG S(A(FR_Q)) // Ω #define FR_NARS S(A(FR_S)) // ∑ #define FR_INCR S(A(FR_D)) // ∆ @@ -235,7 +173,6 @@ #define FR_PIPE S(A(FR_L)) // | #define FR_COAC S(A(FR_M)) // Ó #define FR_PERM S(A(FR_LUGR)) // ‰ -// Row 4 #define FR_GTEQ S(A(FR_LABK)) // ≥ #define FR_RSAQ S(A(FR_W)) // › #define FR_FRSL S(A(FR_X)) // ⁄ diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h index 085995b0c6..789df22fc3 100644 --- a/quantum/keymap_extras/keymap_german.h +++ b/quantum/keymap_extras/keymap_german.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Matthias Schmidtt - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ß │ ´ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Ü │ + │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ # │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define DE_CIRC KC_GRV // ^ (dead) #define DE_1 KC_1 // 1 #define DE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define DE_0 KC_0 // 0 #define DE_SS KC_MINS // ß #define DE_ACUT KC_EQL // ´ (dead) -// Row 2 #define DE_Q KC_Q // Q #define DE_W KC_W // W #define DE_E KC_E // E @@ -60,7 +53,6 @@ #define DE_P KC_P // P #define DE_UDIA KC_LBRC // Ü #define DE_PLUS KC_RBRC // + -// Row 3 #define DE_A KC_A // A #define DE_S KC_S // S #define DE_D KC_D // D @@ -73,7 +65,6 @@ #define DE_ODIA KC_SCLN // Ö #define DE_ADIA KC_QUOT // Ä #define DE_HASH KC_NUHS // # -// Row 4 #define DE_LABK KC_NUBS // < #define DE_Y KC_Z // Y #define DE_X KC_X // X @@ -85,21 +76,6 @@ #define DE_COMM KC_COMM // , #define DE_DOT KC_DOT // . #define DE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ ! │ " │ § │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ' │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DE_DEG S(DE_CIRC) // ° #define DE_EXLM S(DE_1) // ! #define DE_DQUO S(DE_2) // " @@ -113,30 +89,12 @@ #define DE_EQL S(DE_0) // = #define DE_QUES S(DE_SS) // ? #define DE_GRV S(DE_ACUT) // ` (dead) -// Row 2 #define DE_ASTR S(DE_PLUS) // * -// Row 3 #define DE_QUOT S(DE_HASH) // ' -// Row 4 #define DE_RABK S(DE_LABK) // > #define DE_SCLN S(DE_COMM) // ; #define DE_COLN S(DE_DOT) // : #define DE_UNDS S(DE_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ ² │ ³ │ │ │ │ { │ [ │ ] │ } │ \ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ @ │ │ € │ │ │ │ │ │ │ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DE_SUP2 ALGR(DE_2) // ² #define DE_SUP3 ALGR(DE_3) // ³ #define DE_LCBR ALGR(DE_7) // { @@ -144,10 +102,8 @@ #define DE_RBRC ALGR(DE_9) // ] #define DE_RCBR ALGR(DE_0) // } #define DE_BSLS ALGR(DE_SS) // (backslash) -// Row 2 #define DE_AT ALGR(DE_Q) // @ #define DE_EURO ALGR(DE_E) // € #define DE_TILD ALGR(DE_PLUS) // ~ -// Row 4 #define DE_PIPE ALGR(DE_LABK) // | #define DE_MICR ALGR(DE_M) // µ diff --git a/quantum/keymap_extras/keymap_german_mac_iso.h b/quantum/keymap_extras/keymap_german_mac_iso.h index 82404fa5fd..588b41091b 100644 --- a/quantum/keymap_extras/keymap_german_mac_iso.h +++ b/quantum/keymap_extras/keymap_german_mac_iso.h @@ -1,39 +1,33 @@ -/* Copyright 2016 Stephen Bösebeck - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ß │ ´ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Ü │ + │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ # │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define DE_CIRC KC_GRV // ^ (dead) #define DE_1 KC_1 // 1 #define DE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define DE_0 KC_0 // 0 #define DE_SS KC_MINS // ß #define DE_ACUT KC_EQL // ´ (dead) -// Row 2 #define DE_Q KC_Q // Q #define DE_W KC_W // W #define DE_E KC_E // E @@ -60,7 +53,6 @@ #define DE_P KC_P // P #define DE_UDIA KC_LBRC // Ü #define DE_PLUS KC_RBRC // + -// Row 3 #define DE_A KC_A // A #define DE_S KC_S // S #define DE_D KC_D // D @@ -73,7 +65,6 @@ #define DE_ODIA KC_SCLN // Ö #define DE_ADIA KC_QUOT // Ä #define DE_HASH KC_NUHS // # -// Row 4 #define DE_LABK KC_NUBS // < #define DE_Y KC_Z // Y #define DE_X KC_X // X @@ -85,21 +76,6 @@ #define DE_COMM KC_COMM // , #define DE_DOT KC_DOT // . #define DE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ° │ ! │ " │ § │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ' │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define DE_DEG S(DE_CIRC) // ° #define DE_EXLM S(DE_1) // ! #define DE_DQUO S(DE_2) // " @@ -113,30 +89,12 @@ #define DE_EQL S(DE_0) // = #define DE_QUES S(DE_SS) // ? #define DE_GRV S(DE_ACUT) // ` (dead) -// Row 2 #define DE_ASTR S(DE_PLUS) // * -// Row 3 #define DE_QUOT S(DE_HASH) // ' -// Row 4 #define DE_RABK S(DE_LABK) // > #define DE_SCLN S(DE_COMM) // ; #define DE_COLN S(DE_DOT) // : #define DE_UNDS S(DE_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ „ │ ¡ │ “ │ ¶ │ ¢ │ [ │ ] │ | │ { │ } │ ≠ │ ¿ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ « │ ∑ │ € │ ® │ † │ Ω │ ¨ │ ⁄ │ Ø │ π │ • │ ± │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Å │ ‚ │ ∂ │ ƒ │ © │ ª │ º │ ∆ │ @ │ Œ │ Æ │ ‘ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≤ │ ¥ │ ≈ │ Ç │ √ │ ∫ │ ~ │ µ │ ∞ │ … │ – │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define DE_DLQU A(DE_CIRC) // „ #define DE_IEXL A(DE_1) // ¡ #define DE_LDQU A(DE_2) // “ @@ -149,7 +107,6 @@ #define DE_RCBR A(DE_9) // } #define DE_NEQL A(DE_0) // ≠ #define DE_IQUE A(DE_SS) // ¿ -// Row 2 #define DE_LDAQ A(DE_Q) // « #define DE_NARS A(DE_W) // ∑ #define DE_EURO A(DE_E) // € @@ -162,7 +119,6 @@ #define DE_PI A(DE_P) // π #define DE_BULT A(DE_UDIA) // • #define DE_PLMN A(DE_PLUS) // ± -// Row 3 #define DE_ARNG A(DE_A) // Å #define DE_SLQU A(DE_S) // ‚ #define DE_PDIF A(DE_D) // ∂ @@ -175,7 +131,6 @@ #define DE_OE A(DE_ODIA) // Œ #define DE_AE A(DE_ADIA) // Æ #define DE_LSQU A(DE_HASH) // ‘ -// Row 4 #define DE_LTEQ A(DE_LABK) // ≤ #define DE_YEN A(DE_Y) // ¥ #define DE_AEQL A(DE_X) // ≈ @@ -187,21 +142,6 @@ #define DE_INFN A(DE_COMM) // ∞ #define DE_ELLP A(DE_DOT) // … #define DE_NDSH A(DE_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ │ ¬ │ ” │ │ £ │ fi │ │ \ │ ˜ │ · │ ¯ │ ˙ │ ˚ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ » │ │ ‰ │ ¸ │ ˝ │ ˇ │ Á │ Û │ │ ∏ │ │  │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ Í │ ™ │ Ï │ Ì │ Ó │ ı │ │ fl │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≥ │ ‡ │ Ù │ │ ◊ │ ‹ │ › │ ˘ │ ˛ │ ÷ │ — │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define DE_NOT S(A(DE_1)) // ¬ #define DE_RDQU S(A(DE_2)) // ” #define DE_PND S(A(DE_4)) // £ @@ -212,7 +152,6 @@ #define DE_MACR S(A(DE_0)) // ¯ #define DE_DOTA S(A(DE_SS)) // ˙ #define DE_RNGA S(A(DE_ACUT)) // ˚ -// Row 2 #define DE_RDAQ S(A(DE_Q)) // » #define DE_PERM S(A(DE_E)) // ‰ #define DE_CEDL S(A(DE_R)) // ¸ @@ -222,7 +161,6 @@ #define DE_UCIR S(A(DE_I)) // Û #define DE_NARP S(A(DE_P)) // ∏ #define DE_APPL S(A(DE_PLUS)) //  (Apple logo) -// Row 3 #define DE_IACU S(A(DE_S)) // Í #define DE_TM S(A(DE_D)) // ™ #define DE_IDIA S(A(DE_F)) // Ï @@ -230,7 +168,6 @@ #define DE_OACU S(A(DE_H)) // Ó #define DE_DLSI S(A(DE_J)) // ı #define DE_FL S(A(DE_L)) // fl -// Row 4 #define DE_GTEQ S(A(DE_LABK)) // ≥ #define DE_DDAG S(A(DE_Y)) // ‡ #define DE_UGRV S(A(DE_X)) // Ù diff --git a/quantum/keymap_extras/keymap_greek.h b/quantum/keymap_extras/keymap_greek.h index 8c23381204..f0d96f905f 100644 --- a/quantum/keymap_extras/keymap_greek.h +++ b/quantum/keymap_extras/keymap_greek.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ ; │ ς │ Ε │ Ρ │ Τ │ Υ │ Θ │ Ι │ Ο │ Π │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Α │ Σ │ Δ │ Φ │ Γ │ Η │ Ξ │ Κ │ Λ │ ΄ │ ' │ \ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ Ζ │ Χ │ Ψ │ Ω │ Β │ Ν │ Μ │ , │ . │ / │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define GR_GRV KC_GRV // ` #define GR_1 KC_1 // 1 #define GR_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define GR_0 KC_0 // 0 #define GR_MINS KC_MINS // - #define GR_EQL KC_EQL // = -// Row 2 #define GR_SCLN KC_Q // ; #define GR_FSIG KC_W // ς #define GR_EPSL KC_E // Ε @@ -60,7 +53,6 @@ #define GR_PI KC_P // Π #define GR_LBRC KC_LBRC // [ #define GR_RBRC KC_RBRC // ] -// Row 3 #define GR_ALPH KC_A // Α #define GR_SIGM KC_S // Σ #define GR_DELT KC_D // Δ @@ -73,7 +65,6 @@ #define GR_TONS KC_SCLN // ΄ (dead) #define GR_QUOT KC_QUOT // ' #define GR_BSLS KC_NUHS // (backslash) -// Row 4 #define GR_ZETA KC_Z // Ζ #define GR_CHI KC_X // Χ #define GR_PSI KC_C // Ψ @@ -84,21 +75,6 @@ #define GR_COMM KC_COMM // , #define GR_DOT KC_DOT // . #define GR_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ : │ ΅ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ ¨ │ " │ | │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define GR_TILD S(GR_GRV) // ~ #define GR_EXLM S(GR_1) // ! #define GR_AT S(GR_2) // @ @@ -112,34 +88,16 @@ #define GR_RPRN S(GR_0) // ) #define GR_UNDS S(GR_MINS) // _ #define GR_PLUS S(GR_EQL) // + -// Row 2 #define GR_COLN S(GR_SCLN) // : #define GR_DIAT S(GR_FSIG) // ΅ (dead) #define GR_LCBR S(GR_LBRC) // { #define GR_RCBR S(GR_RBRC) // } -// Row 3 #define GR_DIAE S(GR_TONS) // ¨ (dead) #define GR_DQUO S(GR_QUOT) // " #define GR_PIPE S(GR_BSLS) // | -// Row 4 #define GR_LABK S(GR_COMM) // < #define GR_RABK S(GR_DOT) // > #define GR_QUES S(GR_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ ² │ ³ │ £ │ § │ ¶ │ │ ¤ │ ¦ │ ° │ ± │ ½ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ ® │ │ ¥ │ │ │ │ │ « │ » │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ¬ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ © │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define GR_SUP2 ALGR(GR_2) // ² #define GR_SUP3 ALGR(GR_3) // ³ #define GR_PND ALGR(GR_4) // £ @@ -150,13 +108,10 @@ #define GR_DEG ALGR(GR_0) // ° #define GR_PLMN ALGR(GR_MINS) // ± #define GR_HALF ALGR(GR_EQL) // ½ -// Row 2 #define GR_EURO ALGR(GR_EPSL) // € #define GR_REGD ALGR(GR_RHO) // ® #define GR_YEN ALGR(GR_UPSL) // ¥ #define GR_LDAQ ALGR(GR_LBRC) // « #define GR_RDAQ ALGR(GR_RBRC) // » -// Row 3 #define GR_NOT ALGR(GR_BSLS) // ¬ -// Row 4 #define GR_COPY ALGR(GR_PSI) // © diff --git a/quantum/keymap_extras/keymap_hebrew.h b/quantum/keymap_extras/keymap_hebrew.h index 87b488f04d..edfd5e70c3 100644 --- a/quantum/keymap_extras/keymap_hebrew.h +++ b/quantum/keymap_extras/keymap_hebrew.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ; │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ / │ ' │ פ │ ם │ ן │ ו │ ט │ א │ ר │ ק │ ] │ [ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ ף │ ך │ ל │ ח │ י │ ע │ כ │ ג │ ד │ ש │ , │ \ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ ץ │ ת │ צ │ מ │ נ │ ה │ ב │ ס │ ז │ . │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define IL_SCLN KC_GRV // ; #define IL_1 KC_1 // 1 #define IL_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define IL_0 KC_0 // 0 #define IL_MINS KC_MINS // - #define IL_EQL KC_EQL // = -// Row 2 #define IL_SLSH KC_Q // / #define IL_QUOT KC_W // ' #define IL_QOF KC_E // ק @@ -60,7 +53,6 @@ #define IL_PE KC_P // פ #define IL_RBRC KC_LBRC // ] #define IL_LBRC KC_RBRC // [ -// Row 3 #define IL_SHIN KC_A // ש #define IL_DALT KC_S // ד #define IL_GIML KC_D // ג @@ -73,7 +65,6 @@ #define IL_FPE KC_SCLN // ף #define IL_COMM KC_QUOT // , #define IL_BSLS KC_NUHS // (backslash) -// Row 4 #define IL_ZAYN KC_Z // ז #define IL_SMKH KC_X // ס #define IL_BET KC_C // ב @@ -84,21 +75,6 @@ #define IL_TAV KC_COMM // ת #define IL_FTSD KC_DOT // ץ #define IL_DOT KC_SLSH // . - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ) │ ( │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ } │ { │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ | │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ > │ < │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IL_TILD S(IL_SCLN) // ~ #define IL_EXLM S(IL_1) // ! #define IL_AT S(IL_2) // @ @@ -112,40 +88,19 @@ #define IL_LPRN S(IL_0) // ( #define IL_UNDS S(IL_MINS) // _ #define IL_PLUS S(IL_EQL) // + -// Row 2 #define IL_RCBR S(IL_RBRC) // } #define IL_LCBR S(IL_LBRC) // { -// Row 3 #define IL_COLN S(IL_FPE) // : #define IL_DQUO S(IL_COMM) // " #define IL_PIPE S(IL_BSLS) // | -// Row 4 #define IL_RABK S(IL_TAV) // > #define IL_LABK S(IL_FTSD) // < #define IL_QUES S(IL_DOT) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ € │ ₪ │ ° │ │ │ × │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ װ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ ײ │ ױ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ÷ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IL_EURO ALGR(IL_3) // € #define IL_SHKL ALGR(IL_4) // ₪ #define IL_DEG ALGR(IL_5) // ° #define IL_MUL ALGR(IL_8) // × -// Row 2 #define IL_DVAV ALGR(IL_TET) // װ -// Row 3 #define IL_VYOD ALGR(IL_AYIN) // ױ #define IL_DYOD ALGR(IL_YOD) // ײ -// Row 4 #define IL_DIV ALGR(IL_DOT) // ÷ diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h index a4e4b1a522..911f2ac5fa 100644 --- a/quantum/keymap_extras/keymap_hungarian.h +++ b/quantum/keymap_extras/keymap_hungarian.h @@ -1,39 +1,33 @@ -/* Copyright 2018 fuge - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ 0 │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ Ö │ Ü │ Ó │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Ő │ Ú │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ É │ Á │ Ű │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ Í │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define HU_0 KC_GRV // 0 #define HU_1 KC_1 // 1 #define HU_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define HU_ODIA KC_0 // Ö #define HU_UDIA KC_MINS // Ü #define HU_OACU KC_EQL // Ó -// Row 2 #define HU_Q KC_Q // Q #define HU_W KC_W // W #define HU_E KC_E // E @@ -60,7 +53,6 @@ #define HU_P KC_P // P #define HU_ODAC KC_LBRC // Ő #define HU_UACU KC_RBRC // Ú -// Row 3 #define HU_A KC_A // A #define HU_S KC_S // S #define HU_D KC_D // D @@ -73,7 +65,6 @@ #define HU_EACU KC_SCLN // É #define HU_AACU KC_QUOT // Á #define HU_UDAC KC_NUHS // Ű -// Row 4 #define HU_IACU KC_NUBS // Í #define HU_Y KC_Z // Y #define HU_X KC_X // X @@ -85,21 +76,6 @@ #define HU_COMM KC_COMM // , #define HU_DOT KC_DOT // . #define HU_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ ' │ " │ + │ ! │ % │ / │ = │ ( │ ) │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ ? │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define HU_SECT S(HU_0) // § #define HU_QUOT S(HU_1) // ' #define HU_DQUO S(HU_2) // " @@ -110,25 +86,9 @@ #define HU_EQL S(HU_7) // = #define HU_LPRN S(HU_8) // ( #define HU_RPRN S(HU_9) // ) -// Row 4 #define HU_QUES S(HU_COMM) // ? #define HU_COLN S(HU_DOT) // : #define HU_UNDS S(HU_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ ¨ │ ¸ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ \ │ | │ Ä │ │ │ │ € │ │ │ │ ÷ │ × │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ ä │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ > │ # │ & │ @ │ { │ } │ │ ; │ │ * │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define HU_TILD ALGR(HU_1) // ~ #define HU_CARN ALGR(HU_2) // ˇ (dead) #define HU_CIRC ALGR(HU_3) // ^ (dead) @@ -141,14 +101,12 @@ #define HU_DACU ALGR(HU_ODIA) // ˝ (dead) #define HU_DIAE ALGR(HU_UDIA) // ¨ (dead) #define HU_CEDL ALGR(HU_OACU) // ¸ (dead) -// Row 2 #define HU_BSLS ALGR(HU_Q) // (backslash) #define HU_PIPE ALGR(HU_W) // | #define HU_CADI ALGR(HU_E) // Ä #define HU_EURO ALGR(HU_U) // € #define HU_DIV ALGR(HU_ODAC) // ÷ #define HU_MUL ALGR(HU_UACU) // × -// Row 3 #define HU_LADI ALGR(HU_A) // ä #define HU_LDST ALGR(HU_S) // đ #define HU_CDST ALGR(HU_D) // Đ @@ -159,7 +117,6 @@ #define HU_DLR ALGR(HU_EACU) // $ #define HU_SS ALGR(HU_AACU) // ß #define HU_CURR ALGR(HU_UDAC) // ¤ -// Row 4 #define HU_LABK ALGR(HU_IACU) // < #define HU_RABK ALGR(HU_Y) // > #define HU_HASH ALGR(HU_X) // # diff --git a/quantum/keymap_extras/keymap_icelandic.h b/quantum/keymap_extras/keymap_icelandic.h index 43e4a6e872..72ba66c01d 100644 --- a/quantum/keymap_extras/keymap_icelandic.h +++ b/quantum/keymap_extras/keymap_icelandic.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ 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 │ , │ . │ Þ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define IS_RNGA KC_GRV // ° (dead) #define IS_1 KC_1 // 1 #define IS_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define IS_0 KC_0 // 0 #define IS_ODIA KC_MINS // Ö #define IS_MINS KC_EQL // - -// Row 2 #define IS_Q KC_Q // Q #define IS_W KC_W // W #define IS_E KC_E // E @@ -60,7 +53,6 @@ #define IS_P KC_P // P #define IS_ETH KC_LBRC // Ð #define IS_QUOT KC_RBRC // ' -// Row 3 #define IS_A KC_A // A #define IS_S KC_S // S #define IS_D KC_D // D @@ -73,7 +65,6 @@ #define IS_AE KC_SCLN // Æ #define IS_ACUT KC_QUOT // ´ (dead) #define IS_PLUS KC_NUHS // + -// Row 4 #define IS_LABK KC_NUBS // < #define IS_Z KC_Z // Z #define IS_X KC_X // X @@ -85,21 +76,6 @@ #define IS_COMM KC_COMM // , #define IS_DOT KC_DOT // . #define IS_THRN KC_SLSH // Þ - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ │ _ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ? │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IS_DIAE S(IS_RNGA) // ¨ (dead) #define IS_EXLM S(IS_1) // ! #define IS_DQUO S(IS_2) // " @@ -112,42 +88,21 @@ #define IS_RPRN S(IS_9) // ) #define IS_EQL S(IS_0) // = #define IS_UNDS S(IS_MINS) // _ -// Row 2 #define IS_QUES S(IS_QUOT) // ? -// Row 3 #define IS_ASTR S(IS_PLUS) // * -// Row 4 #define IS_RABK S(IS_LABK) // > #define IS_SCLN S(IS_COMM) // ; #define IS_COLN S(IS_DOT) // : - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ │ │ │ │ │ │ { │ [ │ ] │ } │ \ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ @ │ │ € │ │ │ │ │ │ │ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ ` │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IS_DEG ALGR(IS_RNGA) // ° #define IS_LCBR ALGR(IS_7) // { #define IS_LBRC ALGR(IS_8) // [ #define IS_RBRC ALGR(IS_9) // ] #define IS_RCBR ALGR(IS_0) // } #define IS_BSLS ALGR(IS_ODIA) // (backslash) -// Row 2 #define IS_AT ALGR(IS_Q) // @ #define IS_EURO ALGR(IS_E) // € #define IS_TILD ALGR(IS_QUOT) // ~ -// Row 3 #define IS_CIRC ALGR(IS_ACUT) // ^ (dead) #define IS_GRV ALGR(IS_PLUS) // ` (dead) -// Row 4 #define IS_PIPE ALGR(IS_LABK) // | #define IS_MICR ALGR(IS_M) // µ diff --git a/quantum/keymap_extras/keymap_irish.h b/quantum/keymap_extras/keymap_irish.h index 73a4c8028d..95348d2ed1 100644 --- a/quantum/keymap_extras/keymap_irish.h +++ b/quantum/keymap_extras/keymap_irish.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define IE_GRV KC_GRV // ` #define IE_1 KC_1 // 1 #define IE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define IE_0 KC_0 // 0 #define IE_MINS KC_MINS // - #define IE_EQL KC_EQL // = -// Row 2 #define IE_Q KC_Q // Q #define IE_W KC_W // W #define IE_E KC_E // E @@ -60,7 +53,6 @@ #define IE_P KC_P // P #define IE_LBRC KC_LBRC // [ #define IE_RBRC KC_RBRC // ] -// Row 3 #define IE_A KC_A // A #define IE_S KC_S // S #define IE_D KC_D // D @@ -73,7 +65,6 @@ #define IE_SCLN KC_SCLN // ; #define IE_QUOT KC_QUOT // ' #define IE_HASH KC_NUHS // # -// Row 4 #define IE_BSLS KC_NUBS // (backslash) #define IE_Z KC_Z // Z #define IE_X KC_X // X @@ -85,21 +76,6 @@ #define IE_COMM KC_COMM // , #define IE_DOT KC_DOT // . #define IE_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¬ │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ : │ @ │ ~ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IE_NOT S(IE_GRV) // ¬ #define IE_EXLM S(IE_1) // ! #define IE_DQUO S(IE_2) // " @@ -113,40 +89,20 @@ #define IE_RPRN S(IE_0) // ) #define IE_UNDS S(IE_MINS) // _ #define IE_PLUS S(IE_EQL) // + -// Row 2 #define IE_LCBR S(IE_LBRC) // { #define IE_RCBR S(IE_RBRC) // } -// Row 3 #define IE_COLN S(IE_SCLN) // : #define IE_AT S(IE_QUOT) // @ #define IE_TILD S(IE_HASH) // ~ -// Row 4 #define IE_PIPE S(IE_BSLS) // | #define IE_LABK S(IE_COMM) // < #define IE_RABK S(IE_DOT) // > #define IE_QUES S(IE_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¦ │ │ │ │ € │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ É │ │ │ │ Ú │ Í │ Ó │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Á │ │ │ │ │ │ │ │ │ │ ´ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IE_BRKP ALGR(IE_GRV) // ¦ #define IE_EURO ALGR(IE_4) // € -// Row 2 #define IE_EACU ALGR(IE_E) // É #define IE_UACU ALGR(IE_U) // Ú #define IE_IACU ALGR(IE_I) // Í #define IE_OACU ALGR(IE_O) // Ó -// Row 3 #define IE_AACU ALGR(IE_A) // Á #define IE_ACUT ALGR(IE_QUOT) // ´ (dead) diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h index ece60d06b7..fd14b377c5 100644 --- a/quantum/keymap_extras/keymap_italian.h +++ b/quantum/keymap_extras/keymap_italian.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Matthias Schmidtt - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ \ │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define IT_BSLS KC_GRV // (backslash) #define IT_1 KC_1 // 1 #define IT_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define IT_0 KC_0 // 0 #define IT_QUOT KC_MINS // ' #define IT_IGRV KC_EQL // ì -// Row 2 #define IT_Q KC_Q // Q #define IT_W KC_W // W #define IT_E KC_E // E @@ -60,7 +53,6 @@ #define IT_P KC_P // P #define IT_EGRV KC_LBRC // è #define IT_PLUS KC_RBRC // + -// Row 3 #define IT_A KC_A // A #define IT_S KC_S // S #define IT_D KC_D // D @@ -73,7 +65,6 @@ #define IT_OGRV KC_SCLN // ò #define IT_AGRV KC_QUOT // à #define IT_UGRV KC_NUHS // ù -// Row 4 #define IT_LABK KC_NUBS // < #define IT_Z KC_Z // Z #define IT_X KC_X // X @@ -85,21 +76,6 @@ #define IT_COMM KC_COMM // , #define IT_DOT KC_DOT // . #define IT_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ | │ ! │ " │ £ │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ^ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ é │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ ç │ ° │ § │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define IT_PIPE S(IT_BSLS) // | #define IT_EXLM S(IT_1) // ! #define IT_DQUO S(IT_2) // " @@ -113,53 +89,19 @@ #define IT_EQL S(IT_0) // = #define IT_QUES S(IT_QUOT) // ? #define IT_CIRC S(IT_IGRV) // ^ -// Row 2 #define IT_EACU S(IT_EGRV) // é #define IT_ASTR S(IT_PLUS) // * -// Row 3 #define IT_CCED S(IT_OGRV) // ç #define IT_DEG S(IT_AGRV) // ° #define IT_SECT S(IT_UGRV) // § -// Row 4 #define IT_RABK S(IT_LABK) // > #define IT_COLN S(IT_DOT) // : #define IT_SCLN S(IT_COMM) // ; #define IT_UNDS S(IT_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ @ │ # │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 2 #define IT_EURO ALGR(IT_E) // € #define IT_LBRC ALGR(IT_EGRV) // [ #define IT_RBRC ALGR(IT_PLUS) // ] -// Row 3 #define IT_AT ALGR(IT_OGRV) // @ #define IT_HASH ALGR(IT_AGRV) // # - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 2 #define IT_LCBR S(ALGR(IT_EGRV)) // { #define IT_RCBR S(ALGR(IT_PLUS)) // } diff --git a/quantum/keymap_extras/keymap_italian_mac_ansi.h b/quantum/keymap_extras/keymap_italian_mac_ansi.h index c2b8e3cad6..d072c6fe57 100644 --- a/quantum/keymap_extras/keymap_italian_mac_ansi.h +++ b/quantum/keymap_extras/keymap_italian_mac_ansi.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Matthias Schmidtt - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ < │ 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 │ , │ . │ - │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define IT_LABK KC_GRV // < #define IT_1 KC_1 // 1 #define IT_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define IT_0 KC_0 // 0 #define IT_QUOT KC_MINS // ' #define IT_IGRV KC_EQL // ì -// Row 2 #define IT_Q KC_Q // Q #define IT_W KC_W // W #define IT_E KC_E // E @@ -61,7 +54,6 @@ #define IT_EGRV KC_LBRC // è #define IT_PLUS KC_RBRC // + #define IT_UGRV KC_BSLS // ù -// Row 3 #define IT_A KC_A // A #define IT_S KC_S // S #define IT_D KC_D // D @@ -73,7 +65,6 @@ #define IT_L KC_L // L #define IT_OGRV KC_SCLN // ò #define IT_AGRV KC_QUOT // à -// Row 4 #define IT_BSLS KC_NUBS // (backslash, not physically present) #define IT_Z KC_Z // Z #define IT_X KC_X // X @@ -85,21 +76,6 @@ #define IT_COMM KC_COMM // , #define IT_DOT KC_DOT // . #define IT_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ > │ ! │ " │ £ │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ^ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ é │ * │ § │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ ç │ ° │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define IT_RABK S(IT_LABK) // > #define IT_EXLM S(IT_1) // ! #define IT_DQUO S(IT_2) // " @@ -113,33 +89,15 @@ #define IT_EQL S(IT_0) // = #define IT_QUES S(IT_QUOT) // ? #define IT_CIRC S(IT_IGRV) // ^ -// Row 2 #define IT_EACU S(IT_EGRV) // é #define IT_ASTR S(IT_PLUS) // * #define IT_SECT S(IT_UGRV) // § -// Row 3 #define IT_LCCE S(IT_OGRV) // ç #define IT_DEG S(IT_AGRV) // ° -// Row 4 #define IT_PIPE S(IT_BSLS) // | (not physically present) #define IT_SCLN S(IT_COMM) // ; #define IT_COLN S(IT_DOT) // : #define IT_UNDS S(IT_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ≤ │ « │ “ │ ‘ │ ¥ │ ~ │ ‹ │ ÷ │ ´ │ ` │ ≠ │ ¡ │ ˆ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ „ │ Ω │ € │ ® │ ™ │ Æ │ ¨ │ Œ │ Ø │ π │ [ │ ] │ ¶ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ Å │ ß │ ∂ │ ƒ │ ∞ │ ∆ │ ª │ º │ ¬ │ @ │ # │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ ∑ │ † │ © │ √ │ ∫ │ ˜ │ µ │ … │ • │ – │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define IT_LTEQ A(IT_LABK) // ≤ #define IT_LDAQ A(IT_1) // « #define IT_LDQU A(IT_2) // “ @@ -153,7 +111,6 @@ #define IT_NEQL A(IT_0) // ≠ #define IT_IEXL A(IT_QUOT) // ¡ #define IT_DCIR A(IT_IGRV) // ˆ (dead) -// Row 2 #define IT_DLQU A(IT_Q) // „ #define IT_OMEG A(IT_W) // Ω #define IT_EURO A(IT_E) // € @@ -166,7 +123,6 @@ #define IT_PI A(IT_P) // π #define IT_LBRC A(IT_EGRV) // [ #define IT_RBRC A(IT_PLUS) // ] -// Row 3 #define IT_ARNG A(IT_A) // Å #define IT_SS A(IT_S) // ß #define IT_PDIF A(IT_D) // ∂ @@ -179,7 +135,6 @@ #define IT_AT A(IT_OGRV) // @ #define IT_HASH A(IT_AGRV) // # #define IT_PILC A(IT_UGRV) // ¶ -// Row 4 #define IT_GRV A(IT_BSLS) // ` (not physically present) #define IT_NARS A(IT_Z) // ∑ #define IT_DAGG A(IT_X) // † @@ -191,21 +146,6 @@ #define IT_ELLP A(IT_COMM) // … #define IT_BULT A(IT_DOT) // • #define IT_NDSH A(IT_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ≥ │ » │ ” │ ’ │ ¢ │ ‰ │ › │ ⁄ │  │ │ ≈ │ ¿ │ ± │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ ‚ │ À │ È │ Ì │ Ò │ │ Ù │ │ │ ∏ │ { │ } │ ◊ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ │ ¯ │ ˘ │ ˙ │ ˚ │ ¸ │ ˝ │ ˛ │ ˇ │ Ç │ ∞ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ │ ‡ │ Á │ É │ Í │ Ó │ Ú │ │ · │ — │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define IT_GTEQ S(A(IT_LABK)) // ≥ #define IT_RDAQ S(A(IT_1)) // » #define IT_RDQU S(A(IT_2)) // ” @@ -218,7 +158,6 @@ #define IT_AEQL S(A(IT_0)) // ≈ #define IT_IQUE S(A(IT_QUOT)) // ¿ #define IT_PLMN S(A(IT_IGRV)) // ± -// Row 2 #define IT_SLQU S(A(IT_Q)) // ‚ #define IT_CAGR S(A(IT_W)) // À #define IT_CEGR S(A(IT_E)) // È @@ -229,7 +168,6 @@ #define IT_LCBR S(A(IT_EGRV)) // { #define IT_RCBR S(A(IT_PLUS)) // } #define IT_LOZN S(A(IT_UGRV)) // ◊ -// Row 3 #define IT_MACR S(A(IT_S)) // ¯ #define IT_BREV S(A(IT_D)) // ˘ #define IT_DOTA S(A(IT_F)) // ˙ @@ -239,7 +177,6 @@ #define IT_OGON S(A(IT_K)) // ˛ #define IT_CARN S(A(IT_L)) // ˇ #define IT_CCCE S(A(IT_OGRV)) // Ç -// Row 4 #define IT_DDAG S(A(IT_X)) // ‡ #define IT_CAAC S(A(IT_C)) // Á #define IT_CEAC S(A(IT_V)) // É diff --git a/quantum/keymap_extras/keymap_italian_mac_iso.h b/quantum/keymap_extras/keymap_italian_mac_iso.h index 61f76ddba7..b93a583a41 100644 --- a/quantum/keymap_extras/keymap_italian_mac_iso.h +++ b/quantum/keymap_extras/keymap_italian_mac_iso.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Matthias Schmidtt - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ \ │ 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 │ , │ . │ - │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define IT_BSLS KC_GRV // (backslash) #define IT_1 KC_1 // 1 #define IT_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define IT_0 KC_0 // 0 #define IT_QUOT KC_MINS // ' #define IT_IGRV KC_EQL // ì -// Row 2 #define IT_Q KC_Q // Q #define IT_W KC_W // W #define IT_E KC_E // E @@ -60,7 +53,6 @@ #define IT_P KC_P // P #define IT_EGRV KC_LBRC // è #define IT_PLUS KC_RBRC // + -// Row 3 #define IT_A KC_A // A #define IT_S KC_S // S #define IT_D KC_D // D @@ -73,7 +65,6 @@ #define IT_OGRV KC_SCLN // ò #define IT_AGRV KC_QUOT // à #define IT_UGRV KC_NUHS // ù -// Row 4 #define IT_LABK KC_NUBS // < #define IT_Z KC_Z // Z #define IT_X KC_X // X @@ -85,21 +76,6 @@ #define IT_COMM KC_COMM // , #define IT_DOT KC_DOT // . #define IT_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ | │ ! │ " │ £ │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ^ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ é │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ ç │ ° │ § │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define IT_PIPE S(IT_BSLS) // | #define IT_EXLM S(IT_1) // ! #define IT_DQUO S(IT_2) // " @@ -113,33 +89,15 @@ #define IT_EQL S(IT_0) // = #define IT_QUES S(IT_QUOT) // ? #define IT_CIRC S(IT_IGRV) // ^ -// Row 2 #define IT_EACU S(IT_EGRV) // é #define IT_ASTR S(IT_PLUS) // * -// Row 3 #define IT_LCCE S(IT_OGRV) // ç #define IT_DEG S(IT_AGRV) // ° #define IT_SECT S(IT_UGRV) // § -// Row 4 #define IT_RABK S(IT_LABK) // > #define IT_SCLN S(IT_COMM) // ; #define IT_COLN S(IT_DOT) // : #define IT_UNDS S(IT_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ` │ « │ “ │ ‘ │ ¥ │ ~ │ ‹ │ ÷ │ ´ │ ` │ ≠ │ ¡ │ ˆ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ „ │ Ω │ € │ ® │ ™ │ Æ │ ¨ │ Œ │ Ø │ π │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Å │ ß │ ∂ │ ƒ │ ∞ │ ∆ │ ª │ º │ ¬ │ @ │ # │ ¶ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≤ │ ∑ │ † │ © │ √ │ ∫ │ ˜ │ µ │ … │ • │ – │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define IT_GRV A(IT_BSLS) // ` #define IT_LDAQ A(IT_1) // « #define IT_LDQU A(IT_2) // “ @@ -153,7 +111,6 @@ #define IT_NEQL A(IT_0) // ≠ #define IT_IEXL A(IT_QUOT) // ¡ #define IT_DCIR A(IT_IGRV) // ˆ (dead) -// Row 2 #define IT_DLQU A(IT_Q) // „ #define IT_OMEG A(IT_W) // Ω #define IT_EURO A(IT_E) // € @@ -166,7 +123,6 @@ #define IT_PI A(IT_P) // π #define IT_LBRC A(IT_EGRV) // [ #define IT_RBRC A(IT_PLUS) // ] -// Row 3 #define IT_ARNG A(IT_A) // Å #define IT_SS A(IT_S) // ß #define IT_PDIF A(IT_D) // ∂ @@ -179,7 +135,6 @@ #define IT_AT A(IT_OGRV) // @ #define IT_HASH A(IT_AGRV) // # #define IT_PILC A(IT_UGRV) // ¶ -// Row 4 #define IT_LTEQ A(IT_LABK) // ≤ #define IT_NARS A(IT_Z) // ∑ #define IT_DAGG A(IT_X) // † @@ -191,21 +146,6 @@ #define IT_ELLP A(IT_COMM) // … #define IT_BULT A(IT_DOT) // • #define IT_NDSH A(IT_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ı │ » │ ” │ ’ │ ¢ │ ‰ │ › │ ⁄ │  │ │ ≈ │ ¿ │ ± │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ ‚ │ À │ È │ Ì │ Ò │ │ Ù │ │ │ ∏ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ ¯ │ ˘ │ ˙ │ ˚ │ ¸ │ ˝ │ ˛ │ ˇ │ Ç │ │ ◊ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≥ │ │ ‡ │ Á │ É │ Í │ Ó │ Ú │ │ · │ — │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define IT_DLSI S(A(IT_BSLS)) // ı #define IT_RDAQ S(A(IT_1)) // » #define IT_RDQU S(A(IT_2)) // ” @@ -218,7 +158,6 @@ #define IT_AEQL S(A(IT_0)) // ≈ #define IT_IQUE S(A(IT_QUOT)) // ¿ #define IT_PLMN S(A(IT_IGRV)) // ± -// Row 2 #define IT_SLQU S(A(IT_Q)) // ‚ #define IT_CAGR S(A(IT_W)) // À #define IT_CEGR S(A(IT_E)) // È @@ -228,7 +167,6 @@ #define IT_NARP S(A(IT_P)) // ∏ #define IT_LCBR S(A(IT_EGRV)) // { #define IT_RCBR S(A(IT_PLUS)) // } -// Row 3 #define IT_MACR S(A(IT_S)) // ¯ #define IT_BREV S(A(IT_D)) // ˘ #define IT_DOTA S(A(IT_F)) // ˙ @@ -239,7 +177,6 @@ #define IT_CARN S(A(IT_L)) // ˇ #define IT_CCCE S(A(IT_OGRV)) // Ç #define IT_LOZN S(A(IT_UGRV)) // ◊ -// Row 4 #define IT_GTEQ S(A(IT_LABK)) // ≥ #define IT_DDAG S(A(IT_X)) // ‡ #define IT_CAAC S(A(IT_C)) // Á diff --git a/quantum/keymap_extras/keymap_japanese.h b/quantum/keymap_extras/keymap_japanese.h index df78af8399..4a3ce490f8 100644 --- a/quantum/keymap_extras/keymap_japanese.h +++ b/quantum/keymap_extras/keymap_japanese.h @@ -1,45 +1,33 @@ -/* Copyright 2016 h-youhei - * - * 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 2 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 . - * - * JP106-layout (Japanese Standard) - * - * For more information, see - * http://www2d.biglobe.ne.jp/~msyk/keyboard/layout/usbkeycode.html - * note: This website is written in Japanese. - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Z↔H│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ @ │ [ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ Eisū │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ : │ ] │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ - * │ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \ │ │ - * ├─────┬──┴┬──┴──┬┴───┴┬──┴───┴──┬┴───┴┬──┴┬──┴┬──┴┬──┴┬─────┤ - * │ │ │ │Muhen│ │ Hen │K↔H│ │ │ │ │ - * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘ - */ -// Row 1 +// Aliases #define JP_ZKHK KC_GRV // Zenkaku ↔ Hankaku ↔ Kanji (半角 ↔ 全角 ↔ 漢字) #define JP_1 KC_1 // 1 #define JP_2 KC_2 // 2 @@ -54,7 +42,6 @@ #define JP_MINS KC_MINS // - #define JP_CIRC KC_EQL // ^ #define JP_YEN KC_INT3 // ¥ -// Row 2 #define JP_Q KC_Q // Q #define JP_W KC_W // W #define JP_E KC_E // E @@ -67,7 +54,6 @@ #define JP_P KC_P // P #define JP_AT KC_LBRC // @ #define JP_LBRC KC_RBRC // [ -// Row 3 #define JP_EISU KC_CAPS // Eisū (英数) #define JP_A KC_A // A #define JP_S KC_S // S @@ -81,7 +67,6 @@ #define JP_SCLN KC_SCLN // ; #define JP_COLN KC_QUOT // : #define JP_RBRC KC_NUHS // ] -// Row 4 #define JP_Z KC_Z // Z #define JP_X KC_X // X #define JP_C KC_C // C @@ -93,25 +78,9 @@ #define JP_DOT KC_DOT // . #define JP_SLSH KC_SLSH // / #define JP_BSLS KC_INT1 // (backslash) -// Row 5 #define JP_MHEN KC_INT5 // Muhenkan (無変換) #define JP_HENK KC_INT4 // Henkan (変換) #define JP_KANA KC_INT2 // Katakana ↔ Hiragana ↔ Rōmaji (カタカナ ↔ ひらがな ↔ ローマ字) - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ ! │ " │ # │ $ │ % │ & │ ' │ ( │ ) │ │ = │ ~ │ | │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ` │ { │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ Caps │ │ │ │ │ │ │ │ │ │ + │ * │ } │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ _ │ │ - * ├─────┬──┴┬──┴──┬┴───┴┬──┴───┴──┬┴───┴┬──┴┬──┴┬──┴┬──┴┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘ - */ -// Row 1 #define JP_EXLM S(JP_1) // ! #define JP_DQUO S(JP_2) // " #define JP_HASH S(JP_3) // # @@ -124,15 +93,12 @@ #define JP_EQL S(JP_MINS) // = #define JP_TILD S(JP_CIRC) // ~ #define JP_PIPE S(JP_YEN) // | -// Row 2 #define JP_GRV S(JP_AT) // ` #define JP_LCBR S(JP_LBRC) // { -// Row 3 #define JP_CAPS S(JP_EISU) // Caps Lock #define JP_PLUS S(JP_SCLN) // + #define JP_ASTR S(JP_COLN) // * #define JP_RCBR S(JP_RBRC) // } -// Row 4 #define JP_LABK S(JP_COMM) // < #define JP_RABK S(JP_DOT) // > #define JP_QUES S(JP_SLSH) // ? diff --git a/quantum/keymap_extras/keymap_korean.h b/quantum/keymap_extras/keymap_korean.h index 3d41a98b88..514bf44a29 100644 --- a/quantum/keymap_extras/keymap_korean.h +++ b/quantum/keymap_extras/keymap_korean.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┴───┴──┬┴──┬┴───┴┬──┴┬───┬─────┤ - * │ │ │ │Hnj│ │H↔Y│ │ │ │ │ - * └─────┴───┴─────┴───┴───────────────┴───┴─────┴───┴───┴─────┘ - */ -// Row 1 +// Aliases #define KR_GRV KC_GRV // ` #define KR_1 KC_1 // 1 #define KR_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define KR_0 KC_0 // 0 #define KR_MINS KC_MINS // - #define KR_EQL KC_EQL // = -// Row 2 #define KR_Q KC_Q // Q #define KR_W KC_W // W #define KR_E KC_E // E @@ -61,7 +54,6 @@ #define KR_LBRC KC_LBRC // [ #define KR_RBRC KC_RBRC // ] #define KR_WON KC_BSLS // ₩ -// Row 3 #define KR_A KC_A // A #define KR_S KC_S // S #define KR_D KC_D // D @@ -73,7 +65,6 @@ #define KR_L KC_L // L #define KR_SCLN KC_SCLN // ; #define KR_QUOT KC_QUOT // ' -// Row 4 #define KR_Z KC_Z // Z #define KR_X KC_X // X #define KR_C KC_C // C @@ -84,24 +75,8 @@ #define KR_COMM KC_COMM // , #define KR_DOT KC_DOT // . #define KR_SLSH KC_SLSH // / -// Row 5 #define KR_HANJ KC_LNG2 // Hanja (한자) #define KR_HAEN KC_LNG1 // Han ↔ Yeong (한 ↔ 영) - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┴───┴──┬┴──┬┴───┴┬──┴┬───┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └─────┴───┴─────┴───┴───────────────┴───┴─────┴───┴───┴─────┘ - */ -// Row 1 #define KR_TILD S(KR_GRV) // ~ #define KR_EXLM S(KR_1) // ! #define KR_AT S(KR_2) // @ @@ -115,14 +90,11 @@ #define KR_RPRN S(KR_0) // ) #define KR_UNDS S(KR_MINS) // _ #define KR_PLUS S(KR_EQL) // + -// Row 2 #define KR_LCBR S(KR_LBRC) // { #define KR_RCBR S(KR_RBRC) // } #define KR_PIPE S(KR_WON) // | -// Row 3 #define KR_COLN S(KR_SCLN) // : #define KR_DQUO S(KR_QUOT) // " -// Row 4 #define KR_LABK S(KR_COMM) // < #define KR_RABK S(KR_DOT) // > #define KR_QUES S(KR_SLSH) // ? diff --git a/quantum/keymap_extras/keymap_latvian.h b/quantum/keymap_extras/keymap_latvian.h index 087138cb72..d2cbda1471 100644 --- a/quantum/keymap_extras/keymap_latvian.h +++ b/quantum/keymap_extras/keymap_latvian.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define LV_GRV KC_GRV // ` #define LV_1 KC_1 // 1 #define LV_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define LV_0 KC_0 // 0 #define LV_MINS KC_MINS // - #define LV_EQL KC_EQL // = -// Row 2 #define LV_Q KC_Q // Q #define LV_W KC_W // W #define LV_E KC_E // E @@ -60,7 +53,6 @@ #define LV_P KC_P // P #define LV_LBRC KC_LBRC // [ #define LV_RBRC KC_RBRC // ] -// Row 3 #define LV_A KC_A // A #define LV_S KC_S // S #define LV_D KC_D // D @@ -73,7 +65,6 @@ #define LV_SCLN KC_SCLN // ; #define LV_QUOT KC_QUOT // ' (dead) #define LV_BSLS KC_NUHS // (backslash) -// Row 4 #define LV_NUBS KC_NUBS // (backslash) #define LV_Z KC_Z // Z #define LV_X KC_X // X @@ -85,21 +76,6 @@ #define LV_COMM KC_COMM // , #define LV_DOT KC_DOT // . #define LV_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ | │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LV_TILD S(LV_GRV) // ~ #define LV_EXLM S(LV_1) // ! #define LV_AT S(LV_2) // @ @@ -113,75 +89,38 @@ #define LV_RPRN S(LV_0) // ) #define LV_UNDS S(LV_MINS) // _ #define LV_PLUS S(LV_EQL) // + -// Row 2 #define LV_LCBR S(LV_LBRC) // { #define LV_RCBR S(LV_RBRC) // } -// Row 3 #define LV_COLN S(LV_SCLN) // : #define LV_DQUO S(LV_QUOT) // " (dead) #define LV_PIPE S(LV_BSLS) // | -// Row 4 #define LV_LABK S(LV_COMM) // < #define LV_RABK S(LV_DOT) // > #define LV_QUES S(LV_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ - │ │ « │ » │ € │ │ ’ │ │ │ │ │ – │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ Ē │ Ŗ │ │ │ Ū │ Ī │ Ō │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Ā │ Š │ │ │ Ģ │ │ │ Ķ │ Ļ │ │ ´ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ Ž │ │ Č │ │ │ Ņ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LV_SHYP ALGR(LV_GRV) // ­ (soft hyphen) -#define LV_NBSP ALGR(LV_1) //   (non-breaking space) +#define LV_NBSP ALGR(LV_1) // (non-breaking space) #define LV_LDAQ ALGR(LV_2) // « #define LV_RDAQ ALGR(LV_3) // » #define LV_EURO ALGR(LV_4) // € #define LV_RSQU ALGR(LV_6) // ’ #define LV_NDSH ALGR(LV_MINS) // – -// Row 2 #define LV_EMAC ALGR(LV_E) // Ē #define LV_RCED ALGR(LV_R) // Ŗ #define LV_UMAC ALGR(LV_U) // Ū #define LV_IMAC ALGR(LV_I) // Ī #define LV_OMAC ALGR(LV_O) // Ō -// Row 3 #define LV_AMAC ALGR(LV_A) // Ā #define LV_SCAR ALGR(LV_S) // Š #define LV_GCED ALGR(LV_G) // Ģ #define LV_KCED ALGR(LV_K) // Ķ #define LV_LCED ALGR(LV_L) // Ļ #define LV_ACUT ALGR(LV_QUOT) // ´ (dead) -// Row 4 #define LV_ZCAR ALGR(LV_Z) // Ž #define LV_CCAR ALGR(LV_C) // Č #define LV_NCED ALGR(LV_N) // Ņ - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ § │ ° │ │ ± │ × │ │ │ — │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LV_SECT S(ALGR(LV_4)) // § #define LV_DEG S(ALGR(LV_5)) // ° #define LV_PLMN S(ALGR(LV_7)) // ± #define LV_MUL S(ALGR(LV_8)) // × #define LV_MDSH S(ALGR(LV_MINS)) // — -// Row 3 #define LV_DIAE S(ALGR(LV_QUOT)) // ¨ (dead) diff --git a/quantum/keymap_extras/keymap_lithuanian_azerty.h b/quantum/keymap_extras/keymap_lithuanian_azerty.h index 6f47b16702..e6a6fa5c8d 100644 --- a/quantum/keymap_extras/keymap_lithuanian_azerty.h +++ b/quantum/keymap_extras/keymap_lithuanian_azerty.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ ! │ - │ / │ ; │ : │ , │ . │ = │ ( │ ) │ ? │ X │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Ą │ Ž │ E │ R │ T │ Y │ U │ I │ O │ P │ Į │ W │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ Š │ G │ H │ J │ K │ L │ Ų │ Ė │ Q │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Z │ Ū │ C │ V │ B │ N │ M │ Č │ F │ Ę │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define LT_GRV KC_GRV // ` #define LT_EXLM KC_1 // ! #define LT_MINS KC_2 // - @@ -47,7 +41,6 @@ #define LT_RPRN KC_0 // ) #define LT_QUES KC_MINS // ? #define LT_X KC_EQL // X -// Row 2 #define LT_AOGO KC_Q // Ą #define LT_ZCAR KC_W // Ž #define LT_E KC_E // E @@ -60,7 +53,6 @@ #define LT_P KC_P // P #define LT_IOGO KC_LBRC // Į #define LT_W KC_RBRC // W -// Row 3 #define LT_A KC_A // A #define LT_S KC_S // S #define LT_D KC_D // D @@ -73,7 +65,6 @@ #define LT_UOGO KC_SCLN // Ų #define LT_EDOT KC_QUOT // Ė #define LT_Q KC_NUHS // Q -// Row 4 #define LT_LABK KC_NUBS // < #define LT_Z KC_Z // Z #define LT_UMAC KC_X // Ū @@ -85,21 +76,6 @@ #define LT_CCAR KC_COMM // Č #define LT_F KC_DOT // F #define LT_EOGO KC_SLSH // Ę - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ + │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LT_TILD S(LT_GRV) // ~ #define LT_1 S(LT_EXLM) // 1 #define LT_2 S(LT_MINS) // 2 @@ -112,23 +88,7 @@ #define LT_9 S(LT_LPRN) // 9 #define LT_0 S(LT_RPRN) // 0 #define LT_PLUS S(LT_QUES) // + -// Row 4 #define LT_RABK S(LT_LABK) // > - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ´ │ @ │ _ │ # │ $ │ § │ ^ │ & │ * │ [ │ ] │ ' │ % │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ " │ | │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ – │ │ │ │ │ │ │ │ „ │ “ │ \ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LT_ACUT ALGR(LT_GRV) // ´ #define LT_AT ALGR(LT_EXLM) // @ #define LT_UNDS ALGR(LT_MINS) // _ @@ -142,14 +102,11 @@ #define LT_RBRC ALGR(LT_RPRN) // ] #define LT_QUOT ALGR(LT_QUES) // ' #define LT_PERC ALGR(LT_X) // % -// Row 2 #define LT_EURO ALGR(LT_E) // € #define LT_LCBR ALGR(LT_IOGO) // { #define LT_RCBR ALGR(LT_W) // } -// Row 3 #define LT_DQUO ALGR(LT_EDOT) // " #define LT_PIPE ALGR(LT_Q) // | -// Row 4 #define LT_NDSH ALGR(LT_LABK) // – #define LT_DLQU ALGR(LT_CCAR) // „ #define LT_LDQU ALGR(LT_F) // “ diff --git a/quantum/keymap_extras/keymap_lithuanian_qwerty.h b/quantum/keymap_extras/keymap_lithuanian_qwerty.h index afca2dc750..97687daceb 100644 --- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h +++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ Ą │ Č │ Ę │ Ė │ Į │ Š │ Ų │ Ū │ 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 │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define LT_GRV KC_GRV // ` #define LT_AOGO KC_1 // Ą #define LT_CCAR KC_2 // Č @@ -47,7 +41,6 @@ #define LT_0 KC_0 // 0 #define LT_MINS KC_MINS // - #define LT_ZCAR KC_EQL // Ž -// Row 2 #define LT_Q KC_Q // Q #define LT_W KC_W // W #define LT_E KC_E // E @@ -60,7 +53,6 @@ #define LT_P KC_P // P #define LT_LBRC KC_LBRC // [ #define LT_RBRC KC_RBRC // ] -// Row 3 #define LT_A KC_A // A #define LT_S KC_S // S #define LT_D KC_D // D @@ -73,7 +65,6 @@ #define LT_SCLN KC_SCLN // ; #define LT_QUOT KC_QUOT // ' #define LT_BSLS KC_BSLS // (backslash) -// Row 4 #define LT_Z KC_Z // Z #define LT_X KC_X // X #define LT_C KC_C // C @@ -84,51 +75,18 @@ #define LT_COMM KC_COMM // , #define LT_DOT KC_DOT // . #define LT_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ │ │ │ │ │ │ │ │ ( │ ) │ _ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LT_TILD S(LT_GRV) // ~ #define LT_LPRN S(LT_9) // ( #define LT_RPRN S(LT_0) // ) #define LT_UNDS S(LT_MINS) // _ -// Row 2 #define LT_LCBR S(LT_LBRC) // { #define LT_RCBR S(LT_RBRC) // } -// Row 3 #define LT_COLN S(LT_SCLN) // : #define LT_DQUO S(LT_QUOT) // " #define LT_PIPE S(LT_BSLS) // | -// Row 4 #define LT_LABK S(LT_COMM) // < #define LT_RABK S(LT_DOT) // > #define LT_QUES S(LT_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ │ │ │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LT_1 ALGR(LT_AOGO) // 1 #define LT_2 ALGR(LT_CCAR) // 2 #define LT_3 ALGR(LT_EOGO) // 3 @@ -138,23 +96,7 @@ #define LT_7 ALGR(LT_UOGO) // 7 #define LT_8 ALGR(LT_UMAC) // 8 #define LT_EQL ALGR(LT_ZCAR) // = -// Row 2 #define LT_EURO ALGR(LT_E) // € - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ │ │ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define LT_EXLM S(ALGR(LT_AOGO)) // ! #define LT_AT S(ALGR(LT_CCAR)) // @ #define LT_HASH S(ALGR(LT_EOGO)) // # diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h index f9fc00d794..8b4b81bd7b 100644 --- a/quantum/keymap_extras/keymap_neo2.h +++ b/quantum/keymap_extras/keymap_neo2.h @@ -1,39 +1,33 @@ -/* Copyright 2016 Matthias Schmitt - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ X │ V │ L │ C │ W │ K │ H │ G │ F │ Q │ ß │ ´ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ L3 │ U │ I │ A │ E │ O │ S │ N │ R │ T │ D │ Y │ L3│ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │L4 │ Ü │ Ö │ Ä │ P │ Z │ B │ M │ , │ . │ J │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ L4 │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define NE_CIRC KC_GRV // ^ (dead) #define NE_1 KC_1 // 1 #define NE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define NE_0 KC_0 // 0 #define NE_MINS KC_MINS // - #define NE_GRV KC_EQL // ` (dead) -// Row 2 #define NE_X KC_Q // X #define NE_V KC_W // V #define NE_L KC_E // L @@ -60,7 +53,6 @@ #define NE_Q KC_P // Q #define NE_SS KC_LBRC // ß #define NE_ACUT KC_RBRC // ´ (dead) -// Row 3 #define NE_L3L KC_CAPS // (layer 3) #define NE_U KC_A // U #define NE_I KC_S // I @@ -74,7 +66,6 @@ #define NE_D KC_SCLN // D #define NE_Y KC_QUOT // Y #define NE_L3R KC_NUHS // (layer 3) -// Row 4 #define NE_L4L KC_NUBS // (layer 4) #define NE_UDIA KC_Z // Ü #define NE_ODIA KC_X // Ö @@ -86,5 +77,4 @@ #define NE_COMM KC_COMM // , #define NE_DOT KC_DOT // . #define NE_J KC_SLSH // J -// Row 5 #define NE_L4R KC_ALGR // (layer 4) diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h index 55a58a25b0..36f1cc4c2f 100644 --- a/quantum/keymap_extras/keymap_nordic.h +++ b/quantum/keymap_extras/keymap_nordic.h @@ -1,38 +1,43 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" +// clang-format off -// Normal characters -#define NO_HALF KC_GRV +// Aliases +#define NO_HALF KC_GRV #define NO_PLUS KC_MINS -#define NO_ACUT KC_EQL - -#define NO_AM KC_LBRC +#define NO_ACUT KC_EQL +#define NO_AM KC_LBRC #define NO_QUOT KC_RBRC // this is the "umlaut" char on Nordic keyboards, Apple layout -#define NO_AE KC_SCLN +#define NO_AE KC_SCLN #define NO_OSLH KC_QUOT #define NO_APOS KC_NUHS - #define NO_LESS KC_NUBS #define NO_MINS KC_SLSH - -// Shifted characters #define NO_SECT LSFT(NO_HALF) #define NO_QUO2 LSFT(KC_2) #define NO_BULT LSFT(KC_4) @@ -40,29 +45,23 @@ #define NO_SLSH LSFT(KC_7) #define NO_LPRN LSFT(KC_8) #define NO_RPRN LSFT(KC_9) -#define NO_EQL LSFT(KC_0) +#define NO_EQL LSFT(KC_0) #define NO_QUES LSFT(NO_PLUS) -#define NO_GRV LSFT(NO_ACUT) - +#define NO_GRV LSFT(NO_ACUT) #define NO_CIRC LSFT(NO_QUOT) - #define NO_GRTR LSFT(NO_LESS) #define NO_SCLN LSFT(KC_COMM) #define NO_COLN LSFT(KC_DOT) #define NO_UNDS LSFT(NO_MINS) - -// Alt Gr-ed characters -#define NO_AT ALGR(KC_2) -#define NO_PND ALGR(KC_3) -#define NO_DLR ALGR(KC_4) -#define NO_LCBR ALGR(KC_7) -#define NO_LBRC ALGR(KC_8) -#define NO_RBRC ALGR(KC_9) -#define NO_RCBR ALGR(KC_0) +#define NO_AT ALGR(KC_2) +#define NO_PND ALGR(KC_3) +#define NO_DLR ALGR(KC_4) +#define NO_LCBR ALGR(KC_7) +#define NO_LBRC ALGR(KC_8) +#define NO_RBRC ALGR(KC_9) +#define NO_RCBR ALGR(KC_0) #define NO_PIPE ALGR(KC_NUBS) - -#define NO_EURO ALGR(KC_E) +#define NO_EURO ALGR(KC_E) #define NO_TILD ALGR(NO_QUOT) - #define NO_BSLS ALGR(KC_MINS) -#define NO_MU ALGR(KC_M) +#define NO_MU ALGR(KC_M) diff --git a/quantum/keymap_extras/keymap_norman.h b/quantum/keymap_extras/keymap_norman.h index 9f20f66873..6096ac6bff 100644 --- a/quantum/keymap_extras/keymap_norman.h +++ b/quantum/keymap_extras/keymap_norman.h @@ -1,39 +1,33 @@ -/* Copyright 2019 Torben Hoffmann - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ D │ F │ K │ J │ U │ R │ L │ ; │ [ │ ] │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ A │ S │ E │ T │ G │ Y │ N │ I │ O │ H │ ' │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Z │ X │ C │ V │ B │ P │ M │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define NM_GRV KC_GRV // ` #define NM_1 KC_1 // 1 #define NM_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define NM_0 KC_0 // 0 #define NM_MINS KC_MINS // - #define NM_EQL KC_EQL // = -// Row 2 #define NM_Q KC_Q // Q #define NM_W KC_W // W #define NM_D KC_E // D @@ -61,7 +54,6 @@ #define NM_LBRC KC_LBRC // [ #define NM_RBRC KC_RBRC // ] #define NM_BSLS KC_BSLS // (backslash) -// Row 3 #define NM_A KC_A // A #define NM_S KC_S // S #define NM_E KC_D // E @@ -73,7 +65,6 @@ #define NM_O KC_L // O #define NM_H KC_SCLN // H #define NM_QUOT KC_QUOT // ' -// Row 4 #define NM_Z KC_Z // Z #define NM_X KC_X // X #define NM_C KC_C // C @@ -84,21 +75,6 @@ #define NM_COMM KC_COMM // , #define NM_DOT KC_DOT // . #define NM_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define NM_TILD S(NM_GRV) // ~ #define NM_EXLM S(NM_1) // ! #define NM_AT S(NM_2) // @ @@ -112,14 +88,11 @@ #define NM_RPRN S(NM_0) // ) #define NM_UNDS S(NM_MINS) // _ #define NM_PLUS S(NM_EQL) // + -// Row 2 #define NM_COLN S(NM_SCLN) // : #define NM_LCBR S(NM_LBRC) // { #define NM_RCBR S(NM_RBRC) // } #define NM_PIPE S(NM_BSLS) // | -// Row 3 #define NM_DQUO S(NM_QUOT) // " -// Row 4 #define NM_LABK S(NM_COMM) // < #define NM_RABK S(NM_DOT) // > #define NM_QUES S(NM_SLSH) // ? diff --git a/quantum/keymap_extras/keymap_norwegian.h b/quantum/keymap_extras/keymap_norwegian.h index b2499f4fda..45b0c1c56e 100644 --- a/quantum/keymap_extras/keymap_norwegian.h +++ b/quantum/keymap_extras/keymap_norwegian.h @@ -1,39 +1,33 @@ -/* Copyright 2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ | │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define NO_PIPE KC_GRV // | #define NO_1 KC_1 // 1 #define NO_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define NO_0 KC_0 // 0 #define NO_PLUS KC_MINS // + #define NO_BSLS KC_EQL // (backslash) -// Row 2 #define NO_Q KC_Q // Q #define NO_W KC_W // W #define NO_E KC_E // E @@ -60,7 +53,6 @@ #define NO_P KC_P // P #define NO_ARNG KC_LBRC // Å #define NO_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define NO_A KC_A // A #define NO_S KC_S // S #define NO_D KC_D // D @@ -73,7 +65,6 @@ #define NO_OSTR KC_SCLN // Ø #define NO_AE KC_QUOT // Æ #define NO_QUOT KC_NUHS // ' -// Row 4 #define NO_LABK KC_NUBS // < #define NO_Z KC_Z // Z #define NO_X KC_X // X @@ -85,21 +76,6 @@ #define NO_COMM KC_COMM // , #define NO_DOT KC_DOT // . #define NO_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define NO_SECT S(NO_PIPE) // § #define NO_EXLM S(NO_1) // ! #define NO_DQUO S(NO_2) // " @@ -113,30 +89,12 @@ #define NO_EQL S(NO_0) // = #define NO_QUES S(NO_PLUS) // ? #define NO_GRV S(NO_BSLS) // ` (dead) -// Row 2 #define NO_CIRC S(NO_DIAE) // ^ (dead) -// Row 3 #define NO_ASTR S(NO_QUOT) // * -// Row 4 #define NO_RABK S(NO_LABK) // > #define NO_SCLN S(NO_COMM) // ; #define NO_COLN S(NO_DOT) // : #define NO_UNDS S(NO_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ │ ´ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ µ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define NO_AT ALGR(NO_2) // @ #define NO_PND ALGR(NO_3) // £ #define NO_DLR ALGR(NO_4) // $ @@ -146,7 +104,5 @@ #define NO_RBRC ALGR(NO_9) // ] #define NO_RCBR ALGR(NO_0) // } #define NO_ACUT ALGR(NO_BSLS) // ´ (dead) -// Row 2 #define NO_TILD ALGR(NO_DIAE) // ~ (dead) -// Row 4 #define NO_MICR ALGR(NO_M) // µ diff --git a/quantum/keymap_extras/keymap_plover.h b/quantum/keymap_extras/keymap_plover.h index cd07211bca..fbeee4fc49 100644 --- a/quantum/keymap_extras/keymap_plover.h +++ b/quantum/keymap_extras/keymap_plover.h @@ -1,65 +1,53 @@ -/* Copyright 2016 James Kay - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │Num│ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ S │ T │ P │ H │ │ * │ F │ P │ L │ T │ D │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ K │ W │ R │ │ │ R │ B │ G │ S │ Z │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ A │ O │ │ E │ U │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 -#define PV_NUM KC_1 - -// Row 2 -#define PV_LS KC_Q -#define PV_LT KC_W -#define PV_LP KC_E -#define PV_LH KC_R -#define PV_STAR KC_Y -#define PV_RF KC_U -#define PV_RP KC_I -#define PV_RL KC_O -#define PV_RT KC_P +// Aliases +#define PV_NUM KC_1 +#define PV_LS KC_Q +#define PV_LT KC_W +#define PV_LP KC_E +#define PV_LH KC_R +#define PV_STAR KC_Y +#define PV_RF KC_U +#define PV_RP KC_I +#define PV_RL KC_O +#define PV_RT KC_P #define PV_RD KC_LBRC - -// Row 3 -#define PV_LK KC_S -#define PV_LW KC_D -#define PV_LR KC_F -#define PV_RR KC_J -#define PV_RB KC_K -#define PV_RG KC_L +#define PV_LK KC_S +#define PV_LW KC_D +#define PV_LR KC_F +#define PV_RR KC_J +#define PV_RB KC_K +#define PV_RG KC_L #define PV_RS KC_SCLN #define PV_RZ KC_QUOT - -// Row 4 -#define PV_A KC_C -#define PV_O KC_V -#define PV_E KC_N -#define PV_U KC_M +#define PV_A KC_C +#define PV_O KC_V +#define PV_E KC_N +#define PV_U KC_M diff --git a/quantum/keymap_extras/keymap_plover_dvorak.h b/quantum/keymap_extras/keymap_plover_dvorak.h index 445a123151..282ef9848b 100644 --- a/quantum/keymap_extras/keymap_plover_dvorak.h +++ b/quantum/keymap_extras/keymap_plover_dvorak.h @@ -1,45 +1,53 @@ -/* Copyright 2016 James Kay - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "keymap_dvorak.h" +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ -#define PD_NUM DV_1 -#define PD_LS DV_Q -#define PD_LT DV_W -#define PD_LP DV_E -#define PD_LH DV_R -#define PD_LK DV_S -#define PD_LW DV_D -#define PD_LR DV_F - -#define PD_STAR DV_Y -#define PD_RF DV_U -#define PD_RP DV_I -#define PD_RL DV_O -#define PD_RT DV_P -#define PD_RD DV_LBRC -#define PD_RR DV_J -#define PD_RB DV_K -#define PD_RG DV_L -#define PD_RS DV_SCLN -#define PD_RZ DV_QUOT +#pragma once +#include "keymap.h" +// clang-format off -#define PD_A DV_C -#define PD_O DV_V -#define PD_E DV_N -#define PD_U DV_M +// Aliases +#define PD_NUM DV_1 +#define PD_LS DV_Q +#define PD_LT DV_W +#define PD_LP DV_E +#define PD_LH DV_R +#define PD_LK DV_S +#define PD_LW DV_D +#define PD_LR DV_F +#define PD_STAR DV_Y +#define PD_RF DV_U +#define PD_RP DV_I +#define PD_RL DV_O +#define PD_RT DV_P +#define PD_RD DV_LBRC +#define PD_RR DV_J +#define PD_RB DV_K +#define PD_RG DV_L +#define PD_RS DV_SCLN +#define PD_RZ DV_QUOT +#define PD_A DV_C +#define PD_O DV_V +#define PD_E DV_N +#define PD_U DV_M diff --git a/quantum/keymap_extras/keymap_polish.h b/quantum/keymap_extras/keymap_polish.h index e5a32f22db..84cb9cc1b3 100644 --- a/quantum/keymap_extras/keymap_polish.h +++ b/quantum/keymap_extras/keymap_polish.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define PL_GRV KC_GRV // ` #define PL_1 KC_1 // 1 #define PL_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define PL_0 KC_0 // 0 #define PL_MINS KC_MINS // - #define PL_EQL KC_EQL // = -// Row 2 #define PL_Q KC_Q // Q #define PL_W KC_W // W #define PL_E KC_E // E @@ -61,7 +54,6 @@ #define PL_LBRC KC_LBRC // [ #define PL_RBRC KC_RBRC // ] #define PL_BSLS KC_BSLS // (backslash) -// Row 3 #define PL_A KC_A // A #define PL_S KC_S // S #define PL_D KC_D // D @@ -73,7 +65,6 @@ #define PL_L KC_L // L #define PL_SCLN KC_SCLN // ; #define PL_QUOT KC_QUOT // ' -// Row 4 #define PL_Z KC_Z // Z #define PL_X KC_X // X #define PL_C KC_C // C @@ -84,21 +75,6 @@ #define PL_COMM KC_COMM // , #define PL_DOT KC_DOT // . #define PL_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define PL_TILD S(PL_GRV) // ~ #define PL_EXLM S(PL_1) // ! #define PL_AT S(PL_2) // @ @@ -112,41 +88,21 @@ #define PL_RPRN S(PL_0) // ) #define PL_UNDS S(PL_MINS) // _ #define PL_PLUS S(PL_EQL) // + -// Row 2 #define PL_LCBR S(PL_LBRC) // { #define PL_RCBR S(PL_RBRC) // } #define PL_PIPE S(PL_BSLS) // | -// Row 3 #define PL_COLN S(PL_SCLN) // : #define PL_DQUO S(PL_QUOT) // " -// Row 4 #define PL_LABK S(PL_COMM) // < #define PL_RABK S(PL_DOT) // > #define PL_QUES S(PL_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ Ę │ │ │ │ € │ │ Ó │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ Ą │ Ś │ │ │ │ │ │ │ Ł │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Ż │ Ź │ Ć │ │ │ Ń │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 2 -#define PL_EOGO ALGR(PL_E) // Ę -#define PL_EURO ALGR(PL_U) // € -#define PL_OACU ALGR(PL_O) // Ó -// Row 3 -#define PL_AOGO ALGR(PL_A) // Ą -#define PL_SACU ALGR(PL_S) // Ś -#define PL_LSTR ALGR(PL_L) // Ł -// Row 4 -#define PL_ZDOT ALGR(PL_Z) // Ż -#define PL_ZACU ALGR(PL_X) // Ź -#define PL_CACU ALGR(PL_C) // Ć -#define PL_NACU ALGR(PL_N) // Ń +#define PL_EOGO ALGR(PL_E) // Ę +#define PL_EURO ALGR(PL_U) // € +#define PL_OACU ALGR(PL_O) // Ó +#define PL_AOGO ALGR(PL_A) // Ą +#define PL_SACU ALGR(PL_S) // Ś +#define PL_LSTR ALGR(PL_L) // Ł +#define PL_ZDOT ALGR(PL_Z) // Ż +#define PL_ZACU ALGR(PL_X) // Ź +#define PL_CACU ALGR(PL_C) // Ć +#define PL_NACU ALGR(PL_N) // Ń diff --git a/quantum/keymap_extras/keymap_portuguese.h b/quantum/keymap_extras/keymap_portuguese.h index 19d7dcd817..6e55838f8d 100644 --- a/quantum/keymap_extras/keymap_portuguese.h +++ b/quantum/keymap_extras/keymap_portuguese.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ \ │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define PT_BSLS KC_GRV // (backslash) #define PT_1 KC_1 // 1 #define PT_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define PT_0 KC_0 // 0 #define PT_QUOT KC_MINS // ' #define PT_LDAQ KC_EQL // « -// Row 2 #define PT_Q KC_Q // Q #define PT_W KC_W // W #define PT_E KC_E // E @@ -60,7 +53,6 @@ #define PT_P KC_P // P #define PT_PLUS KC_LBRC // + #define PT_ACUT KC_RBRC // ´ (dead) -// Row 3 #define PT_A KC_A // A #define PT_S KC_S // S #define PT_D KC_D // D @@ -73,7 +65,6 @@ #define PT_CCED KC_SCLN // Ç #define PT_MORD KC_QUOT // º #define PT_TILD KC_NUHS // ~ (dead) -// Row 4 #define PT_LABK KC_NUBS // < #define PT_Z KC_Z // Z #define PT_X KC_X // X @@ -85,21 +76,6 @@ #define PT_COMM KC_COMM // , #define PT_DOT KC_DOT // . #define PT_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ | │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ » │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ * │ ` │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ª │ ^ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define PT_PIPE S(PT_BSLS) // | #define PT_EXLM S(PT_1) // ! #define PT_DQUO S(PT_2) // " @@ -113,32 +89,14 @@ #define PT_EQL S(PT_0) // = #define PT_QUES S(PT_QUOT) // ? #define PT_RDAQ S(PT_LDAQ) // » -// Row 2 #define PT_ASTR S(PT_PLUS) // * #define PT_GRV S(PT_ACUT) // ` (dead) -// Row 3 #define PT_FORD S(PT_MORD) // ª #define PT_CIRC S(PT_TILD) // ^ (dead) -// Row 4 #define PT_RABK S(PT_LABK) // > #define PT_SCLN S(PT_COMM) // ; #define PT_COLN S(PT_DOT) // : #define PT_UNDS S(PT_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ @ │ £ │ § │ │ │ { │ [ │ ] │ } │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ ¨ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define PT_AT ALGR(PT_2) // @ #define PT_PND ALGR(PT_3) // £ #define PT_SECT ALGR(PT_4) // § @@ -146,6 +104,5 @@ #define PT_LBRC ALGR(PT_8) // [ #define PT_RBRC ALGR(PT_9) // ] #define PT_RCBR ALGR(PT_0) // } -// Row 2 #define PT_DIAE ALGR(PT_PLUS) // ¨ (dead) #define PT_EURO ALGR(PT_E) // € diff --git a/quantum/keymap_extras/keymap_portuguese_mac_iso.h b/quantum/keymap_extras/keymap_portuguese_mac_iso.h index 78346af285..65a74ee86c 100644 --- a/quantum/keymap_extras/keymap_portuguese_mac_iso.h +++ b/quantum/keymap_extras/keymap_portuguese_mac_iso.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ § │ 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 │ , │ . │ - │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define PT_SECT KC_GRV // § #define PT_1 KC_1 // 1 #define PT_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define PT_0 KC_0 // 0 #define PT_QUOT KC_MINS // ' #define PT_PLUS KC_EQL // + -// Row 2 #define PT_Q KC_Q // Q #define PT_W KC_W // W #define PT_E KC_E // E @@ -60,7 +53,6 @@ #define PT_P KC_P // P #define PT_MORD KC_LBRC // º #define PT_ACUT KC_RBRC // ´ (dead) -// Row 3 #define PT_A KC_A // A #define PT_S KC_S // S #define PT_D KC_D // D @@ -73,7 +65,6 @@ #define PT_CCED KC_SCLN // Ç #define PT_TILD KC_QUOT // ~ (dead) #define PT_BSLS KC_NUHS // (backslash) -// Row 4 #define PT_LABK KC_NUBS // < #define PT_Z KC_Z // Z #define PT_X KC_X // X @@ -85,21 +76,6 @@ #define PT_COMM KC_COMM // , #define PT_DOT KC_DOT // . #define PT_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ± │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ª │ ` │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ | │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define PT_PLMN S(PT_SECT) // ± #define PT_EXLM S(PT_1) // ! #define PT_DQUO S(PT_2) // " @@ -113,32 +89,14 @@ #define PT_EQL S(PT_0) // = #define PT_QUES S(PT_QUOT) // ? #define PT_ASTR S(PT_PLUS) // * -// Row 2 #define PT_FORD S(PT_MORD) // ª #define PT_GRV S(PT_ACUT) // ` (dead) -// Row 3 #define PT_CIRC S(PT_TILD) // ^ (dead) #define PT_PIPE S(PT_BSLS) // | -// Row 4 #define PT_RABK S(PT_LABK) // > #define PT_SCLN S(PT_COMM) // ; #define PT_COLN S(PT_DOT) // : #define PT_UNDS S(PT_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ │  │ @ │ € │ £ │ ‰ │ ¶ │ ÷ │ [ │ ] │ ≠ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ Œ │ ∑ │ Æ │ ® │ ™ │ ¥ │ † │ ı │ Ø │ π │ ° │ ¨ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Å │ ß │ ∂ │ ƒ │ ˙ │ ˇ │ ¯ │ „ │ ‘ │ ¸ │ ˜ │ ‹ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≤ │ Ω │ « │ © │ √ │ ∫ │ ¬ │ µ │ “ │ … │ — │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define PT_APPL A(PT_1) //  (Apple logo) #define PT_AT A(PT_2) // @ #define PT_EURO A(PT_3) // € @@ -149,7 +107,6 @@ #define PT_LBRC A(PT_8) // [ #define PT_RBRC A(PT_9) // ] #define PT_NEQL A(PT_0) // ≠ -// Row 2 #define PT_OE A(PT_Q) // Œ #define PT_NARS A(PT_W) // ∑ #define PT_AE A(PT_E) // Æ @@ -162,7 +119,6 @@ #define PT_PI A(PT_P) // π #define PT_DEG A(PT_MORD) // ° #define PT_DIAE A(PT_ACUT) // ¨ (dead) -// Row 3 #define PT_ARNG A(PT_A) // å #define PT_SS A(PT_S) // ß #define PT_PDIF A(PT_D) // ∂ @@ -175,7 +131,6 @@ #define PT_CEDL A(PT_CCED) // ¸ #define PT_STIL A(PT_TILD) // ˜ (dead) #define PT_LSAQ A(PT_BSLS) // ‹ -// Row 4 #define PT_LTEQ A(PT_LABK) // ≤ #define PT_OMEG A(PT_Z) // Ω #define PT_LDAQ A(PT_X) // « @@ -187,21 +142,6 @@ #define PT_LDQU A(PT_COMM) // “ #define PT_ELLP A(PT_DOT) // … #define PT_MDSH A(PT_MINS) // — - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ │ ¡ │ fi │ fl │ ¢ │ ∞ │ • │ ⁄ │ { │ } │ ≈ │ ¿ │ ◊ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ ‡ │ ˚ │ │ ∏ │ │ ˝ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ ∆ │ │ │ │ │ ‚ │ ’ │ ˛ │ ˆ │ › │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≥ │ │ » │ │ │ │ │ │ ” │ · │ – │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define PT_IEXL S(A(PT_1)) // ¡ #define PT_FI S(A(PT_2)) // fi #define PT_FL S(A(PT_3)) // fl @@ -214,19 +154,16 @@ #define PT_AEQL S(A(PT_0)) // ≈ #define PT_IQUE S(A(PT_QUOT)) // ¿ #define PT_LOZN S(A(PT_PLUS)) // ◊ -// Row 2 #define PT_DDAG S(A(PT_U)) // ‡ #define PT_RNGA S(A(PT_I)) // ˚ #define PT_NARP S(A(PT_P)) // ∏ #define PT_DACU S(A(PT_ACUT)) // ˝ -// Row 3 #define PT_INCR S(A(PT_D)) // ∆ #define PT_SLQU S(A(PT_K)) // ‚ #define PT_RSQU S(A(PT_L)) // ’ #define PT_OGON S(A(PT_CCED)) // ˛ #define PT_DCIR S(A(PT_TILD)) // ˆ (dead) #define PT_RSAQ S(A(PT_BSLS)) // › -// Row 4 #define PT_GTEQ S(A(PT_LABK)) // ≥ #define PT_RDAQ S(A(PT_X)) // » #define PT_RDQU S(A(PT_COMM)) // ” diff --git a/quantum/keymap_extras/keymap_romanian.h b/quantum/keymap_extras/keymap_romanian.h index 27086d684c..01552b3e32 100644 --- a/quantum/keymap_extras/keymap_romanian.h +++ b/quantum/keymap_extras/keymap_romanian.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ „ │ 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 │ , │ . │ / │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define RO_DLQU KC_GRV // „ #define RO_1 KC_1 // 1 #define RO_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define RO_0 KC_0 // 0 #define RO_MINS KC_MINS // - #define RO_EQL KC_EQL // = -// Row 2 #define RO_Q KC_Q // Q #define RO_W KC_W // W #define RO_E KC_E // E @@ -60,7 +53,6 @@ #define RO_P KC_P // P #define RO_ABRV KC_LBRC // Ă #define RO_ICIR KC_RBRC // Î -// Row 3 #define RO_A KC_A // A #define RO_S KC_S // S #define RO_D KC_D // D @@ -73,7 +65,6 @@ #define RO_SCOM KC_SCLN // Ș #define RO_TCOM KC_QUOT // Ț #define RO_ACIR KC_NUHS //  -// Row 4 #define RO_BSLS KC_NUBS // (backslash) #define RO_Z KC_Z // Z #define RO_X KC_X // X @@ -85,21 +76,6 @@ #define RO_COMM KC_COMM // , #define RO_DOT KC_DOT // . #define RO_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ” │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ │ ; │ : │ ? │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RO_RDQU S(RO_DLQU) // ” #define RO_EXLM S(RO_1) // ! #define RO_AT S(RO_2) // @ @@ -113,26 +89,10 @@ #define RO_RPRN S(RO_0) // ) #define RO_UNDS S(RO_MINS) // _ #define RO_PLUS S(RO_EQL) // + -// Row 4 #define RO_PIPE S(RO_BSLS) // | #define RO_SCLN S(RO_COMM) // ; #define RO_COLN S(RO_DOT) // : #define RO_QUES S(RO_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ ¨ │ ¸ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ § │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ ß │ Đ │ │ │ │ │ │ Ł │ │ ' │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ © │ │ │ │ │ < │ > │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RO_GRV ALGR(RO_DLQU) // ` #define RO_DTIL ALGR(RO_1) // ~ (dead) #define RO_CARN ALGR(RO_2) // ˇ (dead) @@ -146,43 +106,22 @@ #define RO_DACU ALGR(RO_0) // ˝ (dead) #define RO_DIAE ALGR(RO_MINS) // ¨ (dead) #define RO_CEDL ALGR(RO_EQL) // ¸ (dead) -// Row 2 #define RO_EURO ALGR(RO_E) // € #define RO_SECT ALGR(RO_P) // § #define RO_LBRC ALGR(RO_ABRV) // [ #define RO_RBRC ALGR(RO_ICIR) // ] -// Row 3 #define RO_SS ALGR(RO_S) // ß #define RO_DSTR ALGR(RO_D) // Đ #define RO_LSTR ALGR(RO_L) // Ł #define RO_QUOT ALGR(RO_TCOM) // ' -// Row 4 #define RO_COPY ALGR(RO_C) // © #define RO_LABK ALGR(RO_COMM) // < #define RO_RABK ALGR(RO_DOT) // > - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ │ │ │ │ │ │ │ │ │ │ – │ ± │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ « │ » │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RO_TILD S(ALGR(RO_DLQU)) // ~ #define RO_NDSH S(ALGR(RO_MINS)) // – #define RO_PLMN S(ALGR(RO_EQL)) // ± -// Row 2 #define RO_LCBR S(ALGR(RO_ABRV)) // { #define RO_RCBR S(ALGR(RO_ICIR)) // } -// Row 3 #define RO_DQUO S(ALGR(RO_TCOM)) // " -// Row 4 #define RO_LDAQ S(ALGR(RO_COMM)) // « #define RO_RDAQ S(ALGR(RO_DOT)) // » diff --git a/quantum/keymap_extras/keymap_russian.h b/quantum/keymap_extras/keymap_russian.h index 71aece677d..03978de5fb 100644 --- a/quantum/keymap_extras/keymap_russian.h +++ b/quantum/keymap_extras/keymap_russian.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ Ё │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Й │ Ц │ У │ К │ Е │ Н │ Г │ Ш │ Щ │ З │ Х │ Ъ │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ Ф │ Ы │ В │ А │ П │ Р │ О │ Л │ Д │ Ж │ Э │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Я │ Ч │ С │ М │ И │ Т │ Ь │ Б │ Ю │ . │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define RU_YO KC_GRV // Ё #define RU_1 KC_1 // 1 #define RU_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define RU_0 KC_0 // 0 #define RU_MINS KC_MINS // - #define RU_EQL KC_EQL // = -// Row 2 #define RU_SHTI KC_Q // Й #define RU_TSE KC_W // Ц #define RU_U KC_E // У @@ -61,7 +54,6 @@ #define RU_HA KC_LBRC // Х #define RU_HARD KC_RBRC // Ъ #define RU_BSLS KC_BSLS // (backslash) -// Row 3 #define RU_EF KC_A // Ф #define RU_YERU KC_S // Ы #define RU_VE KC_D // В @@ -73,7 +65,6 @@ #define RU_DE KC_L // Д #define RU_ZHE KC_SCLN // Ж #define RU_E KC_QUOT // Э -// Row 4 #define RU_YA KC_Z // Я #define RU_CHE KC_X // Ч #define RU_ES KC_C // С @@ -84,21 +75,6 @@ #define RU_BE KC_COMM // Б #define RU_YU KC_DOT // Ю #define RU_DOT KC_SLSH // . - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ! │ " │ № │ ; │ % │ : │ ? │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ / │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ │ │ , │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RU_EXLM S(RU_1) // ! #define RU_DQUO S(RU_2) // " #define RU_NUM S(RU_3) // № @@ -111,23 +87,6 @@ #define RU_RPRN S(RU_0) // ) #define RU_UNDS S(RU_MINS) // _ #define RU_PLUS S(RU_EQL) // + -// Row 2 #define RU_SLSH S(RU_BSLS) // / -// Row 4 #define RU_COMM S(RU_DOT) // , - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ │ │ │ │ ₽ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 -#define RU_RUBL ALGR(RU_8) // ₽ +#define RU_RUBL ALGR(RU_8) // ₽ diff --git a/quantum/keymap_extras/keymap_serbian.h b/quantum/keymap_extras/keymap_serbian.h index a17dcc5f34..ff6b4dad02 100644 --- a/quantum/keymap_extras/keymap_serbian.h +++ b/quantum/keymap_extras/keymap_serbian.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Љ │ Њ │ Е │ Р │ Т │ З │ У │ И │ О │ П │ Ш │ Ђ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ А │ С │ Д │ Ф │ Г │ Х │ Ј │ К │ Л │ Ч │ Ћ │ Ж │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Ѕ │ Џ │ Ц │ В │ Б │ Н │ М │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define RS_GRV KC_GRV // ` #define RS_1 KC_1 // 1 #define RS_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define RS_0 KC_0 // 0 #define RS_QUOT KC_MINS // ' (dead) #define RS_PLUS KC_EQL // + -// Row 2 #define RS_LJE KC_Q // Љ #define RS_NJE KC_W // Њ #define RS_IE KC_E // Е @@ -60,7 +53,6 @@ #define RS_PE KC_P // П #define RS_SHA KC_LBRC // Ш #define RS_DJE KC_RBRC // Ђ -// Row 3 #define RS_A KC_A // А #define RS_ES KC_S // С #define RS_DE KC_D // Д @@ -73,7 +65,6 @@ #define RS_CHE KC_SCLN // Ч #define RS_TSHE KC_QUOT // Ћ #define RS_ZHE KC_NUHS // Ж -// Row 4 #define RS_LABK KC_NUBS // < #define RS_DZE KC_Z // Ѕ #define RS_DZHE KC_X // Џ @@ -85,21 +76,6 @@ #define RS_COMM KC_COMM // , #define RS_DOT KC_DOT // . #define RS_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RS_TILD S(RS_GRV) // ~ #define RS_EXLM S(RS_1) // ! #define RS_DQUO S(RS_2) // " @@ -113,24 +89,8 @@ #define RS_EQL S(RS_0) // = #define RS_QUES S(RS_QUOT) // ? #define RS_ASTR S(RS_PLUS) // * -// Row 4 #define RS_RABK S(RS_LABK) // > #define RS_SCLN S(RS_COMM) // ; #define RS_COLN S(RS_DOT) // : #define RS_UNDS S(RS_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 2 #define RS_EURO ALGR(RS_IE) // € diff --git a/quantum/keymap_extras/keymap_serbian_latin.h b/quantum/keymap_extras/keymap_serbian_latin.h index 13c82eb405..56d468c0cf 100644 --- a/quantum/keymap_extras/keymap_serbian_latin.h +++ b/quantum/keymap_extras/keymap_serbian_latin.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ‚ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define RS_SLQU KC_GRV // ‚ (dead) #define RS_1 KC_1 // 1 #define RS_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define RS_0 KC_0 // 0 #define RS_QUOT KC_MINS // ' #define RS_PLUS KC_EQL // + -// Row 2 #define RS_Q KC_Q // Q #define RS_W KC_W // W #define RS_E KC_E // E @@ -60,7 +53,6 @@ #define RS_P KC_P // P #define RS_SCAR KC_LBRC // Š #define RS_DSTR KC_RBRC // Đ -// Row 3 #define RS_A KC_A // A #define RS_S KC_S // S #define RS_D KC_D // D @@ -73,7 +65,6 @@ #define RS_CCAR KC_SCLN // Č #define RS_CACU KC_QUOT // Ć #define RS_ZCAR KC_NUHS // Ž -// Row 4 #define RS_LABK KC_NUBS // < #define RS_Y KC_Z // Y #define RS_X KC_X // X @@ -85,21 +76,6 @@ #define RS_COMM KC_COMM // , #define RS_DOT KC_DOT // . #define RS_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RS_TILD S(RS_SLQU) // ~ #define RS_EXLM S(RS_1) // ! #define RS_DQUO S(RS_2) // " @@ -113,26 +89,10 @@ #define RS_EQL S(RS_0) // = #define RS_QUES S(RS_QUOT) // ? #define RS_ASTR S(RS_PLUS) // * -// Row 4 #define RS_RABK S(RS_LABK) // > #define RS_SCLN S(RS_COMM) // ; #define RS_COLN S(RS_DOT) // : #define RS_UNDS S(RS_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ ¨ │ ¸ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define RS_CARN ALGR(RS_2) // ˇ (dead) #define RS_CIRC ALGR(RS_3) // ^ (dead) #define RS_BREV ALGR(RS_4) // ˘ (dead) @@ -144,20 +104,17 @@ #define RS_DACU ALGR(RS_0) // ˝ (dead) #define RS_DIAE ALGR(RS_QUOT) // ¨ (dead) #define RS_CEDL ALGR(RS_PLUS) // ¸ (dead) -// Row 2 #define RS_BSLS ALGR(RS_Q) // (backslash) #define RS_PIPE ALGR(RS_W) // | #define RS_EURO ALGR(RS_E) // € #define RS_DIV ALGR(RS_SCAR) // ÷ #define RS_MUL ALGR(RS_DSTR) // × -// Row 3 #define RS_LBRC ALGR(RS_F) // [ #define RS_RBRC ALGR(RS_G) // ] #define RS_LLST ALGR(RS_K) // ł #define RS_CLST ALGR(RS_L) // Ł #define RS_SS ALGR(RS_CACU) // ß #define RS_CURR ALGR(RS_ZCAR) // ¤ -// Row 4 #define RS_AT ALGR(RS_V) // @ #define RS_LCBR ALGR(RS_B) // { #define RS_RCBR ALGR(RS_N) // } diff --git a/quantum/keymap_extras/keymap_slovak.h b/quantum/keymap_extras/keymap_slovak.h index bf0b7275ce..5cdf74fb40 100644 --- a/quantum/keymap_extras/keymap_slovak.h +++ b/quantum/keymap_extras/keymap_slovak.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ; │ + │ ľ │ š │ č │ ť │ ž │ ý │ á │ í │ é │ = │ ´ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ä │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ô │ § │ ň │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ & │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define SK_SCLN KC_GRV // ; #define SK_PLUS KC_1 // + #define SK_LCAR KC_2 // ľ @@ -47,7 +41,6 @@ #define SK_EACU KC_0 // é #define SK_EQL KC_MINS // = #define SK_ACUT KC_EQL // ´ (dead) -// Row 2 #define SK_Q KC_Q // Q #define SK_W KC_W // W #define SK_E KC_E // E @@ -60,7 +53,6 @@ #define SK_P KC_P // P #define SK_UACU KC_LBRC // ú #define SK_ADIA KC_RBRC // ä -// Row 3 #define SK_A KC_A // A #define SK_S KC_S // S #define SK_D KC_D // D @@ -73,7 +65,6 @@ #define SK_OCIR KC_SCLN // ô #define SK_SECT KC_QUOT // § #define SK_NCAR KC_NUHS // ň -// Row 4 #define SK_AMPR KC_NUBS // & #define SK_Y KC_Z // Y #define SK_X KC_X // X @@ -85,21 +76,6 @@ #define SK_COMM KC_COMM // , #define SK_DOT KC_DOT // . #define SK_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ " │ ! │ ) │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ * │ │ │ │ │ │ │ │ ? │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define SK_RNGA S(SK_SCLN) // ° (dead) #define SK_1 S(SK_PLUS) // 1 #define SK_2 S(SK_LCAR) // 2 @@ -113,33 +89,15 @@ #define SK_0 S(SK_EACU) // 0 #define SK_PERC S(SK_EQL) // % #define SK_CARN S(SK_ACUT) // ˇ (dead) -// Row 2 #define SK_SLSH S(SK_UACU) // / #define SK_LPRN S(SK_ADIA) // ( -// Row 3 #define SK_DQUO S(SK_OCIR) // " #define SK_EXLM S(SK_SECT) // ! #define SK_RPRN S(SK_NCAR) // ) -// Row 4 #define SK_ASTR S(SK_AMPR) // * #define SK_QUES S(SK_COMM) // ? #define SK_COLN S(SK_DOT) // : #define SK_UNDS S(SK_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ~ │ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ │ ˝ │ ¨ │ ¸ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ \ │ | │ € │ │ │ │ │ │ │ ' │ ÷ │ × │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ đ │ Đ │ [ │ ] │ │ │ ł │ Ł │ $ │ ß │ ¤ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ > │ # │ │ @ │ { │ } │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define SK_TILD ALGR(SK_PLUS) // ~ #define SK_CIRC ALGR(SK_SCAR) // ^ (dead) #define SK_BREV ALGR(SK_CCAR) // ˘ (dead) @@ -149,14 +107,12 @@ #define SK_DACU ALGR(SK_EACU) // ˝ (dead) #define SK_DIAE ALGR(SK_EQL) // ¨ (dead) #define SK_CEDL ALGR(SK_ACUT) // ¸ (dead) -// Row 2 #define SK_BSLS ALGR(SK_Q) // (backslash) #define SK_PIPE ALGR(SK_W) // | #define SK_EURO ALGR(SK_E) // € #define SK_QUOT ALGR(SK_P) // ' #define SK_DIV ALGR(SK_UACU) // ÷ #define SK_MUL ALGR(SK_ADIA) // × -// Row 3 #define SK_LDST ALGR(SK_S) // đ #define SK_CDST ALGR(SK_D) // Đ #define SK_LBRC ALGR(SK_F) // [ @@ -166,7 +122,6 @@ #define SK_DLR ALGR(SK_OCIR) // $ #define SK_SS ALGR(SK_SECT) // ß #define SK_CURR ALGR(SK_NCAR) // ¤ -// Row 4 #define SK_LABK ALGR(SK_AMPR) // < #define SK_RABK ALGR(SK_Y) // > #define SK_HASH ALGR(SK_X) // # diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h index 827fa06c25..bd864c0e55 100644 --- a/quantum/keymap_extras/keymap_slovenian.h +++ b/quantum/keymap_extras/keymap_slovenian.h @@ -1,39 +1,33 @@ -/* Copyright 2018 Žan Pevec - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¸ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ Š │ Đ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Č │ Ć │ Ž │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define SI_CEDL KC_GRV // ¸ (dead) #define SI_1 KC_1 // 1 #define SI_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define SI_0 KC_0 // 0 #define SI_QUOT KC_MINS // ' #define SI_PLUS KC_EQL // + -// Row 2 #define SI_Q KC_Q // Q #define SI_W KC_W // W #define SI_E KC_E // E @@ -60,7 +53,6 @@ #define SI_P KC_P // P #define SI_SCAR KC_LBRC // Š #define SI_DSTR KC_RBRC // Đ -// Row 3 #define SI_A KC_A // A #define SI_S KC_S // S #define SI_D KC_D // D @@ -73,7 +65,6 @@ #define SI_CCAR KC_SCLN // Č #define SI_CACU KC_QUOT // Ć #define SI_ZCAR KC_NUHS // Ž -// Row 4 #define SI_LABK KC_NUBS // < #define SI_Y KC_Z // Y #define SI_X KC_X // X @@ -85,21 +76,6 @@ #define SI_COMM KC_COMM // , #define SI_DOT KC_DOT // . #define SI_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¨ │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ * │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define SI_DIAE S(SI_CEDL) // ¨ (dead) #define SI_EXLM S(SI_1) // ! #define SI_DQUO S(SI_2) // " @@ -113,26 +89,10 @@ #define SI_EQL S(SI_0) // = #define SI_QUES S(SI_QUOT) // ? #define SI_ASTR S(SI_PLUS) // * -// Row 4 #define SI_RABK S(SI_LABK) // > #define SI_SCLN S(SI_COMM) // ; #define SI_COLN S(SI_DOT) // : #define SI_UNDS S(SI_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ~ │ ˇ │ ^ │ ˘ │ ° │ ˛ │ ` │ ˙ │ ´ │ ˝ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ \ │ | │ € │ │ │ │ │ │ │ │ ÷ │ × │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ [ │ ] │ │ │ ł │ Ł │ │ ß │ ¤ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ @ │ { │ } │ § │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define SI_TILD ALGR(SI_1) // ~ #define SI_CARN ALGR(SI_2) // ˇ (dead) #define SI_CIRC ALGR(SI_3) // ^ (dead) @@ -143,20 +103,17 @@ #define SI_DOTA ALGR(SI_8) // ˙ (dead) #define SI_ACUT ALGR(SI_9) // ´ (dead) #define SI_DACU ALGR(SI_0) // ˝ (dead) -// Row 2 #define SI_BSLS ALGR(SI_Q) // (backslash) #define SI_PIPE ALGR(SI_W) // | #define SI_EURO ALGR(SI_E) // € #define SI_DIV ALGR(SI_SCAR) // ÷ #define SI_MUL ALGR(SI_DSTR) // × -// Row 3 #define SI_LBRC ALGR(SI_F) // [ #define SI_RBRC ALGR(SI_G) // ] #define SI_LLST ALGR(SI_K) // ł #define SI_CLST ALGR(SI_L) // Ł #define SI_SS ALGR(SI_CACU) // ß #define SI_CURR ALGR(SI_ZCAR) // ¤ -// Row 4 #define SI_AT ALGR(SI_V) // @ #define SI_LCBR ALGR(SI_B) // { #define SI_RCBR ALGR(SI_N) // } diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h index 8432c56e99..ffdb3f14d3 100644 --- a/quantum/keymap_extras/keymap_spanish.h +++ b/quantum/keymap_extras/keymap_spanish.h @@ -1,39 +1,33 @@ -/* Copyright 2015-2016 Jack Humbert - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ º │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define ES_MORD KC_GRV // º #define ES_1 KC_1 // 1 #define ES_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define ES_0 KC_0 // 0 #define ES_QUOT KC_MINS // ' #define ES_IEXL KC_EQL // ¡ -// Row 2 #define ES_Q KC_Q // Q #define ES_W KC_W // W #define ES_E KC_E // E @@ -60,7 +53,6 @@ #define ES_P KC_P // P #define ES_GRV KC_LBRC // ` (dead) #define ES_PLUS KC_RBRC // + -// Row 3 #define ES_A KC_A // A #define ES_S KC_S // S #define ES_D KC_D // D @@ -73,7 +65,6 @@ #define ES_NTIL KC_SCLN // Ñ #define ES_ACUT KC_QUOT // ´ (dead) #define ES_CCED KC_NUHS // Ç -// Row 4 #define ES_LABK KC_NUBS // < #define ES_Z KC_Z // Z #define ES_X KC_X // X @@ -85,21 +76,6 @@ #define ES_COMM KC_COMM // , #define ES_DOT KC_DOT // . #define ES_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ª │ ! │ " │ · │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¿ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ^ │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define ES_FORD S(ES_MORD) // ª #define ES_EXLM S(ES_1) // ! #define ES_DQUO S(ES_2) // " @@ -113,31 +89,13 @@ #define ES_EQL S(ES_0) // = #define ES_QUES S(ES_QUOT) // ? #define ES_IQUE S(ES_IEXL) // ¿ -// Row 2 #define ES_CIRC S(ES_GRV) // ^ (dead) #define ES_ASTR S(ES_PLUS) // * -// Row 3 #define ES_DIAE S(ES_ACUT) // ¨ (dead) -// Row 4 #define ES_RABK S(ES_LABK) // > #define ES_SCLN S(KC_COMM) // ; #define ES_COLN S(KC_DOT) // : #define ES_UNDS S(ES_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ \ │ | │ @ │ # │ ~ │ € │ ¬ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define ES_BSLS ALGR(ES_MORD) // (backslash) #define ES_PIPE ALGR(ES_1) // | #define ES_AT ALGR(ES_2) // @ @@ -145,9 +103,7 @@ #define ES_TILD ALGR(ES_4) // ~ #define ES_EURO ALGR(ES_5) // € #define ES_NOT ALGR(ES_6) // ¬ -// Row 2 #define ES_LBRC ALGR(ES_GRV) // [ #define ES_RBRC ALGR(ES_PLUS) // ] -// Row 3 #define ES_LCBR ALGR(ES_ACUT) // { #define ES_RCBR ALGR(ES_CCED) // } diff --git a/quantum/keymap_extras/keymap_spanish_dvorak.h b/quantum/keymap_extras/keymap_spanish_dvorak.h index ea0c93f86a..b7dfce923e 100644 --- a/quantum/keymap_extras/keymap_spanish_dvorak.h +++ b/quantum/keymap_extras/keymap_spanish_dvorak.h @@ -1,39 +1,33 @@ -/* Copyright 2020 José Andrés García - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ º │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ¡ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ . │ , │ Ñ │ P │ Y │ F │ G │ C │ H │ L │ ` │ + │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ O │ E │ U │ I │ D │ R │ T │ N │ S │ ´ │ Ç │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ - │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define DV_MORD KC_GRV // º #define DV_1 KC_1 // 1 #define DV_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define DV_0 KC_0 // 0 #define DV_QUOT KC_MINS // ' #define DV_IEXL KC_EQL // ¡ -// Row 2 #define DV_DOT KC_Q // . #define DV_COMM KC_W // , #define DV_NTIL KC_E // Ñ @@ -60,7 +53,6 @@ #define DV_L KC_P // L #define DV_GRV KC_LBRC // ` (dead) #define DV_PLUS KC_RBRC // + -// Row 3 #define DV_A KC_A // A #define DV_O KC_S // O #define DV_E KC_D // E @@ -73,7 +65,6 @@ #define DV_S KC_SCLN // S #define DV_ACUT KC_QUOT // ´ (dead) #define DV_CCED KC_NUHS // Ç -// Row 4 #define DV_LABK KC_NUBS // < #define DV_MINS KC_Z // - #define DV_Q KC_X // Q @@ -85,21 +76,6 @@ #define DV_W KC_COMM // W #define DV_V KC_DOT // V #define DV_Z KC_SLSH // Z - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ª │ ! │ " │ · │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¿ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ : │ ; │ │ │ │ │ │ │ │ │ ^ │ * │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ ¨ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ _ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DV_FORD S(DV_MORD) // ª #define DV_EXLM S(DV_1) // ! #define DV_DQUO S(DV_2) // " @@ -113,31 +89,13 @@ #define DV_EQL S(DV_0) // = #define DV_QUES S(DV_QUOT) // ? #define DV_IQUE S(DV_IEXL) // ¿ -// Row 2 #define DV_COLN S(DV_DOT) // : #define DV_SCLN S(DV_COMM) // ; #define DV_CIRC S(DV_GRV) // ^ (dead) #define DV_ASTR S(DV_PLUS) // * -// Row 3 #define DV_DIAE S(DV_ACUT) // ¨ (dead) -// Row 4 #define DV_RABK S(DV_LABK) // > #define DV_UNDS S(DV_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ \ │ | │ @ │ # │ ~ │ € │ ¬ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define DV_BSLS ALGR(DV_MORD) // (backslash) #define DV_PIPE ALGR(DV_1) // | #define DV_AT ALGR(DV_2) // @ @@ -145,9 +103,7 @@ #define DV_TILD ALGR(DV_4) // ~ #define DV_EURO ALGR(DV_5) // € #define DV_NOT ALGR(DV_6) // ¬ -// Row 2 #define DV_LBRC ALGR(DV_GRV) // [ #define DV_RBRC ALGR(DV_PLUS) // ] -// Row 3 #define DV_LCBR ALGR(DV_ACUT) // { #define DV_RCBR ALGR(DV_CCED) // } diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h index 07d96b7465..733446e660 100644 --- a/quantum/keymap_extras/keymap_steno.h +++ b/quantum/keymap_extras/keymap_steno.h @@ -1,119 +1,30 @@ -/* Copyright 2017 Joseph Wasson - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" +// clang-format off -// List of keycodes for the steno keyboard. To prevent -// errors, this must be <= 42 total entries in order to -// support the GeminiPR protocol. -enum steno_keycodes { - STN__MIN = QK_STENO, - STN_FN = STN__MIN, - STN_NUM, - STN_N1 = STN_NUM, - STN_N2, - STN_N3, - STN_N4, - STN_N5, - STN_N6, - STN_SL, - STN_S1 = STN_SL, - STN_S2, - STN_TL, - STN_KL, - STN_PL, - STN_WL, - STN_HL, - STN_RL, - STN_A, - STN_O, - STN_STR, - STN_ST1 = STN_STR, - STN_ST2, - STN_RES1, - STN_RE1 = STN_RES1, - STN_RES2, - STN_RE2 = STN_RES2, - STN_PWR, - STN_ST3, - STN_ST4, - STN_E, - STN_U, - STN_FR, - STN_RR, - STN_PR, - STN_BR, - STN_LR, - STN_GR, - STN_TR, - STN_SR, - STN_DR, - STN_N7, - STN_N8, - STN_N9, - STN_NA, - STN_NB, - STN_NC, - STN_ZR, - STN__MAX = STN_ZR, // must be less than QK_STENO_BOLT -}; - -#ifdef STENO_COMBINEDMAP -enum steno_combined_keycodes { - STN_S3 = QK_STENO_COMB, - STN_TKL, - STN_PWL, - STN_HRL, - STN_FRR, - STN_PBR, - STN_LGR, - STN_TSR, - STN_DZR, - STN_AO, - STN_EU, - STN_COMB_MAX = STN_EU, -}; -#endif - -#ifdef STENO_ENABLE_BOLT -// TxBolt Codes -# define TXB_NUL 0 -# define TXB_S_L 0b00000001 -# define TXB_T_L 0b00000010 -# define TXB_K_L 0b00000100 -# define TXB_P_L 0b00001000 -# define TXB_W_L 0b00010000 -# define TXB_H_L 0b00100000 -# define TXB_R_L 0b01000001 -# define TXB_A_L 0b01000010 -# define TXB_O_L 0b01000100 -# define TXB_STR 0b01001000 -# define TXB_E_R 0b01010000 -# define TXB_U_R 0b01100000 -# define TXB_F_R 0b10000001 -# define TXB_R_R 0b10000010 -# define TXB_P_R 0b10000100 -# define TXB_B_R 0b10001000 -# define TXB_L_R 0b10010000 -# define TXB_G_R 0b10100000 -# define TXB_T_R 0b11000001 -# define TXB_S_R 0b11000010 -# define TXB_D_R 0b11000100 -# define TXB_Z_R 0b11001000 -# define TXB_NUM 0b11010000 -#endif // STENO_ENABLE_BOLT +// Aliases diff --git a/quantum/keymap_extras/keymap_swedish.h b/quantum/keymap_extras/keymap_swedish.h index cadb66d3bd..262ed2bcfc 100644 --- a/quantum/keymap_extras/keymap_swedish.h +++ b/quantum/keymap_extras/keymap_swedish.h @@ -1,39 +1,33 @@ -/* Copyright 2017 Andreas Lindhé - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ 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 │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define SE_SECT KC_GRV // § #define SE_1 KC_1 // 1 #define SE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define SE_0 KC_0 // 0 #define SE_PLUS KC_MINS // + #define SE_ACUT KC_EQL // ´ (dead) -// Row 2 #define SE_Q KC_Q // Q #define SE_W KC_W // W #define SE_E KC_E // E @@ -60,7 +53,6 @@ #define SE_P KC_P // P #define SE_ARNG KC_LBRC // Å #define SE_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define SE_A KC_A // A #define SE_S KC_S // S #define SE_D KC_D // D @@ -73,7 +65,6 @@ #define SE_ODIA KC_SCLN // Ö #define SE_ADIA KC_QUOT // Ä #define SE_QUOT KC_NUHS // ' -// Row 4 #define SE_LABK KC_NUBS // < #define SE_Z KC_Z // Z #define SE_X KC_X // X @@ -85,21 +76,6 @@ #define SE_COMM KC_COMM // , #define SE_DOT KC_DOT // . #define SE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ½ │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define SE_HALF S(SE_SECT) // ½ #define SE_EXLM S(SE_1) // ! #define SE_DQUO S(SE_2) // " @@ -113,30 +89,12 @@ #define SE_EQL S(SE_0) // = #define SE_QUES S(SE_PLUS) // ? #define SE_GRV S(SE_ACUT) // ` (dead) -// Row 2 #define SE_CIRC S(SE_DIAE) // ^ (dead) -// Row 3 #define SE_ASTR S(SE_QUOT) // * -// Row 4 #define SE_RABK S(SE_LABK) // > #define SE_SCLN S(SE_COMM) // ; #define SE_COLN S(SE_DOT) // : #define SE_UNDS S(SE_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ @ │ £ │ $ │ € │ │ { │ [ │ ] │ } │ \ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ | │ │ │ │ │ │ │ µ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define SE_AT ALGR(SE_2) // @ #define SE_PND ALGR(SE_3) // £ #define SE_DLR ALGR(SE_4) // $ @@ -146,11 +104,6 @@ #define SE_RBRC ALGR(SE_9) // ] #define SE_RCBR ALGR(SE_0) // } #define SE_BSLS ALGR(SE_PLUS) // (backslash) -// Row 2 #define SE_TILD ALGR(SE_DIAE) // ~ (dead) -// Row 4 #define SE_PIPE ALGR(SE_LABK) // | #define SE_MICR ALGR(SE_M) // µ - -// DEPRECATED -#include "keymap_nordic.h" diff --git a/quantum/keymap_extras/keymap_swedish_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_mac_ansi.h index 0d0426f866..195d46c980 100644 --- a/quantum/keymap_extras/keymap_swedish_mac_ansi.h +++ b/quantum/keymap_extras/keymap_swedish_mac_ansi.h @@ -1,39 +1,33 @@ -/* Copyright 2021 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ < │ 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 │ , │ . │ - │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define SE_LABK KC_GRV // < #define SE_1 KC_1 // 1 #define SE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define SE_0 KC_0 // 0 #define SE_PLUS KC_MINS // + #define SE_ACUT KC_EQL // ´ (dead) -// Row 2 #define SE_Q KC_Q // Q #define SE_W KC_W // W #define SE_E KC_E // E @@ -61,7 +54,6 @@ #define SE_ARNG KC_LBRC // Å #define SE_DIAE KC_RBRC // ¨ (dead) #define SE_QUOT KC_NUHS // ' -// Row 3 #define SE_A KC_A // A #define SE_S KC_S // S #define SE_D KC_D // D @@ -73,7 +65,6 @@ #define SE_L KC_L // L #define SE_ODIA KC_SCLN // Ö #define SE_ADIA KC_QUOT // Ä -// Row 4 #define SE_Z KC_Z // Z #define SE_X KC_X // X #define SE_C KC_C // C @@ -84,21 +75,6 @@ #define SE_COMM KC_COMM // , #define SE_DOT KC_DOT // . #define SE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ > │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ * │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define SE_RABK S(SE_LABK) // > #define SE_EXLM S(SE_1) // ! #define SE_DQUO S(SE_2) // " @@ -112,29 +88,11 @@ #define SE_EQL S(SE_0) // = #define SE_QUES S(SE_PLUS) // ? #define SE_GRV S(SE_ACUT) // ` -// Row 2 #define SE_CIRC S(SE_DIAE) // ^ (dead) #define SE_ASTR S(SE_QUOT) // * -// Row 4 #define SE_SCLN S(SE_COMM) // ; #define SE_COLN S(SE_DOT) // : #define SE_UNDS S(SE_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ≤ │ © │ ™ │ £ │ $ │ ∞ │ § │ | │ [ │ ] │ ≈ │ ± │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ @ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - * - */ -// Row 1 #define SE_LTEQ A(SE_LABK) // ≤ #define SE_COPY A(SE_1) // © #define SE_TM A(SE_2) // ™ @@ -147,7 +105,6 @@ #define SE_RBRC A(SE_9) // ] #define SE_AEQL A(SE_0) // ≈ #define SE_PLMN A(SE_PLUS) // ± -// Row 2 #define SE_BULT A(SE_Q) // • #define SE_OMEG A(SE_W) // Ω #define SE_EACU A(SE_E) // É @@ -161,7 +118,6 @@ #define SE_DOTA A(SE_ARNG) // ˙ #define SE_TILD A(SE_DIAE) // ~ (dead) #define SE_AT A(SE_QUOT) // @ -// Row 3 #define SE_APPL A(SE_A) //  (Apple logo) #define SE_SS A(SE_S) // ß #define SE_PDIF A(SE_D) // ∂ @@ -173,7 +129,6 @@ #define SE_FI A(SE_L) // fi #define SE_OSTR A(SE_ODIA) // Ø #define SE_AE A(SE_ADIA) // Æ -// Row 4 #define SE_DIV A(SE_Z) // ÷ #define SE_CCED A(SE_C) // Ç #define SE_LSAQ A(SE_V) // ‹ @@ -183,22 +138,6 @@ #define SE_SLQU A(SE_COMM) // ‚ #define SE_ELLP A(SE_DOT) // … #define SE_NDSH A(SE_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ≥ │ ¡ │ │ ¥ │ ¢ │ ‰ │ ¶ │ \ │ { │ } │ ≠ │ ¿ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ ° │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - * - */ -// Row 1 #define SE_GTEQ S(A(SE_LABK)) // ≥ #define SE_IEXL S(A(SE_1)) // ¡ #define SE_YEN S(A(SE_3)) // ¥ @@ -210,7 +149,6 @@ #define SE_RCBR S(A(SE_9)) // } #define SE_NEQL S(A(SE_0)) // ≠ #define SE_IQUE S(A(SE_PLUS)) // ¿ -// Row 2 #define SE_DEG S(A(SE_Q)) // ° #define SE_DACU S(A(SE_W)) // ˝ #define SE_DDAG S(A(SE_T)) // ‡ @@ -218,7 +156,6 @@ #define SE_DCIR S(A(SE_I)) // ˆ #define SE_NARP S(A(SE_P)) // ∏ #define SE_RNGA S(A(SE_ARNG)) // ˚ -// Row 3 #define SE_LOZN S(A(SE_A)) // ◊ #define SE_NARS S(A(SE_S)) // ∑ #define SE_INCR S(A(SE_D)) // ∆ @@ -228,7 +165,6 @@ #define SE_NOT S(A(SE_J)) // ¬ #define SE_MORD S(A(SE_K)) // º #define SE_FL S(A(SE_L)) // fl -// Row 4 #define SE_FRSL S(A(SE_Z)) // ⁄ #define SE_CARN S(A(SE_X)) // ˇ #define SE_LDAQ S(A(SE_V)) // « diff --git a/quantum/keymap_extras/keymap_swedish_mac_iso.h b/quantum/keymap_extras/keymap_swedish_mac_iso.h index ab155530ae..06c3470b3b 100644 --- a/quantum/keymap_extras/keymap_swedish_mac_iso.h +++ b/quantum/keymap_extras/keymap_swedish_mac_iso.h @@ -1,39 +1,33 @@ -/* Copyright 2021 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ § │ 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 │ , │ . │ - │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define SE_SECT KC_GRV // § #define SE_1 KC_1 // 1 #define SE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define SE_0 KC_0 // 0 #define SE_PLUS KC_MINS // + #define SE_ACUT KC_EQL // ´ (dead) -// Row 2 #define SE_Q KC_Q // Q #define SE_W KC_W // W #define SE_E KC_E // E @@ -60,7 +53,6 @@ #define SE_P KC_P // P #define SE_ARNG KC_LBRC // Å #define SE_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define SE_A KC_A // A #define SE_S KC_S // S #define SE_D KC_D // D @@ -73,7 +65,6 @@ #define SE_ODIA KC_SCLN // Ö #define SE_ADIA KC_QUOT // Ä #define SE_QUOT KC_NUHS // ' -// Row 4 #define SE_LABK KC_NUBS // < #define SE_Z KC_Z // Z #define SE_X KC_X // X @@ -85,22 +76,7 @@ #define SE_COMM KC_COMM // , #define SE_DOT KC_DOT // . #define SE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ° │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 -#define SE_DEG S(SE_SECT) // ° +#define SE_DEG S(SE_SECT) // ° #define SE_EXLM S(SE_1) // ! #define SE_DQUO S(SE_2) // " #define SE_HASH S(SE_3) // # @@ -113,30 +89,12 @@ #define SE_EQL S(SE_0) // = #define SE_QUES S(SE_PLUS) // ? #define SE_GRV S(SE_ACUT) // ` -// Row 2 #define SE_CIRC S(SE_DIAE) // ^ (dead) -// Row 3 #define SE_ASTR S(SE_QUOT) // * -// Row 4 #define SE_RABK S(SE_LABK) // > #define SE_SCLN S(SE_COMM) // ; #define SE_COLN S(SE_DOT) // : #define SE_UNDS S(SE_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ¶ │ © │ ™ │ £ │ $ │ ∞ │ │ | │ [ │ ] │ ≈ │ ± │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ @ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≤ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define SE_PILC A(SE_SECT) // ¶ #define SE_COPY A(SE_1) // © #define SE_TM A(SE_2) // ™ @@ -148,7 +106,6 @@ #define SE_RBRC A(SE_9) // ] #define SE_AEQL A(SE_0) // ≈ #define SE_PLMN A(SE_PLUS) // ± -// Row 2 #define SE_BULT A(SE_Q) // • #define SE_OMEG A(SE_W) // Ω #define SE_EACU A(SE_E) // É @@ -161,7 +118,6 @@ #define SE_PI A(SE_P) // π #define SE_DOTA A(SE_ARNG) // ˙ #define SE_TILD A(SE_DIAE) // ~ (dead) -// Row 3 #define SE_APPL A(SE_A) //  (Apple logo) #define SE_SS A(SE_S) // ß #define SE_PDIF A(SE_D) // ∂ @@ -174,7 +130,6 @@ #define SE_OSTR A(SE_ODIA) // Ø #define SE_AE A(SE_ADIA) // Æ #define SE_AT A(SE_QUOT) // @ -// Row 4 #define SE_LTEQ A(SE_LABK) // ≤ #define SE_DIV A(SE_Z) // ÷ #define SE_CCED A(SE_C) // Ç @@ -185,21 +140,6 @@ #define SE_SLQU A(SE_COMM) // ‚ #define SE_ELLP A(SE_DOT) // … #define SE_NDSH A(SE_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ │ ¡ │ ” │ ¥ │ ¢ │ ‰ │ │ \ │ { │ } │ ≠ │ ¿ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≥ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define SE_IEXL S(A(SE_1)) // ¡ #define SE_YEN S(A(SE_3)) // ¥ #define SE_CENT S(A(SE_4)) // ¢ @@ -209,14 +149,12 @@ #define SE_RCBR S(A(SE_9)) // } #define SE_NEQL S(A(SE_0)) // ≠ #define SE_IQUE S(A(SE_PLUS)) // ¿ -// Row 2 #define SE_DACU S(A(SE_W)) // ˝ #define SE_DDAG S(A(SE_T)) // ‡ #define SE_STIL S(A(SE_Y)) // ˜ #define SE_DCIR S(A(SE_I)) // ˆ #define SE_NARP S(A(SE_P)) // ∏ #define SE_RNGA S(A(SE_ARNG)) // ˚ -// Row 3 #define SE_LOZN S(A(SE_A)) // ◊ #define SE_NARS S(A(SE_S)) // ∑ #define SE_INCR S(A(SE_D)) // ∆ @@ -226,7 +164,6 @@ #define SE_NOT S(A(SE_J)) // ¬ #define SE_MORD S(A(SE_K)) // º #define SE_FL S(A(SE_L)) // fl -// Row 4 #define SE_GTEQ S(A(SE_LABK)) // ≥ #define SE_FRSL S(A(SE_Z)) // ⁄ #define SE_CARN S(A(SE_X)) // ˇ diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h index 9b44517625..4d4d7fcd81 100644 --- a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h +++ b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h @@ -1,39 +1,33 @@ -/* Copyright 2021 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ < │ 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 │ , │ . │ - │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define SE_LABK KC_GRV // < #define SE_1 KC_1 // 1 #define SE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define SE_0 KC_0 // 0 #define SE_PLUS KC_MINS // + #define SE_ACUT KC_EQL // ´ (dead) -// Row 2 #define SE_Q KC_Q // Q #define SE_W KC_W // W #define SE_E KC_E // E @@ -61,7 +54,6 @@ #define SE_ARNG KC_LBRC // Å #define SE_DIAE KC_RBRC // ¨ (dead) #define SE_QUOT KC_NUHS // ' -// Row 3 #define SE_A KC_A // A #define SE_S KC_S // S #define SE_D KC_D // D @@ -73,7 +65,6 @@ #define SE_L KC_L // L #define SE_ODIA KC_SCLN // Ö #define SE_ADIA KC_QUOT // Ä -// Row 4 #define SE_Z KC_Z // Z #define SE_X KC_X // X #define SE_C KC_C // C @@ -84,21 +75,6 @@ #define SE_COMM KC_COMM // , #define SE_DOT KC_DOT // . #define SE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ > │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ * │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define SE_RABK S(SE_LABK) // > #define SE_EXLM S(SE_1) // ! #define SE_DQUO S(SE_2) // " @@ -112,29 +88,11 @@ #define SE_EQL S(SE_0) // = #define SE_QUES S(SE_PLUS) // ? #define SE_GRV S(SE_ACUT) // ` -// Row 2 #define SE_CIRC S(SE_DIAE) // ^ (dead) #define SE_ASTR S(SE_QUOT) // * -// Row 4 #define SE_SCLN S(SE_COMM) // ; #define SE_COLN S(SE_DOT) // : #define SE_UNDS S(SE_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ≤ │ © │ @ │ £ │ $ │ ∞ │ § │ | │ [ │ ] │ ≈ │ ± │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ ™ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - * - */ -// Row 1 #define SE_LTEQ A(SE_LABK) // ≤ #define SE_COPY A(SE_1) // © #define SE_AT A(SE_2) // @ @@ -147,7 +105,6 @@ #define SE_RBRC A(SE_9) // ] #define SE_AEQL A(SE_0) // ≈ #define SE_PLMN A(SE_PLUS) // ± -// Row 2 #define SE_BULT A(SE_Q) // • #define SE_OMEG A(SE_W) // Ω #define SE_EACU A(SE_E) // É @@ -161,7 +118,6 @@ #define SE_DOTA A(SE_ARNG) // ˙ #define SE_TILD A(SE_DIAE) // ~ (dead) #define SE_TM A(SE_QUOT) // ™ -// Row 3 #define SE_APPL A(SE_A) //  (Apple logo) #define SE_SS A(SE_S) // ß #define SE_PDIF A(SE_D) // ∂ @@ -173,7 +129,6 @@ #define SE_FI A(SE_L) // fi #define SE_OSTR A(SE_ODIA) // Ø #define SE_AE A(SE_ADIA) // Æ -// Row 4 #define SE_DIV A(SE_Z) // ÷ #define SE_CCED A(SE_C) // Ç #define SE_LSAQ A(SE_V) // ‹ @@ -183,22 +138,6 @@ #define SE_SLQU A(SE_COMM) // ‚ #define SE_ELLP A(SE_DOT) // … #define SE_NDSH A(SE_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ≥ │ ¡ │ │ ¥ │ ¢ │ ‰ │ ¶ │ \ │ { │ } │ ≠ │ ¿ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ ° │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ - * │ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ - * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - * - */ -// Row 1 #define SE_GTEQ S(A(SE_LABK)) // ≥ #define SE_IEXL S(A(SE_1)) // ¡ #define SE_YEN S(A(SE_3)) // ¥ @@ -210,7 +149,6 @@ #define SE_RCBR S(A(SE_9)) // } #define SE_NEQL S(A(SE_0)) // ≠ #define SE_IQUE S(A(SE_PLUS)) // ¿ -// Row 2 #define SE_DEG S(A(SE_Q)) // ° #define SE_DACU S(A(SE_W)) // ˝ #define SE_DDAG S(A(SE_T)) // ‡ @@ -218,7 +156,6 @@ #define SE_DCIR S(A(SE_I)) // ˆ #define SE_NARP S(A(SE_P)) // ∏ #define SE_RNGA S(A(SE_ARNG)) // ˚ -// Row 3 #define SE_LOZN S(A(SE_A)) // ◊ #define SE_NARS S(A(SE_S)) // ∑ #define SE_INCR S(A(SE_D)) // ∆ @@ -228,7 +165,6 @@ #define SE_NOT S(A(SE_J)) // ¬ #define SE_MORD S(A(SE_K)) // º #define SE_FL S(A(SE_L)) // fl -// Row 4 #define SE_FRSL S(A(SE_Z)) // ⁄ #define SE_CARN S(A(SE_X)) // ˇ #define SE_LDAQ S(A(SE_V)) // « diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h index f2d6605865..ea43ed5c12 100644 --- a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h +++ b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h @@ -1,39 +1,33 @@ -/* Copyright 2021 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ § │ 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 │ , │ . │ - │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 +// Aliases #define SE_SECT KC_GRV // § #define SE_1 KC_1 // 1 #define SE_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define SE_0 KC_0 // 0 #define SE_PLUS KC_MINS // + #define SE_ACUT KC_EQL // ´ (dead) -// Row 2 #define SE_Q KC_Q // Q #define SE_W KC_W // W #define SE_E KC_E // E @@ -60,7 +53,6 @@ #define SE_P KC_P // P #define SE_ARNG KC_LBRC // Å #define SE_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define SE_A KC_A // A #define SE_S KC_S // S #define SE_D KC_D // D @@ -73,7 +65,6 @@ #define SE_ODIA KC_SCLN // Ö #define SE_ADIA KC_QUOT // Ä #define SE_QUOT KC_NUHS // ' -// Row 4 #define SE_LABK KC_NUBS // < #define SE_Z KC_Z // Z #define SE_X KC_X // X @@ -85,22 +76,7 @@ #define SE_COMM KC_COMM // , #define SE_DOT KC_DOT // . #define SE_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ° │ ! │ " │ # │ € │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ^ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 -#define SE_DEG S(SE_SECT) // ° +#define SE_DEG S(SE_SECT) // ° #define SE_EXLM S(SE_1) // ! #define SE_DQUO S(SE_2) // " #define SE_HASH S(SE_3) // # @@ -113,30 +89,12 @@ #define SE_EQL S(SE_0) // = #define SE_QUES S(SE_PLUS) // ? #define SE_GRV S(SE_ACUT) // ` -// Row 2 #define SE_CIRC S(SE_DIAE) // ^ (dead) -// Row 3 #define SE_ASTR S(SE_QUOT) // * -// Row 4 #define SE_RABK S(SE_LABK) // > #define SE_SCLN S(SE_COMM) // ; #define SE_COLN S(SE_DOT) // : #define SE_UNDS S(SE_MINS) // _ - -/* Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ ¶ │ © │ @ │ £ │ $ │ ∞ │ │ | │ [ │ ] │ ≈ │ ± │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ • │ Ω │ É │ ® │ † │ µ │ Ü │ ı │ Œ │ π │ ˙ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │  │ ß │ ∂ │ ƒ │ ¸ │ ˛ │ √ │ ª │ fi │ Ø │ Æ │ ™ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≤ │ ÷ │ │ Ç │ ‹ │ › │ ‘ │ ’ │ ‚ │ … │ – │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define SE_PILC A(SE_SECT) // ¶ #define SE_COPY A(SE_1) // © #define SE_AT A(SE_2) // @ @@ -148,7 +106,6 @@ #define SE_RBRC A(SE_9) // ] #define SE_AEQL A(SE_0) // ≈ #define SE_PLMN A(SE_PLUS) // ± -// Row 2 #define SE_BULT A(SE_Q) // • #define SE_OMEG A(SE_W) // Ω #define SE_EACU A(SE_E) // É @@ -161,7 +118,6 @@ #define SE_PI A(SE_P) // π #define SE_DOTA A(SE_ARNG) // ˙ #define SE_TILD A(SE_DIAE) // ~ (dead) -// Row 3 #define SE_APPL A(SE_A) //  (Apple logo) #define SE_SS A(SE_S) // ß #define SE_PDIF A(SE_D) // ∂ @@ -174,7 +130,6 @@ #define SE_OSTR A(SE_ODIA) // Ø #define SE_AE A(SE_ADIA) // Æ #define SE_TM A(SE_QUOT) // ™ -// Row 4 #define SE_LTEQ A(SE_LABK) // ≤ #define SE_DIV A(SE_Z) // ÷ #define SE_CCED A(SE_C) // Ç @@ -185,21 +140,6 @@ #define SE_SLQU A(SE_COMM) // ‚ #define SE_ELLP A(SE_DOT) // … #define SE_NDSH A(SE_MINS) // – - -/* Shift+Alted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │ │ ¡ │ ” │ ¥ │ ¢ │ ‰ │ │ \ │ { │ } │ ≠ │ ¿ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ - * │ │ │ ˝ │ │ │ ‡ │ ˜ │ │ ˆ │ │ ∏ │ ˚ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ ◊ │ ∑ │ ∆ │ ∫ │ ¯ │ ˘ │ ¬ │ º │ fl │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ - * │ │ ≥ │ ⁄ │ ˇ │ │ « │ » │ “ │ ” │ „ │ · │ — │ │ - * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ - * │ │ │ │ │ │ │ │ - * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ - */ -// Row 1 #define SE_IEXL S(A(SE_1)) // ¡ #define SE_YEN S(A(SE_3)) // ¥ #define SE_CENT S(A(SE_4)) // ¢ @@ -209,14 +149,12 @@ #define SE_RCBR S(A(SE_9)) // } #define SE_NEQL S(A(SE_0)) // ≠ #define SE_IQUE S(A(SE_PLUS)) // ¿ -// Row 2 #define SE_DACU S(A(SE_W)) // ˝ #define SE_DDAG S(A(SE_T)) // ‡ #define SE_STIL S(A(SE_Y)) // ˜ #define SE_DCIR S(A(SE_I)) // ˆ #define SE_NARP S(A(SE_P)) // ∏ #define SE_RNGA S(A(SE_ARNG)) // ˚ -// Row 3 #define SE_LOZN S(A(SE_A)) // ◊ #define SE_NARS S(A(SE_S)) // ∑ #define SE_INCR S(A(SE_D)) // ∆ @@ -226,7 +164,6 @@ #define SE_NOT S(A(SE_J)) // ¬ #define SE_MORD S(A(SE_K)) // º #define SE_FL S(A(SE_L)) // fl -// Row 4 #define SE_GTEQ S(A(SE_LABK)) // ≥ #define SE_FRSL S(A(SE_Z)) // ⁄ #define SE_CARN S(A(SE_X)) // ˇ diff --git a/quantum/keymap_extras/keymap_swiss_de.h b/quantum/keymap_extras/keymap_swiss_de.h index 6723836870..366d85d3d4 100644 --- a/quantum/keymap_extras/keymap_swiss_de.h +++ b/quantum/keymap_extras/keymap_swiss_de.h @@ -1,44 +1,33 @@ -/* Copyright 2016 heartsekai - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -#ifdef CH_H -// The ChibiOS ch.h file defines this... -# undef CH_H -#endif - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ^ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ü │ ¨ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ö │ ä │ $ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define CH_SECT KC_GRV // § #define CH_1 KC_1 // 1 #define CH_2 KC_2 // 2 @@ -52,7 +41,6 @@ #define CH_0 KC_0 // 0 #define CH_QUOT KC_MINS // ' #define CH_CIRC KC_EQL // ^ (dead) -// Row 2 #define CH_Q KC_Q // Q #define CH_W KC_W // W #define CH_E KC_E // E @@ -65,7 +53,6 @@ #define CH_P KC_P // P #define CH_UDIA KC_LBRC // ü #define CH_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define CH_A KC_A // A #define CH_S KC_S // S #define CH_D KC_D // D @@ -78,7 +65,6 @@ #define CH_ODIA KC_SCLN // ö #define CH_ADIA KC_QUOT // ä #define CH_DLR KC_NUHS // $ -// Row 4 #define CH_LABK KC_NUBS // < #define CH_Y KC_Z // Y #define CH_X KC_X // X @@ -90,21 +76,6 @@ #define CH_COMM KC_COMM // , #define CH_DOT KC_DOT // . #define CH_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ + │ " │ * │ ç │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ è │ ! │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ é │ à │ £ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CH_DEG S(CH_SECT) // ° #define CH_PLUS S(CH_1) // + #define CH_DQUO S(CH_2) // " @@ -118,33 +89,15 @@ #define CH_EQL S(CH_0) // = #define CH_QUES S(CH_QUOT) // ? #define CH_GRV S(CH_CIRC) // ` (dead) -// Row 2 #define CH_EGRV S(CH_UDIA) // è #define CH_EXLM S(CH_DIAE) // ! -// Row 3 #define CH_EACU S(CH_ODIA) // é #define CH_AGRV S(CH_ADIA) // à #define CH_PND S(CH_DLR) // £ -// Row 4 #define CH_RABK S(CH_LABK) // > #define CH_SCLN S(CH_COMM) // ; #define CH_COLN S(CH_DOT) // : #define CH_UNDS S(CH_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ¦ │ @ │ # │ │ │ ¬ │ | │ ¢ │ │ │ ´ │ ~ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ \ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CH_BRKP ALGR(CH_1) // ¦ #define CH_AT ALGR(CH_2) // @ #define CH_HASH ALGR(CH_3) // # @@ -153,12 +106,9 @@ #define CH_CENT ALGR(CH_8) // ¢ #define CH_ACUT ALGR(CH_QUOT) // ´ (dead) #define CH_TILD ALGR(CH_CIRC) // ~ (dead) -// Row 2 #define CH_EURO ALGR(CH_E) // € #define CH_LBRC ALGR(CH_UDIA) // [ #define CH_RBRC ALGR(CH_DIAE) // ] -// Row 3 #define CH_LCBR ALGR(CH_ADIA) // { #define CH_RCBR ALGR(CH_DLR) // } -// Row 4 #define CH_BSLS ALGR(CH_LABK) // (backslash) diff --git a/quantum/keymap_extras/keymap_swiss_fr.h b/quantum/keymap_extras/keymap_swiss_fr.h index b1f2455a68..49fd4a0458 100644 --- a/quantum/keymap_extras/keymap_swiss_fr.h +++ b/quantum/keymap_extras/keymap_swiss_fr.h @@ -1,44 +1,33 @@ -/* Copyright 2016 Vincent Pochet - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -#ifdef CH_H -// The ChibiOS ch.h file defines this... -# undef CH_H -#endif - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ § │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ^ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ è │ ¨ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ é │ à │ $ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define CH_SECT KC_GRV // § #define CH_1 KC_1 // 1 #define CH_2 KC_2 // 2 @@ -52,7 +41,6 @@ #define CH_0 KC_0 // 0 #define CH_QUOT KC_MINS // ' #define CH_CIRC KC_EQL // ^ (dead) -// Row 2 #define CH_Q KC_Q // Q #define CH_W KC_W // W #define CH_E KC_E // E @@ -65,7 +53,6 @@ #define CH_P KC_P // P #define CH_EGRV KC_LBRC // è #define CH_DIAE KC_RBRC // ¨ (dead) -// Row 3 #define CH_A KC_A // A #define CH_S KC_S // S #define CH_D KC_D // D @@ -78,7 +65,6 @@ #define CH_EACU KC_SCLN // é #define CH_AGRV KC_QUOT // à #define CH_DLR KC_NUHS // $ -// Row 4 #define CH_LABK KC_NUBS // < #define CH_Y KC_Z // Y #define CH_X KC_X // X @@ -90,21 +76,6 @@ #define CH_COMM KC_COMM // , #define CH_DOT KC_DOT // . #define CH_MINS KC_SLSH // - - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ° │ + │ " │ * │ ç │ % │ & │ / │ ( │ ) │ = │ ? │ ` │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ü │ ! │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ ö │ ä │ £ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ ; │ : │ _ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CH_DEG S(CH_SECT) // ° #define CH_PLUS S(CH_1) // + #define CH_DQUO S(CH_2) // " @@ -118,33 +89,15 @@ #define CH_EQL S(CH_0) // = #define CH_QUES S(CH_QUOT) // ? #define CH_GRV S(CH_CIRC) // ` (dead) -// Row 2 #define CH_UDIA S(CH_EGRV) // ü #define CH_EXLM S(CH_DIAE) // ! -// Row 3 #define CH_ODIA S(CH_EACU) // ö #define CH_ADIA S(CH_AGRV) // ä #define CH_PND S(CH_DLR) // £ -// Row 4 #define CH_RABK S(CH_LABK) // > #define CH_SCLN S(CH_COMM) // ; #define CH_COLN S(CH_DOT) // : #define CH_UNDS S(CH_MINS) // _ - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ¦ │ @ │ # │ │ │ ¬ │ | │ ¢ │ │ │ ´ │ ~ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ € │ │ │ │ │ │ │ │ [ │ ] │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ \ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define CH_BRKP ALGR(CH_1) // ¦ #define CH_AT ALGR(CH_2) // @ #define CH_HASH ALGR(CH_3) // # @@ -153,12 +106,9 @@ #define CH_CENT ALGR(CH_8) // ¢ #define CH_ACUT ALGR(CH_QUOT) // ´ (dead) #define CH_TILD ALGR(CH_CIRC) // ~ (dead) -// Row 2 #define CH_EURO ALGR(CH_E) // € #define CH_LBRC ALGR(CH_EGRV) // [ #define CH_RBRC ALGR(CH_DIAE) // ] -// Row 3 #define CH_LCBR ALGR(CH_AGRV) // { #define CH_RCBR ALGR(CH_DLR) // } -// Row 4 #define CH_BSLS ALGR(CH_LABK) // (backslash) diff --git a/quantum/keymap_extras/keymap_turkish_f.h b/quantum/keymap_extras/keymap_turkish_f.h index aaee2aa480..78dae35ce5 100644 --- a/quantum/keymap_extras/keymap_turkish_f.h +++ b/quantum/keymap_extras/keymap_turkish_f.h @@ -1,39 +1,33 @@ -/* Copyright 2019 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ + │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ / │ - │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ F │ G │ Ğ │ I │ O │ D │ R │ N │ H │ P │ Q │ W │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ U │ İ │ E │ A │ Ü │ T │ K │ M │ L │ Y │ Ş │ X │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ < │ J │ Ö │ V │ C │ Ç │ Z │ S │ B │ . │ , │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define TR_PLUS KC_GRV // + #define TR_1 KC_1 // 1 #define TR_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define TR_0 KC_0 // 0 #define TR_SLSH KC_MINS // / #define TR_MINS KC_EQL // - -// Row 2 #define TR_F KC_Q // F #define TR_G KC_W // G #define TR_GBRV KC_E // Ğ @@ -60,7 +53,6 @@ #define TR_P KC_P // P #define TR_Q KC_LBRC // Q #define TR_W KC_RBRC // W -// Row 3 #define TR_U KC_A // U #define TR_IDOT KC_S // İ #define TR_E KC_D // E @@ -73,7 +65,6 @@ #define TR_Y KC_SCLN // Y #define TR_SCED KC_QUOT // Ş #define TR_X KC_NUHS // X -// Row 4 #define TR_LABK KC_NUBS // < #define TR_J KC_Z // J #define TR_ODIA KC_X // Ö @@ -85,21 +76,6 @@ #define TR_B KC_COMM // B #define TR_DOT KC_DOT // . #define TR_COMM KC_SLSH // , - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ * │ ! │ " │ ^ │ $ │ % │ & │ ' │ ( │ ) │ = │ ? │ _ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ │ : │ ; │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define TR_ASTR S(TR_PLUS) // * #define TR_EXLM S(TR_1) // ! #define TR_DQUO S(TR_2) // " @@ -113,25 +89,9 @@ #define TR_EQL S(TR_0) // = #define TR_QUES S(TR_SLSH) // ? #define TR_UNDS S(TR_MINS) // _ -// Row 4 #define TR_RABK S(TR_LABK) // > #define TR_COLN S(TR_DOT) // : #define TR_SCLN S(TR_COMM) // ; - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ¬ │ ¹ │ ² │ # │ ¼ │ ½ │ ¾ │ { │ [ │ ] │ } │ \ │ | │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ @ │ │ │ ¶ │ │ ¥ │ │ │ Ø │ £ │ ¨ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Æ │ ß │ € │ │ │ ₺ │ │ │ │ ´ │ │ ` │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ « │ » │ ¢ │ │ │ │ µ │ × │ ÷ │ - │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define TR_NOT ALGR(TR_PLUS) // ¬ #define TR_SUP1 ALGR(TR_1) // ¹ #define TR_SUP2 ALGR(TR_2) // ² @@ -145,7 +105,6 @@ #define TR_RCBR ALGR(TR_0) // } #define TR_BSLS ALGR(TR_SLSH) // (backslash) #define TR_PIPE ALGR(TR_MINS) // | -// Row 2 #define TR_AT ALGR(TR_F) // @ #define TR_PILC ALGR(TR_I) // ¶ #define TR_YEN ALGR(TR_D) // ¥ @@ -153,14 +112,12 @@ #define TR_PND ALGR(TR_P) // £ #define TR_DIAE ALGR(TR_Q) // ¨ (dead) #define TR_TILD ALGR(TR_W) // ~ (dead) -// Row 3 #define TR_AE ALGR(TR_U) // Æ #define TR_SS ALGR(TR_IDOT) // ß #define TR_EURO ALGR(TR_E) // € #define TR_LIRA ALGR(TR_T) // ₺ #define TR_ACUT ALGR(TR_Y) // ´ (dead) #define TR_GRV ALGR(TR_X) // ` (dead) -// Row 4 #define TR_LDAQ ALGR(TR_J) // « #define TR_RDAQ ALGR(TR_ODIA) // » #define TR_CENT ALGR(TR_V) // ¢ @@ -168,30 +125,12 @@ #define TR_MUL ALGR(TR_B) // × #define TR_DIV ALGR(TR_DOT) // ÷ #define TR_SHYP ALGR(TR_COMM) // ­ (soft hyphen) - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ ³ │ ¤ │ │ │ │ │ │ │ ¿ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ ® │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ § │ │ ª │ │ │ │ │ │ │ │ │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ ¦ │ │ │ © │ │ │ │ º │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define TR_SUP3 S(ALGR(TR_3)) // ³ #define TR_CURR S(ALGR(TR_4)) // ¤ #define TR_IQUE S(ALGR(TR_SLSH)) // ¿ -// Row 2 #define TR_REGD S(ALGR(TR_I)) // ® -// Row 3 #define TR_SECT S(ALGR(TR_IDOT)) // § #define TR_FORD S(ALGR(TR_A)) // ª -// Row 4 #define TR_BRKP S(ALGR(TR_LABK)) // ¦ #define TR_COPY S(ALGR(TR_V)) // © #define TR_MORD S(ALGR(TR_S)) // º diff --git a/quantum/keymap_extras/keymap_turkish_q.h b/quantum/keymap_extras/keymap_turkish_q.h index 120e2b8d92..9f291df051 100644 --- a/quantum/keymap_extras/keymap_turkish_q.h +++ b/quantum/keymap_extras/keymap_turkish_q.h @@ -1,39 +1,33 @@ -/* Copyright 2019 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ " │ 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 │ Ö │ Ç │ . │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define TR_DQUO KC_GRV // " #define TR_1 KC_1 // 1 #define TR_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define TR_0 KC_0 // 0 #define TR_ASTR KC_MINS // * #define TR_MINS KC_EQL // - -// Row 2 #define TR_Q KC_Q // Q #define TR_W KC_W // W #define TR_E KC_E // E @@ -60,7 +53,6 @@ #define TR_P KC_P // P #define TR_GBRV KC_LBRC // Ğ #define TR_UDIA KC_RBRC // Ü -// Row 3 #define TR_A KC_A // A #define TR_S KC_S // S #define TR_D KC_D // D @@ -73,7 +65,6 @@ #define TR_SCED KC_SCLN // Ş #define TR_IDOT KC_QUOT // İ #define TR_COMM KC_NUHS // , -// Row 4 #define TR_LABK KC_NUBS // < #define TR_Z KC_Z // Z #define TR_X KC_X // X @@ -85,21 +76,6 @@ #define TR_ODIA KC_COMM // Ö #define TR_CCED KC_DOT // Ç #define TR_DOT KC_SLSH // . - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ é │ ! │ ' │ ^ │ + │ % │ & │ / │ ( │ ) │ = │ ? │ _ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ ; │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ > │ │ │ │ │ │ │ │ │ │ : │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define TR_EACU S(TR_DQUO) // é #define TR_EXLM S(TR_1) // ! #define TR_QUOT S(TR_2) // ' @@ -113,26 +89,9 @@ #define TR_EQL S(TR_0) // = #define TR_QUES S(TR_ASTR) // ? #define TR_UNDS S(TR_MINS) // _ -// Row 3 #define TR_SCLN S(TR_COMM) // ; -// Row 4 #define TR_RABK S(TR_LABK) // > #define TR_COLN S(TR_DOT) // : - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ £ │ # │ $ │ ½ │ │ { │ [ │ ] │ } │ \ │ | │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ @ │ │ € │ │ ₺ │ │ │ │ │ │ ¨ │ ~ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ - * │ │ Æ │ ß │ │ │ │ │ │ │ │ ´ │ │ ` │ │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define TR_PND ALGR(TR_2) // £ #define TR_HASH ALGR(TR_3) // # #define TR_DLR ALGR(TR_4) // $ @@ -143,13 +102,11 @@ #define TR_RCBR ALGR(TR_0) // } #define TR_BSLS ALGR(TR_ASTR) // (backslash) #define TR_PIPE ALGR(TR_MINS) // | -// Row 2 #define TR_AT ALGR(TR_Q) // @ #define TR_EURO ALGR(TR_E) // € #define TR_LIRA ALGR(TR_T) // ₺ #define TR_DIAE ALGR(TR_GBRV) // ¨ (dead) #define TR_TILD ALGR(TR_UDIA) // ~ (dead) -// Row 3 #define TR_AE ALGR(TR_A) // Æ #define TR_SS ALGR(TR_S) // ß #define TR_ACUT ALGR(TR_SCED) // ´ (dead) diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h index a6c42eafbf..f527f2bc3d 100644 --- a/quantum/keymap_extras/keymap_uk.h +++ b/quantum/keymap_extras/keymap_uk.h @@ -105,5 +105,3 @@ #define UK_IACU ALGR(KC_I) // Í #define UK_OACU ALGR(KC_O) // Ó #define UK_AACU ALGR(KC_A) // Á - - diff --git a/quantum/keymap_extras/keymap_ukrainian.h b/quantum/keymap_extras/keymap_ukrainian.h index e5cd80f3d2..a83f2dbceb 100644 --- a/quantum/keymap_extras/keymap_ukrainian.h +++ b/quantum/keymap_extras/keymap_ukrainian.h @@ -1,39 +1,33 @@ -/* Copyright 2022 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ' │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Й │ Ц │ У │ К │ Е │ Н │ Г │ Ш │ Щ │ З │ Х │ Ї │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ Ф │ І │ В │ А │ П │ Р │ О │ Л │ Д │ Ж │ Є │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Я │ Ч │ С │ М │ И │ Т │ Ь │ Б │ Ю │ . │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define UA_QUOT KC_GRV // ' #define UA_1 KC_1 // 1 #define UA_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define UA_0 KC_0 // 0 #define UA_MINS KC_MINS // - #define UA_EQL KC_EQL // = -// Row 2 #define UA_YOT KC_Q // Й #define UA_TSE KC_W // Ц #define UA_U KC_E // У @@ -61,7 +54,6 @@ #define UA_KHA KC_LBRC // Х #define UA_YI KC_RBRC // Ї #define UA_BSLS KC_BSLS // (backslash) -// Row 3 #define UA_EF KC_A // Ф #define UA_I KC_S // І #define UA_VE KC_D // В @@ -73,7 +65,6 @@ #define UA_DE KC_L // Д #define UA_ZHE KC_SCLN // Ж #define UA_YE KC_QUOT // Є -// Row 4 #define UA_YA KC_Z // Я #define UA_CHE KC_X // Ч #define UA_ES KC_C // С @@ -84,21 +75,6 @@ #define UA_BE KC_COMM // Б #define UA_YU KC_DOT // Ю #define UA_DOT KC_SLSH // . - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ₴ │ ! │ " │ № │ ; │ % │ : │ ? │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ / │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ │ │ , │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define UA_HRYV S(UA_QUOT) // ₴ #define UA_EXLM S(UA_1) // ! #define UA_DQUO S(UA_2) // " @@ -112,23 +88,6 @@ #define UA_RPRN S(UA_0) // ) #define UA_UNDS S(UA_MINS) // _ #define UA_PLUS S(UA_EQL) // + -// Row 2 #define UA_SLSH S(UA_BSLS) // / -// Row 4 #define UA_COMM S(UA_DOT) // , - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ ґ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 2 -#define UA_GE ALGR(UA_HE) // ґ +#define UA_GE ALGR(UA_HE) // ґ diff --git a/quantum/keymap_extras/keymap_us.h b/quantum/keymap_extras/keymap_us.h index c5c5285848..9c7fef4c7d 100644 --- a/quantum/keymap_extras/keymap_us.h +++ b/quantum/keymap_extras/keymap_us.h @@ -70,4 +70,3 @@ #define KC_RIGHT_ANGLE_BRACKET KC_RABK #define KC_GT KC_RABK #define KC_QUESTION KC_QUES - diff --git a/quantum/keymap_extras/keymap_us_extended.h b/quantum/keymap_extras/keymap_us_extended.h index 8e71a8de25..c3c9b79181 100644 --- a/quantum/keymap_extras/keymap_us_extended.h +++ b/quantum/keymap_extras/keymap_us_extended.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define US_GRV KC_GRV // ` #define US_1 KC_1 // 1 #define US_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define US_0 KC_0 // 0 #define US_MINS KC_MINS // - #define US_EQL KC_EQL // = -// Row 2 #define US_Q KC_Q // Q #define US_W KC_W // W #define US_E KC_E // E @@ -61,7 +54,6 @@ #define US_LBRC KC_LBRC // [ #define US_RBRC KC_RBRC // ] #define US_BSLS KC_BSLS // (backslash) -// Row 3 #define US_A KC_A // A #define US_S KC_S // S #define US_D KC_D // D @@ -73,7 +65,6 @@ #define US_L KC_L // L #define US_SCLN KC_SCLN // ; #define US_QUOT KC_QUOT // ' -// Row 4 #define US_Z KC_Z // Z #define US_X KC_X // X #define US_C KC_C // C @@ -84,21 +75,6 @@ #define US_COMM KC_COMM // , #define US_DOT KC_DOT // . #define US_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_TILD S(US_GRV) // ~ #define US_EXLM S(US_1) // ! #define US_AT S(US_2) // @ @@ -112,32 +88,14 @@ #define US_RPRN S(US_0) // ) #define US_UNDS S(US_MINS) // _ #define US_PLUS S(US_EQL) // + -// Row 2 #define US_LCBR S(US_LBRC) // { #define US_RCBR S(US_RBRC) // } #define US_PIPE S(US_BSLS) // | -// Row 3 #define US_COLN S(US_SCLN) // : #define US_DQUO S(US_QUOT) // " -// Row 4 #define US_LABK S(US_COMM) // < #define US_RABK S(US_DOT) // > #define US_QUES S(US_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ ¹ │ ² │ ³ │ ¤ │ € │ ^ │ ̛ │ ¾ │ ‘ │ ’ │ ¥ │ × │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Ä │ Å │ É │ ® │ Þ │ Ü │ Ú │ Í │ Ó │ Ö │ « │ » │ ¬ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ Á │ ß │ Ð │ │ │ │ Ï │ Œ │ Ø │ ¶ │ ' │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Æ │ │ © │ │ │ Ñ │ µ │ Ç │ ˙ │ ¿ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_DGRV ALGR(US_GRV) // ` (dead) #define US_SUP1 ALGR(US_1) // ¹ #define US_SUP2 ALGR(US_2) // ² @@ -145,13 +103,12 @@ #define US_CURR ALGR(US_4) // ¤ #define US_EURO ALGR(US_5) // € #define US_DCIR ALGR(US_6) // ^ (dead) -#define US_HORN ALGR(US_7) // ̛ (dead) +#define US_HORN ALGR(US_7) // ̛ (dead) #define US_OGON ALGR(US_8) // ˛ (dead) #define US_LSQU ALGR(US_9) // ‘ #define US_RSQU ALGR(US_0) // ’ #define US_YEN ALGR(US_MINS) // ¥ #define US_MUL ALGR(US_EQL) // × -// Row 2 #define US_ADIA ALGR(US_Q) // Ä #define US_ARNG ALGR(US_W) // Å #define US_EACU ALGR(US_E) // É @@ -165,7 +122,6 @@ #define US_LDAQ ALGR(US_LBRC) // « #define US_RDAQ ALGR(US_RBRC) // » #define US_NOT ALGR(US_BSLS) // ¬ -// Row 3 #define US_AACU ALGR(US_A) // Á #define US_SS ALGR(US_S) // ß #define US_ETH ALGR(US_D) // Ð @@ -174,7 +130,6 @@ #define US_OSTR ALGR(US_L) // Ø #define US_PILC ALGR(US_SCLN) // ¶ #define US_ACUT ALGR(US_QUOT) // ´ (dead) -// Row 4 #define US_AE ALGR(US_Z) // Æ #define US_OE_2 ALGR(US_X) // Œ #define US_COPY ALGR(US_C) // © @@ -184,21 +139,6 @@ #define US_CCED ALGR(US_COMM) // Ç #define US_DOTA ALGR(US_DOT) // ˙ (dead) #define US_IQUE ALGR(US_SLSH) // ¿ - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ¡ │ ˝ │ ¯ │ £ │ ¸ │ ¼ │ ½ │ ¾ │ ˘ │ ° │ ̣ │ ÷ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ “ │ ” │ ¦ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ § │ │ │ │ │ │ │ │ ° │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ ¢ │ │ │ │ │ │ ˇ │ ̉ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_DTIL S(ALGR(US_GRV)) // ~ (dead) #define US_IEXL S(ALGR(US_1)) // ¡ #define US_DACU S(ALGR(US_2)) // ˝ (dead) @@ -210,18 +150,14 @@ #define US_TQTR S(ALGR(US_8)) // ¾ #define US_BREV S(ALGR(US_9)) // ˘ (dead) #define US_RNGA S(ALGR(US_0)) // ° (dead) -#define US_DOTB S(ALGR(US_MINS)) // ̣ (dead) +#define US_DOTB S(ALGR(US_MINS)) // ̣ (dead) #define US_DIV S(ALGR(US_EQL)) // ÷ -// Row 2 #define US_LDQU S(ALGR(US_LBRC)) // “ #define US_RDQU S(ALGR(US_RBRC)) // ” #define US_BRKP S(ALGR(US_BSLS)) // ¦ -// Row 3 #define US_SECT S(ALGR(US_S)) // § #define US_DEG S(ALGR(US_SCLN)) // ° #define US_DIAE S(ALGR(US_QUOT)) // ¨ (dead) -// Row 4 #define US_CENT S(ALGR(US_C)) // ¢ #define US_CARN S(ALGR(US_DOT)) // ˇ (dead) -#define US_HOKA S(ALGR(US_SLSH)) // ̉ (dead) - +#define US_HOKA S(ALGR(US_SLSH)) // ̉ (dead) diff --git a/quantum/keymap_extras/keymap_us_international.h b/quantum/keymap_extras/keymap_us_international.h index d491a38f52..c87dc6d544 100644 --- a/quantum/keymap_extras/keymap_us_international.h +++ b/quantum/keymap_extras/keymap_us_international.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define US_DGRV KC_GRV // ` (dead) #define US_1 KC_1 // 1 #define US_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define US_0 KC_0 // 0 #define US_MINS KC_MINS // - #define US_EQL KC_EQL // = -// Row 2 #define US_Q KC_Q // Q #define US_W KC_W // W #define US_E KC_E // E @@ -61,7 +54,6 @@ #define US_LBRC KC_LBRC // [ #define US_RBRC KC_RBRC // ] #define US_BSLS KC_BSLS // (backslash) -// Row 3 #define US_A KC_A // A #define US_S KC_S // S #define US_D KC_D // D @@ -73,7 +65,6 @@ #define US_L KC_L // L #define US_SCLN KC_SCLN // ; #define US_ACUT KC_QUOT // ´ (dead) -// Row 4 #define US_Z KC_Z // Z #define US_X KC_X // X #define US_C KC_C // C @@ -84,21 +75,6 @@ #define US_COMM KC_COMM // , #define US_DOT KC_DOT // . #define US_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ ¨ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_DTIL S(US_DGRV) // ~ (dead) #define US_EXLM S(US_1) // ! #define US_AT S(US_2) // @ @@ -112,32 +88,14 @@ #define US_RPRN S(US_0) // ) #define US_UNDS S(US_MINS) // _ #define US_PLUS S(US_EQL) // + -// Row 2 #define US_LCBR S(US_LBRC) // { #define US_RCBR S(US_RBRC) // } #define US_PIPE S(US_BSLS) // | -// Row 3 #define US_COLN S(US_SCLN) // : #define US_DIAE S(US_ACUT) // ¨ (dead) -// Row 4 #define US_LABK S(US_COMM) // < #define US_RABK S(US_DOT) // > #define US_QUES S(US_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ¡ │ ² │ ³ │ ¤ │ € │ ¼ │ ½ │ ¾ │ ‘ │ ’ │ ¥ │ × │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Ä │ Å │ É │ ® │ Þ │ Ü │ Ú │ Í │ Ó │ Ö │ « │ » │ ¬ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ Á │ ß │ Ð │ │ │ │ │ │ Ø │ ¶ │ ´ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Æ │ │ © │ │ │ Ñ │ µ │ Ç │ │ ¿ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_IEXL ALGR(US_1) // ¡ #define US_SUP2 ALGR(US_2) // ² #define US_SUP3 ALGR(US_3) // ³ @@ -150,7 +108,6 @@ #define US_RSQU ALGR(US_0) // ’ #define US_YEN ALGR(US_MINS) // ¥ #define US_MUL ALGR(US_EQL) // × -// Row 2 #define US_ADIA ALGR(US_Q) // Ä #define US_ARNG ALGR(US_W) // Å #define US_EACU ALGR(US_E) // É @@ -164,43 +121,23 @@ #define US_LDAQ ALGR(US_LBRC) // « #define US_RDAQ ALGR(US_RBRC) // » #define US_NOT ALGR(US_BSLS) // ¬ -// Row 3 #define US_AACU ALGR(US_A) // Á #define US_SS ALGR(US_S) // ß #define US_ETH ALGR(US_D) // Ð #define US_OSTR ALGR(US_L) // Ø #define US_PILC ALGR(US_SCLN) // ¶ #define US_NDAC ALGR(US_ACUT) // ´ -// Row 4 #define US_AE ALGR(US_Z) // Æ #define US_COPY ALGR(US_C) // © #define US_NTIL ALGR(US_N) // Ñ #define US_MICR ALGR(US_M) // µ #define US_CCED ALGR(US_COMM) // Ç #define US_IQUE ALGR(US_SLSH) // ¿ - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ │ ¹ │ │ │ £ │ │ │ │ │ │ │ │ ÷ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ ¦ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ § │ │ │ │ │ │ │ │ ° │ ¨ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ ¢ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_SUP1 S(ALGR(US_1)) // ¹ #define US_PND S(ALGR(US_4)) // £ #define US_DIV S(ALGR(US_EQL)) // ÷ -// Row 2 #define US_BRKP S(ALGR(US_BSLS)) // ¦ -// Row 3 #define US_SECT S(ALGR(US_S)) // § #define US_DEG S(ALGR(US_SCLN)) // ° #define US_NDDR S(ALGR(US_ACUT)) // ¨ -// Row 4 #define US_CENT S(ALGR(US_C)) // ¢ diff --git a/quantum/keymap_extras/keymap_us_international_linux.h b/quantum/keymap_extras/keymap_us_international_linux.h index e0c08200b9..4d4222f726 100644 --- a/quantum/keymap_extras/keymap_us_international_linux.h +++ b/quantum/keymap_extras/keymap_us_international_linux.h @@ -1,39 +1,33 @@ -/* Copyright 2020 - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 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 │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define US_DGRV KC_GRV // ` (dead) #define US_1 KC_1 // 1 #define US_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define US_0 KC_0 // 0 #define US_MINS KC_MINS // - #define US_EQL KC_EQL // = -// Row 2 #define US_Q KC_Q // Q #define US_W KC_W // W #define US_E KC_E // E @@ -61,7 +54,6 @@ #define US_LBRC KC_LBRC // [ #define US_RBRC KC_RBRC // ] #define US_BSLS KC_BSLS // (backslash) -// Row 3 #define US_A KC_A // A #define US_S KC_S // S #define US_D KC_D // D @@ -73,7 +65,6 @@ #define US_L KC_L // L #define US_SCLN KC_SCLN // ; #define US_ACUT KC_QUOT // ´ (dead) -// Row 4 #define US_Z KC_Z // Z #define US_X KC_X // X #define US_C KC_C // C @@ -84,21 +75,6 @@ #define US_COMM KC_COMM // , #define US_DOT KC_DOT // . #define US_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ ¨ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_DTIL S(US_DGRV) // ~ (dead) #define US_EXLM S(US_1) // ! #define US_AT S(US_2) // @ @@ -112,33 +88,14 @@ #define US_RPRN S(US_0) // ) #define US_UNDS S(US_MINS) // _ #define US_PLUS S(US_EQL) // + -// Row 2 #define US_LCBR S(US_LBRC) // { #define US_RCBR S(US_RBRC) // } #define US_PIPE S(US_BSLS) // | -// Row 3 #define US_COLN S(US_SCLN) // : #define US_DIAE S(US_ACUT) // ¨ (dead) -// Row 4 #define US_LABK S(US_COMM) // < #define US_RABK S(US_DOT) // > #define US_QUES S(US_SLSH) // ? - -/* AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ ¡ │ ² │ ³ │ ¤ │ € │ ¼ │ ½ │ ¾ │ ‘ │ ’ │ ¥ │ × │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Ä │ Å │ É │ ® │ Þ │ Ü │ Ú │ Í │ Ó │ Ö │ « │ » │ ¬ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ Á │ ß │ Ð │ │ │ │ │ Œ │ Ø │ ¶ │ ' │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Æ │ │ © │ │ │ Ñ │ µ │ Ç │ ˙ │ ¿ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ - -// Row 1 #define US_GRV ALGR(US_DGRV) // ` #define US_IEXL ALGR(US_1) // ¡ #define US_SUP2 ALGR(US_2) // ² @@ -152,7 +109,6 @@ #define US_RSQU ALGR(US_0) // ’ #define US_YEN ALGR(US_MINS) // ¥ #define US_MUL ALGR(US_EQL) // × -// Row 2 #define US_ADIA ALGR(US_Q) // Ä #define US_ARNG ALGR(US_W) // Å #define US_EACU ALGR(US_E) // É @@ -166,7 +122,6 @@ #define US_LDAQ ALGR(US_LBRC) // « #define US_RDAQ ALGR(US_RBRC) // » #define US_NOT ALGR(US_BSLS) // ¬ -// Row 3 #define US_AACU ALGR(US_A) // Á #define US_SS ALGR(US_S) // ß #define US_ETH ALGR(US_D) // Ð @@ -174,7 +129,6 @@ #define US_OSTR ALGR(US_L) // Ø #define US_PILC ALGR(US_SCLN) // ¶ #define US_QUOT ALGR(US_ACUT) // ' -// Row 4 #define US_AE ALGR(US_Z) // Æ #define US_COPY ALGR(US_C) // © #define US_NTIL ALGR(US_N) // Ñ @@ -182,21 +136,6 @@ #define US_CCED ALGR(US_COMM) // Ç #define US_DOTA ALGR(US_DOT) // ˙ (dead) #define US_IQUE ALGR(US_SLSH) // ¿ - -/* Shift+AltGr symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ¹ │ ˝ │ ¯ │ £ │ ¸ │ ^ │ ̛ │ ˛ │ ˘ │ ° │ ̣ │ ÷ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ “ │ ” │ ¦ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ § │ │ │ │ │ │ │ │ ° │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ ¢ │ │ │ │ │ │ ˇ │ ̉ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define US_TILD S(ALGR(US_DGRV)) // ~ #define US_SUP1 S(ALGR(US_1)) // ¹ #define US_DACU S(ALGR(US_2)) // ˝ (dead) @@ -204,21 +143,18 @@ #define US_PND S(ALGR(US_4)) // £ #define US_CEDL S(ALGR(US_5)) // ¸ (dead) #define US_CIRC S(ALGR(US_6)) // ^ -#define US_HORN S(ALGR(US_7)) // ̛ (dead) +#define US_HORN S(ALGR(US_7)) // ̛ (dead) #define US_OGON S(ALGR(US_8)) // ˛ (dead) #define US_BREV S(ALGR(US_9)) // ˘ (dead) #define US_RNGA S(ALGR(US_0)) // ° (dead) -#define US_DOTB S(ALGR(US_MINS)) // ̣ (dead) +#define US_DOTB S(ALGR(US_MINS)) // ̣ (dead) #define US_DIV S(ALGR(US_EQL)) // ÷ -// Row 2 #define US_LDQU S(ALGR(US_LBRC)) // “ #define US_RDQU S(ALGR(US_RBRC)) // ” #define US_BRKP S(ALGR(US_BSLS)) // ¦ -// Row 3 #define US_SECT S(ALGR(US_S)) // § #define US_DEG S(ALGR(US_SCLN)) // ° #define US_DQUO S(ALGR(US_ACUT)) // " -// Row 4 #define US_CENT S(ALGR(US_C)) // ¢ #define US_CARN S(ALGR(US_DOT)) // ˇ (dead) -#define US_HOKA S(ALGR(US_SLSH)) // ̉ (dead) +#define US_HOKA S(ALGR(US_SLSH)) // ̉ (dead) diff --git a/quantum/keymap_extras/keymap_workman.h b/quantum/keymap_extras/keymap_workman.h index 6367d68351..3b0ce7f6d6 100644 --- a/quantum/keymap_extras/keymap_workman.h +++ b/quantum/keymap_extras/keymap_workman.h @@ -1,39 +1,33 @@ -/* Copyright 2018 Jacob Jerrell - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ D │ R │ W │ B │ J │ F │ U │ P │ ; │ [ │ ] │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ A │ S │ H │ T │ G │ Y │ N │ E │ O │ I │ ' │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Z │ X │ M │ C │ V │ K │ L │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define WK_GRV KC_GRV // ` #define WK_1 KC_1 // 1 #define WK_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define WK_0 KC_0 // 0 #define WK_MINS KC_MINS // - #define WK_EQL KC_EQL // = -// Row 2 #define WK_Q KC_Q // Q #define WK_D KC_W // D #define WK_R KC_E // R @@ -61,7 +54,6 @@ #define WK_LBRC KC_LBRC // [ #define WK_RBRC KC_RBRC // ] #define WK_BSLS KC_BSLS // (backslash) -// Row 3 #define WK_A KC_A // A #define WK_S KC_S // S #define WK_H KC_D // H @@ -73,7 +65,6 @@ #define WK_O KC_L // O #define WK_I KC_SCLN // I #define WK_QUOT KC_QUOT // ' -// Row 4 #define WK_Z KC_Z // Z #define WK_X KC_X // X #define WK_M KC_C // M @@ -84,21 +75,6 @@ #define WK_COMM KC_COMM // , #define WK_DOT KC_DOT // . #define WK_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define WK_TILD S(WK_GRV) // ~ #define WK_EXLM S(WK_1) // ! #define WK_AT S(WK_2) // @ @@ -112,14 +88,11 @@ #define WK_RPRN S(WK_0) // ) #define WK_UNDS S(WK_MINS) // _ #define WK_PLUS S(WK_EQL) // + -// Row 2 #define WK_COLN S(WK_SCLN) // : #define WK_LCBR S(WK_LBRC) // { #define WK_RCBR S(WK_RBRC) // } #define WK_PIPE S(WK_BSLS) // | -// Row 3 #define WK_DQUO S(WK_QUOT) // " -// Row 4 #define WK_LABK S(WK_COMM) // < #define WK_RABK S(WK_DOT) // > #define WK_QUES S(WK_SLSH) // ? diff --git a/quantum/keymap_extras/keymap_workman_zxcvm.h b/quantum/keymap_extras/keymap_workman_zxcvm.h index 01eb83c397..252250cb92 100644 --- a/quantum/keymap_extras/keymap_workman_zxcvm.h +++ b/quantum/keymap_extras/keymap_workman_zxcvm.h @@ -1,39 +1,33 @@ -/* Copyright 2018 Jacob Jerrell - * - * 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 2 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 . - */ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ +#pragma once #include "keymap.h" - // clang-format off -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ Q │ D │ R │ W │ B │ J │ F │ U │ P │ ; │ [ │ ] │ \ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ A │ S │ H │ T │ G │ Y │ N │ E │ O │ I │ ' │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ Z │ X │ C │ V │ M │ K │ L │ , │ . │ / │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 +// Aliases #define WK_GRV KC_GRV // ` #define WK_1 KC_1 // 1 #define WK_2 KC_2 // 2 @@ -47,7 +41,6 @@ #define WK_0 KC_0 // 0 #define WK_MINS KC_MINS // - #define WK_EQL KC_EQL // = -// Row 2 #define WK_Q KC_Q // Q #define WK_D KC_W // D #define WK_R KC_E // R @@ -61,7 +54,6 @@ #define WK_LBRC KC_LBRC // [ #define WK_RBRC KC_RBRC // ] #define WK_BSLS KC_BSLS // (backslash) -// Row 3 #define WK_A KC_A // A #define WK_S KC_S // S #define WK_H KC_D // H @@ -73,7 +65,6 @@ #define WK_O KC_L // O #define WK_I KC_SCLN // I #define WK_QUOT KC_QUOT // ' -// Row 4 #define WK_Z KC_Z // Z #define WK_X KC_X // X #define WK_C KC_C // C @@ -84,21 +75,6 @@ #define WK_COMM KC_COMM // , #define WK_DOT KC_DOT // . #define WK_SLSH KC_SLSH // / - -/* Shifted symbols - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │ │ │ │ │ │ │ │ │ │ │ : │ { │ } │ | │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ " │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │ │ │ │ │ │ │ │ < │ > │ ? │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -// Row 1 #define WK_TILD S(WK_GRV) // ~ #define WK_EXLM S(WK_1) // ! #define WK_AT S(WK_2) // @ @@ -112,14 +88,11 @@ #define WK_RPRN S(WK_0) // ) #define WK_UNDS S(WK_MINS) // _ #define WK_PLUS S(WK_EQL) // + -// Row 2 #define WK_COLN S(WK_SCLN) // : #define WK_LCBR S(WK_LBRC) // { #define WK_RCBR S(WK_RBRC) // } #define WK_PIPE S(WK_BSLS) // | -// Row 3 #define WK_DQUO S(WK_QUOT) // " -// Row 4 #define WK_LABK S(WK_COMM) // < #define WK_RABK S(WK_DOT) // > #define WK_QUES S(WK_SLSH) // ? diff --git a/util/lang_conv.py b/util/lang_conv.py new file mode 100644 index 0000000000..a0da6c392d --- /dev/null +++ b/util/lang_conv.py @@ -0,0 +1,65 @@ +from pathlib import Path + +langs = set() +files = Path('quantum/keymap_extras/').glob('keymap_*.h') +for file in files: + langs.add(file.stem.replace('keymap_', '')) + +for lang in langs: + try: + file = Path(f'quantum/keymap_extras/keymap_{lang}.h') + print(f'Reading:{file}') + collect = None + out = [] + out += ['{'] + out += [' "aliases": {'] + lines = file.read_text(encoding='utf-8').split('\n') + for line in lines: + + if line.startswith("// Row"): + # print(line) + continue + elif line.startswith("/*******************************************************************************"): + raise Exception(f'Skipping:{file}') + elif '/*' in line: + collect = [line] + elif '*/' in line: + collect += [line] + if 'copyright' in collect[0].lower(): + collect = None + continue + out += collect + collect = None + elif collect: + collect += [line] + + elif '#define' in line: + define = line.split() + while len(define) < 5: + define.append("") + + if define[4] == "(backslash)": + define[4] = '\\\\' + + define[4] = " ".join(define[4:]).strip() + define[4] = define[4].replace('"', '\\"') + + if define[4]: + out += [f' "{define[2]}": {{'] + out += [f' "key": "{define[1]}",'] + out += [f' "label": "{define[4]}",'] + out += [f' }}'] + else: + out += [f' "{define[2]}": {{'] + out += [f' "key": "{define[1]}"'] + out += [f' }}'] + + out += [' }'] + out += ['}'] + + dump = Path(f'data/constants/keycodes/extras/keycodes_{lang}_0.0.1.hjson') + print(f'Writing:{dump}') + dump.write_text("\n".join(out), encoding='utf-8') + + except Exception as e: + print(e) diff --git a/util/lang_gen.sh b/util/lang_gen.sh new file mode 100755 index 0000000000..0b062b1a09 --- /dev/null +++ b/util/lang_gen.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +for lang in $(find data/constants/keycodes/extras/ -type f -printf "%f\n" | sed "s/keycodes_//g" | sed "s/_[0-9].*//"); do + data=$(qmk generate-keycode-extras --version latest --lang $lang) + if [ "$?" == "0" ]; then + echo "$data" > quantum/keymap_extras/keymap_$lang.h + fi +done -- cgit v1.3.1 From 517f8af99ec26c6808bedf47af3c964c5cd186a8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 23 Dec 2022 23:42:33 +0000 Subject: Revert changes to keymap_steno.h (#19412) --- .../keycodes/extras/keycodes_steno_0.0.1.hjson | 4 - quantum/keymap_extras/keymap_steno.h | 141 +++++++++++++++++---- 2 files changed, 115 insertions(+), 30 deletions(-) delete mode 100644 data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson (limited to 'data') diff --git a/data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson deleted file mode 100644 index dcfc562004..0000000000 --- a/data/constants/keycodes/extras/keycodes_steno_0.0.1.hjson +++ /dev/null @@ -1,4 +0,0 @@ -{ - "aliases": { - } -} \ No newline at end of file diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h index 733446e660..07d96b7465 100644 --- a/quantum/keymap_extras/keymap_steno.h +++ b/quantum/keymap_extras/keymap_steno.h @@ -1,30 +1,119 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -/******************************************************************************* - 88888888888 888 d8b .d888 d8b 888 d8b - 888 888 Y8P d88P" Y8P 888 Y8P - 888 888 888 888 - 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b - 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K - 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. - 888 888 888 888 X88 888 888 888 Y8b. 888 X88 - 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' - 888 888 - 888 888 - 888 888 - .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 - d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 - 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 - Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 - "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 - 888 - Y8b d88P - "Y88P" -*******************************************************************************/ +/* Copyright 2017 Joseph Wasson + * + * 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 2 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 . + */ #pragma once + #include "keymap.h" -// clang-format off -// Aliases +// List of keycodes for the steno keyboard. To prevent +// errors, this must be <= 42 total entries in order to +// support the GeminiPR protocol. +enum steno_keycodes { + STN__MIN = QK_STENO, + STN_FN = STN__MIN, + STN_NUM, + STN_N1 = STN_NUM, + STN_N2, + STN_N3, + STN_N4, + STN_N5, + STN_N6, + STN_SL, + STN_S1 = STN_SL, + STN_S2, + STN_TL, + STN_KL, + STN_PL, + STN_WL, + STN_HL, + STN_RL, + STN_A, + STN_O, + STN_STR, + STN_ST1 = STN_STR, + STN_ST2, + STN_RES1, + STN_RE1 = STN_RES1, + STN_RES2, + STN_RE2 = STN_RES2, + STN_PWR, + STN_ST3, + STN_ST4, + STN_E, + STN_U, + STN_FR, + STN_RR, + STN_PR, + STN_BR, + STN_LR, + STN_GR, + STN_TR, + STN_SR, + STN_DR, + STN_N7, + STN_N8, + STN_N9, + STN_NA, + STN_NB, + STN_NC, + STN_ZR, + STN__MAX = STN_ZR, // must be less than QK_STENO_BOLT +}; + +#ifdef STENO_COMBINEDMAP +enum steno_combined_keycodes { + STN_S3 = QK_STENO_COMB, + STN_TKL, + STN_PWL, + STN_HRL, + STN_FRR, + STN_PBR, + STN_LGR, + STN_TSR, + STN_DZR, + STN_AO, + STN_EU, + STN_COMB_MAX = STN_EU, +}; +#endif + +#ifdef STENO_ENABLE_BOLT +// TxBolt Codes +# define TXB_NUL 0 +# define TXB_S_L 0b00000001 +# define TXB_T_L 0b00000010 +# define TXB_K_L 0b00000100 +# define TXB_P_L 0b00001000 +# define TXB_W_L 0b00010000 +# define TXB_H_L 0b00100000 +# define TXB_R_L 0b01000001 +# define TXB_A_L 0b01000010 +# define TXB_O_L 0b01000100 +# define TXB_STR 0b01001000 +# define TXB_E_R 0b01010000 +# define TXB_U_R 0b01100000 +# define TXB_F_R 0b10000001 +# define TXB_R_R 0b10000010 +# define TXB_P_R 0b10000100 +# define TXB_B_R 0b10001000 +# define TXB_L_R 0b10010000 +# define TXB_G_R 0b10100000 +# define TXB_T_R 0b11000001 +# define TXB_S_R 0b11000010 +# define TXB_D_R 0b11000100 +# define TXB_Z_R 0b11001000 +# define TXB_NUM 0b11010000 +#endif // STENO_ENABLE_BOLT -- cgit v1.3.1 From a3ed1b0c8d51b0a11eb358d06041d4edb1dba6be Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 9 Jan 2023 09:23:02 +0000 Subject: Relax converter within keymap schema (#19544) --- data/schemas/keymap.jsonschema | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 1b8d01bcc6..2fcd5f8a51 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -7,7 +7,8 @@ "author": {"type": "string"}, "converter": { "type": "string", - "enum": ["elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bonsai_c4"] + "minLength": 1, + "pattern": "^[a-z][0-9a-z_]*$" }, "host_language": {"$ref": "qmk.definitions.v1#/text_identifier"}, "keyboard": {"$ref": "qmk.definitions.v1#/text_identifier"}, -- cgit v1.3.1 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) --- builddefs/build_keyboard.mk | 25 +++++++------------------ data/mappings/info_rules.hjson | 2 ++ lib/python/qmk/info.py | 3 +++ platforms/arm_atsam/bootloader.mk | 2 ++ platforms/avr/bootloader.mk | 2 ++ platforms/chibios/bootloader.mk | 2 ++ platforms/chibios/platform.mk | 3 +++ 7 files changed, 21 insertions(+), 18 deletions(-) (limited to 'data') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 8999ac80ad..37466cbbe5 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -180,6 +180,13 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c endif +# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU') +ifeq ($(PLATFORM_KEY),) + $(call CATASTROPHIC_ERROR,Platform not defined) +endif +PLATFORM=$(shell echo $(PLATFORM_KEY) | tr '[:lower:]' '[:upper:]') + + include $(BUILDDEFS_PATH)/converters.mk include $(BUILDDEFS_PATH)/mcu_selection.mk @@ -257,24 +264,6 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","") FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h endif -# Determine and set parameters based on the keyboard's processor family. -# We can assume a ChibiOS target When MCU_FAMILY is defined since it's -# not used for LUFA -ifdef MCU_FAMILY - PLATFORM=CHIBIOS - PLATFORM_KEY=chibios - FIRMWARE_FORMAT?=bin - OPT_DEFS += -DMCU_$(MCU_FAMILY) -else ifdef ARM_ATSAM - PLATFORM=ARM_ATSAM - PLATFORM_KEY=arm_atsam - FIRMWARE_FORMAT=bin -else - PLATFORM=AVR - PLATFORM_KEY=avr - FIRMWARE_FORMAT?=hex -endif - # Find all of the config.h files and add them to our CONFIG_H define. CONFIG_H := ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","") 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"}, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index af3b0f3091..789d05850c 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -751,6 +751,7 @@ def arm_processor_rules(info_data, rules): """ info_data['processor_type'] = 'arm' info_data['protocol'] = 'ChibiOS' + info_data['platform_key'] = 'chibios' if 'STM32' in info_data['processor']: info_data['platform'] = 'STM32' @@ -758,6 +759,7 @@ def arm_processor_rules(info_data, rules): info_data['platform'] = rules['MCU_SERIES'] elif 'ARM_ATSAM' in rules: info_data['platform'] = 'ARM_ATSAM' + info_data['platform_key'] = 'arm_atsam' return info_data @@ -767,6 +769,7 @@ def avr_processor_rules(info_data, rules): """ info_data['processor_type'] = 'avr' info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown' + info_data['platform_key'] = 'avr' info_data['protocol'] = 'V-USB' if info_data['processor'] in VUSB_PROCESSORS else 'LUFA' # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk: diff --git a/platforms/arm_atsam/bootloader.mk b/platforms/arm_atsam/bootloader.mk index 1ec42edeb6..7e503bdca9 100644 --- a/platforms/arm_atsam/bootloader.mk +++ b/platforms/arm_atsam/bootloader.mk @@ -27,6 +27,8 @@ # the respective file under `platforms//bootloaders/custom.c` to see # which functions may be overridden. +FIRMWARE_FORMAT?=bin + ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/avr/bootloader.mk b/platforms/avr/bootloader.mk index 63fe635d96..36e3fd83db 100644 --- a/platforms/avr/bootloader.mk +++ b/platforms/avr/bootloader.mk @@ -37,6 +37,8 @@ # BOOTLOADER_SIZE can still be defined manually, but it's recommended # you add any possible configuration to this list +FIRMWARE_FORMAT?=hex + ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk index 0568d35321..546faf2d27 100644 --- a/platforms/chibios/bootloader.mk +++ b/platforms/chibios/bootloader.mk @@ -36,6 +36,8 @@ # the respective file under `platforms//bootloaders/custom.c` to see # which functions may be overridden. +FIRMWARE_FORMAT?=bin + ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index b2a8ec89e1..fd4c6bd2e5 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -442,6 +442,9 @@ LDFLAGS += $(SHARED_LDFLAGS) $(SHARED_LDSYMBOLS) $(TOOLCHAIN_LDFLAGS) $(TOOLCHA # Tell QMK that we are hosting it on ChibiOS. OPT_DEFS += -DPROTOCOL_CHIBIOS +# And what flavor of MCU +OPT_DEFS += -DMCU_$(MCU_FAMILY) + # ChibiOS supports synchronization primitives like a Mutex OPT_DEFS += -DPLATFORM_SUPPORTS_SYNCHRONIZATION -- cgit v1.3.1 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. --- builddefs/build_keyboard.mk | 25 ++++++++++++++++++------- data/mappings/info_rules.hjson | 2 -- lib/python/qmk/info.py | 3 --- platforms/arm_atsam/bootloader.mk | 2 -- platforms/avr/bootloader.mk | 2 -- platforms/chibios/bootloader.mk | 2 -- platforms/chibios/platform.mk | 3 --- 7 files changed, 18 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 37466cbbe5..8999ac80ad 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -180,13 +180,6 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c endif -# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU') -ifeq ($(PLATFORM_KEY),) - $(call CATASTROPHIC_ERROR,Platform not defined) -endif -PLATFORM=$(shell echo $(PLATFORM_KEY) | tr '[:lower:]' '[:upper:]') - - include $(BUILDDEFS_PATH)/converters.mk include $(BUILDDEFS_PATH)/mcu_selection.mk @@ -264,6 +257,24 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","") FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h endif +# Determine and set parameters based on the keyboard's processor family. +# We can assume a ChibiOS target When MCU_FAMILY is defined since it's +# not used for LUFA +ifdef MCU_FAMILY + PLATFORM=CHIBIOS + PLATFORM_KEY=chibios + FIRMWARE_FORMAT?=bin + OPT_DEFS += -DMCU_$(MCU_FAMILY) +else ifdef ARM_ATSAM + PLATFORM=ARM_ATSAM + PLATFORM_KEY=arm_atsam + FIRMWARE_FORMAT=bin +else + PLATFORM=AVR + PLATFORM_KEY=avr + FIRMWARE_FORMAT?=hex +endif + # Find all of the config.h files and add them to our CONFIG_H define. CONFIG_H := ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","") 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"}, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 789d05850c..af3b0f3091 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -751,7 +751,6 @@ def arm_processor_rules(info_data, rules): """ info_data['processor_type'] = 'arm' info_data['protocol'] = 'ChibiOS' - info_data['platform_key'] = 'chibios' if 'STM32' in info_data['processor']: info_data['platform'] = 'STM32' @@ -759,7 +758,6 @@ def arm_processor_rules(info_data, rules): info_data['platform'] = rules['MCU_SERIES'] elif 'ARM_ATSAM' in rules: info_data['platform'] = 'ARM_ATSAM' - info_data['platform_key'] = 'arm_atsam' return info_data @@ -769,7 +767,6 @@ def avr_processor_rules(info_data, rules): """ info_data['processor_type'] = 'avr' info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown' - info_data['platform_key'] = 'avr' info_data['protocol'] = 'V-USB' if info_data['processor'] in VUSB_PROCESSORS else 'LUFA' # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk: diff --git a/platforms/arm_atsam/bootloader.mk b/platforms/arm_atsam/bootloader.mk index 7e503bdca9..1ec42edeb6 100644 --- a/platforms/arm_atsam/bootloader.mk +++ b/platforms/arm_atsam/bootloader.mk @@ -27,8 +27,6 @@ # the respective file under `platforms//bootloaders/custom.c` to see # which functions may be overridden. -FIRMWARE_FORMAT?=bin - ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/avr/bootloader.mk b/platforms/avr/bootloader.mk index 36e3fd83db..63fe635d96 100644 --- a/platforms/avr/bootloader.mk +++ b/platforms/avr/bootloader.mk @@ -37,8 +37,6 @@ # BOOTLOADER_SIZE can still be defined manually, but it's recommended # you add any possible configuration to this list -FIRMWARE_FORMAT?=hex - ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk index 546faf2d27..0568d35321 100644 --- a/platforms/chibios/bootloader.mk +++ b/platforms/chibios/bootloader.mk @@ -36,8 +36,6 @@ # the respective file under `platforms//bootloaders/custom.c` to see # which functions may be overridden. -FIRMWARE_FORMAT?=bin - ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index fd4c6bd2e5..b2a8ec89e1 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -442,9 +442,6 @@ LDFLAGS += $(SHARED_LDFLAGS) $(SHARED_LDSYMBOLS) $(TOOLCHAIN_LDFLAGS) $(TOOLCHA # Tell QMK that we are hosting it on ChibiOS. OPT_DEFS += -DPROTOCOL_CHIBIOS -# And what flavor of MCU -OPT_DEFS += -DMCU_$(MCU_FAMILY) - # ChibiOS supports synchronization primitives like a Mutex OPT_DEFS += -DPLATFORM_SUPPORTS_SYNCHRONIZATION -- cgit v1.3.1 From 0730740add19d3afe3d96ead50ba7d29e5dcb109 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 15 Jan 2023 15:04:32 +0000 Subject: Add mmoskal/uf2-stm32f103 bootloader support (#19594) --- builddefs/mcu_selection.mk | 6 +- data/schemas/keyboard.jsonschema | 1 + docs/flashing.md | 41 ++++++++++ .../handwired/onekey/bluepill_uf2boot/config.h | 26 +++++++ .../handwired/onekey/bluepill_uf2boot/halconf.h | 28 +++++++ .../handwired/onekey/bluepill_uf2boot/info.json | 15 ++++ .../handwired/onekey/bluepill_uf2boot/mcuconf.h | 33 ++++++++ .../handwired/onekey/bluepill_uf2boot/readme.md | 7 ++ .../handwired/onekey/bluepill_uf2boot/rules.mk | 2 + .../boards/common/ld/STM32F103xB_uf2boot.ld | 88 ++++++++++++++++++++++ platforms/chibios/bootloader.mk | 5 ++ platforms/chibios/bootloaders/uf2boot.c | 23 ++++++ platforms/chibios/flash.mk | 2 + 13 files changed, 276 insertions(+), 1 deletion(-) create mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/config.h create mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/halconf.h create mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/info.json create mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/mcuconf.h create mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/readme.md create mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/rules.mk create mode 100644 platforms/chibios/boards/common/ld/STM32F103xB_uf2boot.ld create mode 100644 platforms/chibios/bootloaders/uf2boot.c (limited to 'data') diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk index 382d9571a4..b566b1b5ac 100644 --- a/builddefs/mcu_selection.mk +++ b/builddefs/mcu_selection.mk @@ -275,7 +275,11 @@ ifneq ($(findstring STM32F103, $(MCU)),) # Linker script to use # - it should exist either in /os/common/startup/ARMCMx/compilers/GCC/ld/ # or /ld/ - MCU_LDSCRIPT ?= STM32F103x8 + ifeq ($(strip $(BOOTLOADER)), uf2boot) + MCU_LDSCRIPT ?= STM32F103xB_uf2boot + else + MCU_LDSCRIPT ?= STM32F103x8 + endif # Startup code to use # - it should exist in /os/common/startup/ARMCMx/compilers/GCC/mk/ diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 513564a643..0002898327 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -171,6 +171,7 @@ "stm32-dfu", "stm32duino", "tinyuf2", + "uf2boot", "unknown", "usbasploader", "wb32-dfu" diff --git a/docs/flashing.md b/docs/flashing.md index b3f055f6cb..a636f19c72 100644 --- a/docs/flashing.md +++ b/docs/flashing.md @@ -363,6 +363,47 @@ CLI Flashing sequence: * `:uf2-split-left` and `:uf2-split-right`: Flashes the firmware but also sets the handedness setting in EEPROM by generating a side specific firmware. +## uf2boot + +Keyboards may opt into supporting the uf2boot bootloader. This is currently only supported on the F103 bluepill. + +The `rules.mk` setting for this bootloader is `uf2boot`, and can be specified at the keymap or user level. + +To ensure compatibility with the uf2boot bootloader, make sure this block is present in your `rules.mk`: + +```make +# Bootloader selection +BOOTLOADER = uf2boot +``` + +Compatible flashers: + +* Any application able to copy a file from one place to another, such as _macOS Finder_ or _Windows Explorer_. + +Flashing sequence: + +1. Enter the bootloader using any of the following methods: + * Tap the `QK_BOOT` keycode + * Double-tap the `nRST` button on the PCB. +2. Wait for the OS to detect the device +3. Copy the .uf2 file to the new USB disk +4. Wait for the keyboard to become available + +or + +CLI Flashing sequence: + +1. Enter the bootloader using any of the following methods: + * Tap the `QK_BOOT` keycode + * Double-tap the `nRST` button on the PCB. +2. Wait for the OS to detect the device +3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/bluepill_uf2boot --keymap default` +4. Wait for the keyboard to become available + +### `make` Targets + +* `:uf2-split-left` and `:uf2-split-right`: Flashes the firmware but also sets the handedness setting in EEPROM by generating a side specific firmware. + ## Raspberry Pi RP2040 UF2 The `rules.mk` setting for this bootloader is `rp2040`, and can be specified at the keymap or user level. diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/config.h b/keyboards/handwired/onekey/bluepill_uf2boot/config.h new file mode 100644 index 0000000000..79fa79595a --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_uf2boot/config.h @@ -0,0 +1,26 @@ +/* Copyright 2019 + * + * 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 2 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 . + */ + +#pragma once + +#include "config_common.h" + +#define BACKLIGHT_PWM_DRIVER PWMD2 +#define BACKLIGHT_PWM_CHANNEL 1 + +#define ADC_PIN A0 + +#define RGB_CI_PIN A2 diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/halconf.h b/keyboards/handwired/onekey/bluepill_uf2boot/halconf.h new file mode 100644 index 0000000000..dbc3e82a79 --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_uf2boot/halconf.h @@ -0,0 +1,28 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_ADC TRUE + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/info.json new file mode 100644 index 0000000000..1f823ea0d7 --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "Onekey Bluepill STM32F103 uf2boot", + "development_board": "bluepill", + "bootloader": "uf2boot", + "matrix_pins": { + "cols": ["B0"], + "rows": ["A7"] + }, + "backlight": { + "pin": "A0" + }, + "rgblight": { + "pin": "A1" + } +} diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/mcuconf.h b/keyboards/handwired/onekey/bluepill_uf2boot/mcuconf.h new file mode 100644 index 0000000000..39834c135b --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_uf2boot/mcuconf.h @@ -0,0 +1,33 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + +#undef STM32_PWM_USE_TIM2 +#define STM32_PWM_USE_TIM2 TRUE + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 FALSE diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/readme.md b/keyboards/handwired/onekey/bluepill_uf2boot/readme.md new file mode 100644 index 0000000000..7886ed1888 --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_uf2boot/readme.md @@ -0,0 +1,7 @@ +# Bluepill onekey + +To trigger keypress, short together pins *B0* and *A7*. + +This variant requires the uf2-stm32f103 bootloader to be installed. This can be downloaded from the [uf2-stm32f103 releases page](https://github.com/mmoskal/uf2-stm32f103/releases). + +Double-tap reset to enter bootloader mode. Copy the built uf2 file to the device by dragging the file to the new USB disk. \ No newline at end of file diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk new file mode 100644 index 0000000000..a92b099328 --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk @@ -0,0 +1,2 @@ +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/platforms/chibios/boards/common/ld/STM32F103xB_uf2boot.ld b/platforms/chibios/boards/common/ld/STM32F103xB_uf2boot.ld new file mode 100644 index 0000000000..98d0f3ea75 --- /dev/null +++ b/platforms/chibios/boards/common/ld/STM32F103xB_uf2boot.ld @@ -0,0 +1,88 @@ +/* + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* + * ST32F103xB memory setup. + */ +MEMORY +{ + flash0 (rx) : org = 0x08000000 + 16K, len = 128k - 16K + flash1 (rx) : org = 0x00000000, len = 0 + flash2 (rx) : org = 0x00000000, len = 0 + flash3 (rx) : org = 0x00000000, len = 0 + flash4 (rx) : org = 0x00000000, len = 0 + flash5 (rx) : org = 0x00000000, len = 0 + flash6 (rx) : org = 0x00000000, len = 0 + flash7 (rx) : org = 0x00000000, len = 0 + ram0 (wx) : org = 0x20000000, len = 20k + ram1 (wx) : org = 0x00000000, len = 0 + ram2 (wx) : org = 0x00000000, len = 0 + ram3 (wx) : org = 0x00000000, len = 0 + ram4 (wx) : org = 0x00000000, len = 0 + ram5 (wx) : org = 0x00000000, len = 0 + ram6 (wx) : org = 0x00000000, len = 0 + ram7 (wx) : org = 0x00000000, len = 0 +} + +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash0); +REGION_ALIAS("XTORS_FLASH_LMA", flash0); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash0); +REGION_ALIAS("TEXT_FLASH_LMA", flash0); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash0); +REGION_ALIAS("RODATA_FLASH_LMA", flash0); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash0); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); + +/* RAM region to be used for Main stack. This stack accommodates the processing + of all exceptions and interrupts.*/ +REGION_ALIAS("MAIN_STACK_RAM", ram0); + +/* RAM region to be used for the process stack. This is the stack used by + the main() function.*/ +REGION_ALIAS("PROCESS_STACK_RAM", ram0); + +/* RAM region to be used for data segment.*/ +REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash0); + +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("BSS_RAM", ram0); + +/* RAM region to be used for the default heap.*/ +REGION_ALIAS("HEAP_RAM", ram0); + +/* Generic rules inclusion.*/ +INCLUDE rules.ld + +/* Bootloader reset support */ +_board_magic_reg = ORIGIN(ram0) + 16k; /* this is based off the code within backup.c */ diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk index 0568d35321..85f1866062 100644 --- a/platforms/chibios/bootloader.mk +++ b/platforms/chibios/bootloader.mk @@ -104,6 +104,11 @@ ifeq ($(strip $(BOOTLOADER)), tinyuf2) BOOTLOADER_TYPE = tinyuf2 FIRMWARE_FORMAT = uf2 endif +ifeq ($(strip $(BOOTLOADER)), uf2boot) + OPT_DEFS += -DBOOTLOADER_UF2BOOT + BOOTLOADER_TYPE = uf2boot + FIRMWARE_FORMAT = uf2 +endif ifeq ($(strip $(BOOTLOADER)), rp2040) OPT_DEFS += -DBOOTLOADER_RP2040 BOOTLOADER_TYPE = rp2040 diff --git a/platforms/chibios/bootloaders/uf2boot.c b/platforms/chibios/bootloaders/uf2boot.c new file mode 100644 index 0000000000..f5b1a64334 --- /dev/null +++ b/platforms/chibios/bootloaders/uf2boot.c @@ -0,0 +1,23 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "bootloader.h" + +// From mmoskal/uf2-stm32f103's backup.c +#define MAGIC_BOOT 0x544F4F42UL + +// defined by linker script +extern uint32_t _board_magic_reg[]; +#define MAGIC_REG _board_magic_reg[0] + +void bootloader_jump(void) { + MAGIC_REG = MAGIC_BOOT; + NVIC_SystemReset(); +} + +void mcu_reset(void) { + NVIC_SystemReset(); +} + +/* not needed, no two-stage reset */ +void enter_bootloader_mode_if_requested(void) {} diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk index 6e23d96e1c..ac842e8d62 100644 --- a/platforms/chibios/flash.mk +++ b/platforms/chibios/flash.mk @@ -109,6 +109,8 @@ else ifeq ($(strip $(BOOTLOADER)),kiibohd) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU_UTIL) else ifeq ($(strip $(BOOTLOADER)),tinyuf2) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_UF2_UTIL_DEPLOY) +else ifeq ($(strip $(BOOTLOADER)),uf2boot) + $(UNSYNC_OUTPUT_CMD) && $(call EXEC_UF2_UTIL_DEPLOY) else ifeq ($(strip $(BOOTLOADER)),rp2040) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_UF2_UTIL_DEPLOY) else ifeq ($(strip $(MCU_FAMILY)),KINETIS) -- cgit v1.3.1 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) --- builddefs/build_keyboard.mk | 24 ++++++------------------ builddefs/converters.mk | 1 + data/mappings/info_rules.hjson | 2 ++ lib/python/qmk/info.py | 3 +++ platforms/arm_atsam/bootloader.mk | 2 ++ platforms/avr/bootloader.mk | 2 ++ platforms/chibios/bootloader.mk | 2 ++ platforms/chibios/platform.mk | 3 +++ 8 files changed, 21 insertions(+), 18 deletions(-) (limited to 'data') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index ec0336f7c3..6d355c9b85 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -184,6 +184,12 @@ include $(BUILDDEFS_PATH)/converters.mk include $(BUILDDEFS_PATH)/mcu_selection.mk +# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU') +ifeq ($(PLATFORM_KEY),) + $(call CATASTROPHIC_ERROR,Platform not defined) +endif +PLATFORM=$(shell echo $(PLATFORM_KEY) | tr '[:lower:]' '[:upper:]') + # Find all the C source files to be compiled in subfolders. KEYBOARD_SRC := @@ -257,24 +263,6 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","") FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h endif -# Determine and set parameters based on the keyboard's processor family. -# We can assume a ChibiOS target When MCU_FAMILY is defined since it's -# not used for LUFA -ifdef MCU_FAMILY - PLATFORM=CHIBIOS - PLATFORM_KEY=chibios - FIRMWARE_FORMAT?=bin - OPT_DEFS += -DMCU_$(MCU_FAMILY) -else ifdef ARM_ATSAM - PLATFORM=ARM_ATSAM - PLATFORM_KEY=arm_atsam - FIRMWARE_FORMAT=bin -else - PLATFORM=AVR - PLATFORM_KEY=avr - FIRMWARE_FORMAT?=hex -endif - # Find all of the config.h files and add them to our CONFIG_H define. CONFIG_H := ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","") diff --git a/builddefs/converters.mk b/builddefs/converters.mk index 581276c2e0..3ba0e50116 100644 --- a/builddefs/converters.mk +++ b/builddefs/converters.mk @@ -19,6 +19,7 @@ ifneq ($(CONVERT_TO),) -include $(CONVERTER)/pre_converter.mk + PLATFORM_KEY = $(shell echo $(CONVERTER) | rev | cut -d "/" -f4 | rev) TARGET := $(TARGET)_$(CONVERT_TO) # Configure any defaults 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"}, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index af3b0f3091..789d05850c 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -751,6 +751,7 @@ def arm_processor_rules(info_data, rules): """ info_data['processor_type'] = 'arm' info_data['protocol'] = 'ChibiOS' + info_data['platform_key'] = 'chibios' if 'STM32' in info_data['processor']: info_data['platform'] = 'STM32' @@ -758,6 +759,7 @@ def arm_processor_rules(info_data, rules): info_data['platform'] = rules['MCU_SERIES'] elif 'ARM_ATSAM' in rules: info_data['platform'] = 'ARM_ATSAM' + info_data['platform_key'] = 'arm_atsam' return info_data @@ -767,6 +769,7 @@ def avr_processor_rules(info_data, rules): """ info_data['processor_type'] = 'avr' info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown' + info_data['platform_key'] = 'avr' info_data['protocol'] = 'V-USB' if info_data['processor'] in VUSB_PROCESSORS else 'LUFA' # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk: diff --git a/platforms/arm_atsam/bootloader.mk b/platforms/arm_atsam/bootloader.mk index 1ec42edeb6..7e503bdca9 100644 --- a/platforms/arm_atsam/bootloader.mk +++ b/platforms/arm_atsam/bootloader.mk @@ -27,6 +27,8 @@ # the respective file under `platforms//bootloaders/custom.c` to see # which functions may be overridden. +FIRMWARE_FORMAT?=bin + ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/avr/bootloader.mk b/platforms/avr/bootloader.mk index 63fe635d96..36e3fd83db 100644 --- a/platforms/avr/bootloader.mk +++ b/platforms/avr/bootloader.mk @@ -37,6 +37,8 @@ # BOOTLOADER_SIZE can still be defined manually, but it's recommended # you add any possible configuration to this list +FIRMWARE_FORMAT?=hex + ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk index 85f1866062..4812412344 100644 --- a/platforms/chibios/bootloader.mk +++ b/platforms/chibios/bootloader.mk @@ -36,6 +36,8 @@ # the respective file under `platforms//bootloaders/custom.c` to see # which functions may be overridden. +FIRMWARE_FORMAT?=bin + ifeq ($(strip $(BOOTLOADER)), custom) OPT_DEFS += -DBOOTLOADER_CUSTOM BOOTLOADER_TYPE = custom diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index b2a8ec89e1..fd4c6bd2e5 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -442,6 +442,9 @@ LDFLAGS += $(SHARED_LDFLAGS) $(SHARED_LDSYMBOLS) $(TOOLCHAIN_LDFLAGS) $(TOOLCHA # Tell QMK that we are hosting it on ChibiOS. OPT_DEFS += -DPROTOCOL_CHIBIOS +# And what flavor of MCU +OPT_DEFS += -DMCU_$(MCU_FAMILY) + # ChibiOS supports synchronization primitives like a Mutex OPT_DEFS += -DPLATFORM_SUPPORTS_SYNCHRONIZATION -- cgit v1.3.1 From 0b25528b6bc433e8609d4e12fb108b4ee7865197 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 19 Jan 2023 00:27:11 +0000 Subject: Fix 'No LAYOUTs defined' check (#19537) --- data/schemas/keyboard.jsonschema | 3 +++ lib/python/qmk/info.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 0002898327..f1a1bb87c0 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -257,6 +257,9 @@ "c_macro": { "type": "boolean" }, + "json_layout": { + "type": "boolean" + }, "layout": { "type": "array", "items": { diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 789d05850c..e73d825696 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -52,7 +52,7 @@ def _validate(keyboard, info_data): community_layouts_names = list(map(lambda layout: f'LAYOUT_{layout}', community_layouts)) # Make sure we have at least one layout - if len(layouts) == 0: + if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()): _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.') # Providing only LAYOUT_all "because I define my layouts in a 3rd party tool" @@ -107,6 +107,7 @@ def info_json(keyboard): for layout_name, layout_json in layouts.items(): if not layout_name.startswith('LAYOUT_kc'): layout_json['c_macro'] = True + layout_json['json_layout'] = False info_data['layouts'][layout_name] = layout_json # Merge in the data from info.json, config.h, and rules.mk @@ -824,6 +825,7 @@ def merge_info_jsons(keyboard, info_data): msg = 'Number of keys for %s does not match! info.json specifies %d keys, C macro specifies %d' _log_error(info_data, msg % (layout_name, len(layout['layout']), len(info_data['layouts'][layout_name]['layout']))) else: + info_data['layouts'][layout_name]['json_layout'] = True for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): existing_key.update(new_key) else: @@ -831,6 +833,7 @@ def merge_info_jsons(keyboard, info_data): _log_error(info_data, f'Layout "{layout_name}" has no "matrix" definition in either "info.json" or ".h"!') else: layout['c_macro'] = False + layout['json_layout'] = True info_data['layouts'][layout_name] = layout # Update info_data with the new data -- cgit v1.3.1 From 2d843088a26ee639287d16fbd9ca4c35e18f7b8b Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 31 Jan 2023 05:37:19 +1100 Subject: Normalise Swap Hands keycodes (#19720) --- data/constants/keycodes/keycodes_0.0.2.hjson | 1 + .../keycodes/keycodes_0.0.2_swap_hands.hjson | 53 ++++++++++++++++++++++ docs/feature_swap_hands.md | 24 +++++----- docs/keycodes.md | 20 ++++---- keyboards/jian/keymaps/advanced/keymap.c | 2 +- keyboards/jian/keymaps/default/keymap.c | 2 +- keyboards/jian/keymaps/via/keymap.c | 2 +- keyboards/jorne/keymaps/default/keymap.c | 2 +- keyboards/jorne/keymaps/via/keymap.c | 2 +- keyboards/planck/keymaps/rootiest/keymap.c | 2 +- keyboards/signum/3_0/keymaps/default/layout.py | 2 +- quantum/keycodes.h | 23 ++++++---- quantum/process_keycode/process_autocorrect.c | 2 +- quantum/process_keycode/process_caps_word.c | 2 +- quantum/quantum_keycodes_legacy.h | 1 + tests/test_common/keycode_table.cpp | 16 +++---- 16 files changed, 109 insertions(+), 47 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2.hjson create mode 100644 data/constants/keycodes/keycodes_0.0.2_swap_hands.hjson (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2.hjson b/data/constants/keycodes/keycodes_0.0.2.hjson new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2.hjson @@ -0,0 +1 @@ +{} diff --git a/data/constants/keycodes/keycodes_0.0.2_swap_hands.hjson b/data/constants/keycodes/keycodes_0.0.2_swap_hands.hjson new file mode 100644 index 0000000000..ddaa2c76b9 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_swap_hands.hjson @@ -0,0 +1,53 @@ +{ + "keycodes": { + "0x56F0": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_TOGGLE", + "aliases": [ + "SH_TOGG" + ] + }, + "0x56F1": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_TAP_TOGGLE", + "aliases": [ + "SH_TT" + ] + }, + "0x56F2": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_MOMENTARY_ON", + "aliases": [ + "SH_MON" + ] + }, + "0x56F3": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_MOMENTARY_OFF", + "aliases": [ + "SH_MOFF" + ] + }, + "0x56F4": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_OFF", + "aliases": [ + "SH_OFF" + ] + }, + "0x56F5": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_ON", + "aliases": [ + "SH_ON" + ] + }, + "0x56F6": { + "group": "swap_hands", + "key": "QK_SWAP_HANDS_ONE_SHOT", + "aliases": [ + "SH_OS" + ] + } + } +} diff --git a/docs/feature_swap_hands.md b/docs/feature_swap_hands.md index 6768020f12..35131884e1 100644 --- a/docs/feature_swap_hands.md +++ b/docs/feature_swap_hands.md @@ -19,18 +19,18 @@ Note that the array indices are reversed same as the matrix and the values are o ## Swap Keycodes -|Key |Description | -|-----------|-------------------------------------------------------------------------| -|`SH_T(key)`|Sends `key` with a tap; momentary swap when held. | -|`SH_ON` |Turns on swapping and leaves it on. | -|`SH_OFF` |Turn off swapping and leaves it off. Good for returning to a known state.| -|`SH_MON` |Swaps hands when pressed, returns to normal when released (momentary). | -|`SH_MOFF` |Momentarily turns off swap. | -|`SH_TG` |Toggles swap on and off with every key press. | -|`SH_TT` |Momentary swap when held, toggles with repeated taps (see below). | -|`SH_OS` |One shot swap hands: toggles while pressed or until next key press. | - -`SH_TT` swap-hands tap-toggle key is similar to [layer tap-toggle](feature_layers.md?id=switching-and-toggling-layers). Tapping repeatedly (5 taps by default) will toggle swap-hands on or off, like `SH_TG`. Tap-toggle count can be changed by defining a value for `TAPPING_TOGGLE`. +|Key |Aliases |Description | +|-----------------------------|---------|----------------------------------------------------| +|`SH_T(kc)` | |Momentary swap when held, `kc` when tapped | +|`QK_SWAP_HANDS_ON` |`SH_ON` |Turn on hand swap | +|`QK_SWAP_HANDS_OFF` |`SH_OFF` |Turn off hand swap | +|`QK_SWAP_HANDS_MOMENTARY_ON` |`SH_MON` |Turn on hand swap while held | +|`QK_SWAP_HANDS_MOMENTARY_OFF`|`SH_MOFF`|Turn off hand swap while held | +|`QK_SWAP_HANDS_TOGGLE` |`SH_TOGG`|Toggle hand swap | +|`QK_SWAP_HANDS_TAP_TOGGLE` |`SH_TT` |Momentary swap when held, toggle when tapped | +|`QK_SWAP_HANDS_ONE_SHOT` |`SH_OS` |Turn on hand swap while held or until next key press| + +`SH_TT` swap-hands tap-toggle key is similar to [layer tap-toggle](feature_layers.md?id=switching-and-toggling-layers). Tapping repeatedly (5 taps by default) will toggle swap-hands on or off, like `SH_TOGG`. Tap-toggle count can be changed by defining a value for `TAPPING_TOGGLE`. ## Encoder Mapping diff --git a/docs/keycodes.md b/docs/keycodes.md index f660c7f526..b3be0847e8 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -819,16 +819,16 @@ See also: [Space Cadet](feature_space_cadet.md) See also: [Swap Hands](feature_swap_hands.md) -|Key |Description | -|-----------|-------------------------------------------------------------------------| -|`SH_T(key)`|Sends `key` with a tap; momentary swap when held. | -|`SH_ON` |Turns on swapping and leaves it on. | -|`SH_OFF` |Turn off swapping and leaves it off. Good for returning to a known state.| -|`SH_MON` |Swaps hands when pressed, returns to normal when released (momentary). | -|`SH_MOFF` |Momentarily turns off swap. | -|`SH_TG` |Toggles swap on and off with every key press. | -|`SH_TT` |Toggles with a tap; momentary when held. | -|`SH_OS` |One shot swap hands: toggle while pressed or until next key press. | +|Key |Aliases |Description | +|-----------------------------|---------|----------------------------------------------------| +|`SH_T(kc)` | |Momentary swap when held, `kc` when tapped | +|`QK_SWAP_HANDS_ON` |`SH_ON` |Turn on hand swap | +|`QK_SWAP_HANDS_OFF` |`SH_OFF` |Turn off hand swap | +|`QK_SWAP_HANDS_MOMENTARY_ON` |`SH_MON` |Turn on hand swap while held | +|`QK_SWAP_HANDS_MOMENTARY_OFF`|`SH_MOFF`|Turn off hand swap while held | +|`QK_SWAP_HANDS_TOGGLE` |`SH_TOGG`|Toggle hand swap | +|`QK_SWAP_HANDS_TAP_TOGGLE` |`SH_TT` |Momentary swap when held, toggle when tapped | +|`QK_SWAP_HANDS_ONE_SHOT` |`SH_OS` |Turn on hand swap while held or until next key press| ## Unicode Support :id=unicode-support diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c index f06be1f2ed..6b308a4820 100644 --- a/keyboards/jian/keymaps/advanced/keymap.c +++ b/keyboards/jian/keymaps/advanced/keymap.c @@ -181,7 +181,7 @@ static uint8_t layout_conversion_dip_state = 0; #define LAYOUT_base_wrapper(...) LAYOUT_base(__VA_ARGS__) #ifdef SWAP_HANDS_ENABLE -#define SW_TG SH_TG +#define SW_TG SH_TOGG #else #define SW_TG _______ #endif diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c index 8a1234e1aa..3948dd119f 100644 --- a/keyboards/jian/keymaps/default/keymap.c +++ b/keyboards/jian/keymaps/default/keymap.c @@ -22,7 +22,7 @@ enum jian_keycodes { #define LOWER_T(kc) LT(_LOWER, kc) #ifdef SWAP_HANDS_ENABLE -#define SW_TG SH_TG +#define SW_TG SH_TOGG #else #define SW_TG _______ #endif diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c index 5844ef16e8..3d6c7507ba 100644 --- a/keyboards/jian/keymaps/via/keymap.c +++ b/keyboards/jian/keymaps/via/keymap.c @@ -23,6 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, - _______, SH_TG, _______ + _______, SH_TOGG, _______ ) }; diff --git a/keyboards/jorne/keymaps/default/keymap.c b/keyboards/jorne/keymaps/default/keymap.c index 7484fc3e94..f37dc1c445 100644 --- a/keyboards/jorne/keymaps/default/keymap.c +++ b/keyboards/jorne/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, RGBRST, AS_UP, AS_TOGG, AS_DOWN, _______, _______, _______, _______, AS_DOWN, AS_TOGG, AS_UP, RGBRST, QK_BOOT, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD, - _______, SH_TG, _______, _______, SH_TG, _______ + _______, SH_TOGG, _______, _______, SH_TOGG, _______ ), }; diff --git a/keyboards/jorne/keymaps/via/keymap.c b/keyboards/jorne/keymaps/via/keymap.c index 7484fc3e94..f37dc1c445 100644 --- a/keyboards/jorne/keymaps/via/keymap.c +++ b/keyboards/jorne/keymaps/via/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, RGBRST, AS_UP, AS_TOGG, AS_DOWN, _______, _______, _______, _______, AS_DOWN, AS_TOGG, AS_UP, RGBRST, QK_BOOT, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD, - _______, SH_TG, _______, _______, SH_TG, _______ + _______, SH_TOGG, _______, _______, SH_TOGG, _______ ), }; diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c index 616a337daf..5aec280af3 100644 --- a/keyboards/planck/keymaps/rootiest/keymap.c +++ b/keyboards/planck/keymaps/rootiest/keymap.c @@ -414,7 +414,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_TABULA] = LAYOUT_planck_mit( // KC_ESC, KC_ALTF4, VK_TOGG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_NEXT, UC_WINC, CG_TOGG, AG_TOGG, KC_DLINE, // - KC_NXTAB, KC_SLCTALL, KC_SAVE, KC_TRNS, KC_FIND, SH_TG, SH_TG, IRONY, KC_LCUT, KC_LCOPY, KC_TRNS, KC_KILL, // + KC_NXTAB, KC_SLCTALL, KC_SAVE, KC_TRNS, KC_FIND, SH_TOGG, SH_TOGG, IRONY, KC_LCUT, KC_LCOPY, KC_TRNS, KC_KILL, // KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, TG(_MOUSY), KC_TRNS, KC_HOME, KC_END, SC_SENT, // TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, SC_LSPO, ALT_TAB, SC_RSPC, KC_PRVWD, KC_BRID, KC_BRIU, KC_NXTWD), /* Tabular Layer [8] diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py index 68f08ef212..90fb1d9c94 100644 --- a/keyboards/signum/3_0/keymaps/default/layout.py +++ b/keyboards/signum/3_0/keymaps/default/layout.py @@ -388,7 +388,7 @@ qmk_dict = { "acc2": "KC_ACL2", # Modifiers missinng, add entry for each specific application # Mod-Tap Keys missing, add entry for each specific application - "_Sh_swp": "LSFT_T(SH_TG)", + "_Sh_swp": "LSFT_T(SH_TOGG)", # RGB Lighting missing # RGB Matrix Lighting missing # Thermal Printer missing diff --git a/quantum/keycodes.h b/quantum/keycodes.h index b5f0a32500..eafa9eb1b6 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -304,13 +304,13 @@ enum qk_keycode_defines { KC_RIGHT_SHIFT = 0x00E5, KC_RIGHT_ALT = 0x00E6, KC_RIGHT_GUI = 0x00E7, - SH_TG = 0x56F0, - SH_TT = 0x56F1, - SH_MON = 0x56F2, - SH_MOFF = 0x56F3, - SH_OFF = 0x56F4, - SH_ON = 0x56F5, - SH_OS = 0x56F6, + QK_SWAP_HANDS_TOGGLE = 0x56F0, + QK_SWAP_HANDS_TAP_TOGGLE = 0x56F1, + QK_SWAP_HANDS_MOMENTARY_ON = 0x56F2, + QK_SWAP_HANDS_MOMENTARY_OFF = 0x56F3, + QK_SWAP_HANDS_OFF = 0x56F4, + QK_SWAP_HANDS_ON = 0x56F5, + QK_SWAP_HANDS_ONE_SHOT = 0x56F6, MAGIC_SWAP_CONTROL_CAPSLOCK = 0x7000, MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7001, MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x7002, @@ -863,6 +863,13 @@ enum qk_keycode_defines { KC_RGUI = KC_RIGHT_GUI, KC_RCMD = KC_RIGHT_GUI, KC_RWIN = KC_RIGHT_GUI, + SH_TOGG = QK_SWAP_HANDS_TOGGLE, + SH_TT = QK_SWAP_HANDS_TAP_TOGGLE, + SH_MON = QK_SWAP_HANDS_MOMENTARY_ON, + SH_MOFF = QK_SWAP_HANDS_MOMENTARY_OFF, + SH_OFF = QK_SWAP_HANDS_OFF, + SH_ON = QK_SWAP_HANDS_ON, + SH_OS = QK_SWAP_HANDS_ONE_SHOT, CL_SWAP = MAGIC_SWAP_CONTROL_CAPSLOCK, CL_NORM = MAGIC_UNSWAP_CONTROL_CAPSLOCK, CL_TOGG = MAGIC_TOGGLE_CONTROL_CAPSLOCK, @@ -1309,7 +1316,7 @@ enum qk_keycode_defines { #define IS_MEDIA_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_ASSISTANT) #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2) #define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) -#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS) +#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT) #define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) #define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP) #define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR) diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c index 8aeebf0e06..c89dffeaad 100644 --- a/quantum/process_keycode/process_autocorrect.c +++ b/quantum/process_keycode/process_autocorrect.c @@ -126,7 +126,7 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord // and mask for base keycode when they are tapped. case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX: #ifdef SWAP_HANDS_ENABLE - // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TG, SH_TT, ..., + // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TOGG, SH_TT, ..., // which currently overlap the SH_T(kc) range. if (IS_SWAP_HANDS_KEYCODE(*keycode) || !record->tap.count) { return false; diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c index 4c0217eba7..933abe629e 100644 --- a/quantum/process_keycode/process_caps_word.c +++ b/quantum/process_keycode/process_caps_word.c @@ -143,7 +143,7 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) { #ifdef SWAP_HANDS_ENABLE case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX: - // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TG, SH_TT, ..., + // Note: IS_SWAP_HANDS_KEYCODE() actually tests for the special action keycodes like SH_TOGG, SH_TT, ..., // which currently overlap the SH_T(kc) range. if (IS_SWAP_HANDS_KEYCODE(keycode) || record->tap.count == 0) { return true; diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index 51ec77bae0..28634d00f7 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -3,3 +3,4 @@ // clang-format off // Deprecated Quantum keycodes +#define SH_TG QK_SWAP_HANDS_TOGGLE diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 63350c272d..ab9c292e95 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -1,4 +1,4 @@ -// Copyright 2022 QMK +// Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later /******************************************************************************* @@ -250,13 +250,13 @@ std::map KEYCODE_ID_TABLE = { {KC_RIGHT_SHIFT, "KC_RIGHT_SHIFT"}, {KC_RIGHT_ALT, "KC_RIGHT_ALT"}, {KC_RIGHT_GUI, "KC_RIGHT_GUI"}, - {SH_TG, "SH_TG"}, - {SH_TT, "SH_TT"}, - {SH_MON, "SH_MON"}, - {SH_MOFF, "SH_MOFF"}, - {SH_OFF, "SH_OFF"}, - {SH_ON, "SH_ON"}, - {SH_OS, "SH_OS"}, + {QK_SWAP_HANDS_TOGGLE, "QK_SWAP_HANDS_TOGGLE"}, + {QK_SWAP_HANDS_TAP_TOGGLE, "QK_SWAP_HANDS_TAP_TOGGLE"}, + {QK_SWAP_HANDS_MOMENTARY_ON, "QK_SWAP_HANDS_MOMENTARY_ON"}, + {QK_SWAP_HANDS_MOMENTARY_OFF, "QK_SWAP_HANDS_MOMENTARY_OFF"}, + {QK_SWAP_HANDS_OFF, "QK_SWAP_HANDS_OFF"}, + {QK_SWAP_HANDS_ON, "QK_SWAP_HANDS_ON"}, + {QK_SWAP_HANDS_ONE_SHOT, "QK_SWAP_HANDS_ONE_SHOT"}, {MAGIC_SWAP_CONTROL_CAPSLOCK, "MAGIC_SWAP_CONTROL_CAPSLOCK"}, {MAGIC_UNSWAP_CONTROL_CAPSLOCK, "MAGIC_UNSWAP_CONTROL_CAPSLOCK"}, {MAGIC_TOGGLE_CONTROL_CAPSLOCK, "MAGIC_TOGGLE_CONTROL_CAPSLOCK"}, -- cgit v1.3.1 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 ++ keyboards/ramonimbao/aelith/aelith.c | 17 - keyboards/ramonimbao/aelith/aelith.h | 64 --- keyboards/ramonimbao/aelith/config.h | 60 --- keyboards/ramonimbao/aelith/info.json | 177 -------- .../ramonimbao/aelith/keymaps/default/keymap.c | 33 -- keyboards/ramonimbao/aelith/keymaps/via/keymap.c | 47 --- keyboards/ramonimbao/aelith/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/aelith/readme.md | 14 - keyboards/ramonimbao/aelith/rules.mk | 15 - keyboards/ramonimbao/chevron/chevron.c | 17 - keyboards/ramonimbao/chevron/chevron.h | 75 ---- keyboards/ramonimbao/chevron/config.h | 86 ---- keyboards/ramonimbao/chevron/info.json | 191 --------- .../ramonimbao/chevron/keymaps/default/keymap.c | 42 -- keyboards/ramonimbao/chevron/keymaps/iso/keymap.c | 42 -- keyboards/ramonimbao/chevron/keymaps/via/keymap.c | 86 ---- keyboards/ramonimbao/chevron/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/chevron/readme.md | 20 - keyboards/ramonimbao/chevron/rules.mk | 16 - keyboards/ramonimbao/herringbone/pro/config.h | 68 ---- keyboards/ramonimbao/herringbone/pro/info.json | 327 --------------- .../herringbone/pro/keymaps/default/keymap.c | 99 ----- .../herringbone/pro/keymaps/iso/keymap.c | 99 ----- .../herringbone/pro/keymaps/via/keymap.c | 153 ------- .../herringbone/pro/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/herringbone/pro/pattern.c | 88 ---- keyboards/ramonimbao/herringbone/pro/pattern.h | 20 - keyboards/ramonimbao/herringbone/pro/pro.c | 17 - keyboards/ramonimbao/herringbone/pro/pro.h | 87 ---- keyboards/ramonimbao/herringbone/pro/readme.md | 23 -- keyboards/ramonimbao/herringbone/pro/rules.mk | 22 - keyboards/ramonimbao/herringbone/readme.md | 23 -- keyboards/ramonimbao/herringbone/rules.mk | 1 - keyboards/ramonimbao/herringbone/v1/config.h | 80 ---- keyboards/ramonimbao/herringbone/v1/info.json | 323 --------------- .../herringbone/v1/keymaps/default/keymap.c | 27 -- .../ramonimbao/herringbone/v1/keymaps/iso/keymap.c | 27 -- .../ramonimbao/herringbone/v1/keymaps/via/keymap.c | 51 --- .../ramonimbao/herringbone/v1/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/herringbone/v1/readme.md | 23 -- keyboards/ramonimbao/herringbone/v1/rules.mk | 15 - keyboards/ramonimbao/herringbone/v1/v1.c | 17 - keyboards/ramonimbao/herringbone/v1/v1.h | 82 ---- keyboards/ramonimbao/mona/rules.mk | 1 - keyboards/ramonimbao/mona/v1/config.h | 44 -- keyboards/ramonimbao/mona/v1/info.json | 365 ----------------- .../ramonimbao/mona/v1/keymaps/default/keymap.c | 34 -- keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c | 34 -- keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c | 48 --- keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/mona/v1/readme.md | 19 - keyboards/ramonimbao/mona/v1/rules.mk | 12 - keyboards/ramonimbao/mona/v1/v1.c | 17 - keyboards/ramonimbao/mona/v1/v1.h | 102 ----- keyboards/ramonimbao/mona/v1_1/config.h | 42 -- keyboards/ramonimbao/mona/v1_1/info.json | 439 -------------------- .../ramonimbao/mona/v1_1/keymaps/default/keymap.c | 34 -- .../ramonimbao/mona/v1_1/keymaps/iso/keymap.c | 34 -- .../ramonimbao/mona/v1_1/keymaps/via/keymap.c | 48 --- .../ramonimbao/mona/v1_1/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/mona/v1_1/readme.md | 20 - keyboards/ramonimbao/mona/v1_1/rules.mk | 12 - keyboards/ramonimbao/mona/v1_1/v1_1.c | 17 - keyboards/ramonimbao/mona/v1_1/v1_1.h | 113 ------ keyboards/ramonimbao/mona/v32a/config.h | 42 -- keyboards/ramonimbao/mona/v32a/info.json | 439 -------------------- .../ramonimbao/mona/v32a/keymaps/default/keymap.c | 34 -- .../ramonimbao/mona/v32a/keymaps/iso/keymap.c | 34 -- .../ramonimbao/mona/v32a/keymaps/via/keymap.c | 48 --- .../ramonimbao/mona/v32a/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/mona/v32a/readme.md | 20 - keyboards/ramonimbao/mona/v32a/rules.mk | 15 - keyboards/ramonimbao/mona/v32a/v32a.c | 17 - keyboards/ramonimbao/mona/v32a/v32a.h | 113 ------ keyboards/ramonimbao/squishy65/chconf.h | 31 -- keyboards/ramonimbao/squishy65/config.h | 61 --- keyboards/ramonimbao/squishy65/halconf.h | 27 -- keyboards/ramonimbao/squishy65/info.json | 24 -- .../ramonimbao/squishy65/keymaps/default/keymap.c | 35 -- .../ramonimbao/squishy65/keymaps/iso/keymap.c | 35 -- .../ramonimbao/squishy65/keymaps/via/config.h | 1 - .../ramonimbao/squishy65/keymaps/via/keymap.c | 49 --- .../ramonimbao/squishy65/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/squishy65/mcuconf.h | 37 -- keyboards/ramonimbao/squishy65/readme.md | 14 - keyboards/ramonimbao/squishy65/rules.mk | 15 - keyboards/ramonimbao/squishy65/squishy65.c | 17 - keyboards/ramonimbao/squishy65/squishy65.h | 73 ---- keyboards/ramonimbao/squishyfrl/config.h | 96 ----- keyboards/ramonimbao/squishyfrl/halconf.h | 23 -- keyboards/ramonimbao/squishyfrl/info.json | 260 ------------ .../ramonimbao/squishyfrl/keymaps/default/keymap.c | 33 -- .../squishyfrl/keymaps/default/readme.md | 3 - .../ramonimbao/squishyfrl/keymaps/iso/keymap.c | 33 -- .../ramonimbao/squishyfrl/keymaps/via/config.h | 20 - .../ramonimbao/squishyfrl/keymaps/via/keymap.c | 33 -- .../ramonimbao/squishyfrl/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/squishyfrl/mcuconf.h | 24 -- keyboards/ramonimbao/squishyfrl/readme.md | 18 - keyboards/ramonimbao/squishyfrl/rules.mk | 15 - keyboards/ramonimbao/squishyfrl/squishyfrl.c | 17 - keyboards/ramonimbao/squishyfrl/squishyfrl.h | 91 ----- keyboards/ramonimbao/squishytkl/config.h | 105 ----- keyboards/ramonimbao/squishytkl/halconf.h | 23 -- keyboards/ramonimbao/squishytkl/info.json | 447 --------------------- .../ramonimbao/squishytkl/keymaps/default/keymap.c | 36 -- .../squishytkl/keymaps/default/readme.md | 3 - .../ramonimbao/squishytkl/keymaps/iso/keymap.c | 36 -- .../ramonimbao/squishytkl/keymaps/jis/keymap.c | 38 -- .../ramonimbao/squishytkl/keymaps/via/config.h | 25 -- .../ramonimbao/squishytkl/keymaps/via/keymap.c | 65 --- .../ramonimbao/squishytkl/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/squishytkl/mcuconf.h | 24 -- keyboards/ramonimbao/squishytkl/readme.md | 18 - keyboards/ramonimbao/squishytkl/rules.mk | 16 - keyboards/ramonimbao/squishytkl/squishytkl.c | 17 - keyboards/ramonimbao/squishytkl/squishytkl.h | 127 ------ keyboards/ramonimbao/tkl_ff/config.h | 82 ---- keyboards/ramonimbao/tkl_ff/info.json | 317 --------------- .../ramonimbao/tkl_ff/keymaps/default/keymap.c | 66 --- keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c | 66 --- keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c | 90 ----- keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/tkl_ff/readme.md | 20 - keyboards/ramonimbao/tkl_ff/rules.mk | 14 - keyboards/ramonimbao/tkl_ff/tkl_ff.c | 17 - keyboards/ramonimbao/tkl_ff/tkl_ff.h | 93 ----- keyboards/ramonimbao/tkl_ff/v1/info.json | 5 - keyboards/ramonimbao/tkl_ff/v1/rules.mk | 0 keyboards/ramonimbao/tkl_ff/v2/config.h | 45 --- keyboards/ramonimbao/tkl_ff/v2/info.json | 5 - keyboards/ramonimbao/tkl_ff/v2/rules.mk | 1 - keyboards/ramonimbao/tkl_ff/v2/v2.c | 17 - keyboards/ramonimbao/tkl_ff/v2/v2.h | 18 - keyboards/ramonimbao/wete/readme.md | 14 - keyboards/ramonimbao/wete/rules.mk | 1 - keyboards/ramonimbao/wete/v1/chconf.h | 31 -- keyboards/ramonimbao/wete/v1/config.h | 72 ---- keyboards/ramonimbao/wete/v1/halconf.h | 29 -- keyboards/ramonimbao/wete/v1/info.json | 45 --- .../ramonimbao/wete/v1/keymaps/default/keymap.c | 37 -- keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c | 37 -- keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c | 39 -- keyboards/ramonimbao/wete/v1/keymaps/via/config.h | 1 - keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c | 53 --- keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk | 2 - keyboards/ramonimbao/wete/v1/mcuconf.h | 39 -- keyboards/ramonimbao/wete/v1/readme.md | 14 - keyboards/ramonimbao/wete/v1/rules.mk | 16 - keyboards/ramonimbao/wete/v1/v1.c | 19 - keyboards/ramonimbao/wete/v1/v1.h | 222 ---------- keyboards/ramonimbao/wete/v2/config.h | 102 ----- keyboards/ramonimbao/wete/v2/info.json | 358 ----------------- .../ramonimbao/wete/v2/keymaps/default/keymap.c | 97 ----- keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c | 97 ----- keyboards/ramonimbao/wete/v2/keymaps/via/config.h | 20 - keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c | 135 ------- keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk | 1 - keyboards/ramonimbao/wete/v2/readme.md | 26 -- keyboards/ramonimbao/wete/v2/rules.mk | 13 - keyboards/ramonimbao/wete/v2/v2.c | 17 - keyboards/ramonimbao/wete/v2/v2.h | 110 ----- keyboards/rmi_kb/aelith/aelith.c | 17 + keyboards/rmi_kb/aelith/aelith.h | 64 +++ keyboards/rmi_kb/aelith/config.h | 60 +++ keyboards/rmi_kb/aelith/info.json | 177 ++++++++ keyboards/rmi_kb/aelith/keymaps/default/keymap.c | 33 ++ keyboards/rmi_kb/aelith/keymaps/via/keymap.c | 47 +++ keyboards/rmi_kb/aelith/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/aelith/readme.md | 14 + keyboards/rmi_kb/aelith/rules.mk | 15 + keyboards/rmi_kb/chevron/chevron.c | 17 + keyboards/rmi_kb/chevron/chevron.h | 75 ++++ keyboards/rmi_kb/chevron/config.h | 86 ++++ keyboards/rmi_kb/chevron/info.json | 191 +++++++++ keyboards/rmi_kb/chevron/keymaps/default/keymap.c | 42 ++ keyboards/rmi_kb/chevron/keymaps/iso/keymap.c | 42 ++ keyboards/rmi_kb/chevron/keymaps/via/keymap.c | 86 ++++ keyboards/rmi_kb/chevron/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/chevron/readme.md | 20 + keyboards/rmi_kb/chevron/rules.mk | 16 + keyboards/rmi_kb/herringbone/pro/config.h | 68 ++++ keyboards/rmi_kb/herringbone/pro/info.json | 327 +++++++++++++++ .../herringbone/pro/keymaps/default/keymap.c | 99 +++++ .../rmi_kb/herringbone/pro/keymaps/iso/keymap.c | 99 +++++ .../rmi_kb/herringbone/pro/keymaps/via/keymap.c | 153 +++++++ .../rmi_kb/herringbone/pro/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/herringbone/pro/pattern.c | 88 ++++ keyboards/rmi_kb/herringbone/pro/pattern.h | 20 + keyboards/rmi_kb/herringbone/pro/pro.c | 17 + keyboards/rmi_kb/herringbone/pro/pro.h | 87 ++++ keyboards/rmi_kb/herringbone/pro/readme.md | 23 ++ keyboards/rmi_kb/herringbone/pro/rules.mk | 22 + keyboards/rmi_kb/herringbone/readme.md | 23 ++ keyboards/rmi_kb/herringbone/rules.mk | 1 + keyboards/rmi_kb/herringbone/v1/config.h | 80 ++++ keyboards/rmi_kb/herringbone/v1/info.json | 323 +++++++++++++++ .../rmi_kb/herringbone/v1/keymaps/default/keymap.c | 27 ++ .../rmi_kb/herringbone/v1/keymaps/iso/keymap.c | 27 ++ .../rmi_kb/herringbone/v1/keymaps/via/keymap.c | 51 +++ .../rmi_kb/herringbone/v1/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/herringbone/v1/readme.md | 23 ++ keyboards/rmi_kb/herringbone/v1/rules.mk | 15 + keyboards/rmi_kb/herringbone/v1/v1.c | 17 + keyboards/rmi_kb/herringbone/v1/v1.h | 82 ++++ keyboards/rmi_kb/mona/rules.mk | 1 + keyboards/rmi_kb/mona/v1/config.h | 44 ++ keyboards/rmi_kb/mona/v1/info.json | 365 +++++++++++++++++ keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c | 34 ++ keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c | 34 ++ keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c | 48 +++ keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/mona/v1/readme.md | 19 + keyboards/rmi_kb/mona/v1/rules.mk | 12 + keyboards/rmi_kb/mona/v1/v1.c | 17 + keyboards/rmi_kb/mona/v1/v1.h | 102 +++++ keyboards/rmi_kb/mona/v1_1/config.h | 42 ++ keyboards/rmi_kb/mona/v1_1/info.json | 439 ++++++++++++++++++++ .../rmi_kb/mona/v1_1/keymaps/default/keymap.c | 34 ++ keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c | 34 ++ keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c | 48 +++ keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/mona/v1_1/readme.md | 20 + keyboards/rmi_kb/mona/v1_1/rules.mk | 12 + keyboards/rmi_kb/mona/v1_1/v1_1.c | 17 + keyboards/rmi_kb/mona/v1_1/v1_1.h | 113 ++++++ keyboards/rmi_kb/mona/v32a/config.h | 42 ++ keyboards/rmi_kb/mona/v32a/info.json | 439 ++++++++++++++++++++ .../rmi_kb/mona/v32a/keymaps/default/keymap.c | 34 ++ keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c | 34 ++ keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c | 48 +++ keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/mona/v32a/readme.md | 20 + keyboards/rmi_kb/mona/v32a/rules.mk | 15 + keyboards/rmi_kb/mona/v32a/v32a.c | 17 + keyboards/rmi_kb/mona/v32a/v32a.h | 113 ++++++ keyboards/rmi_kb/squishy65/chconf.h | 31 ++ keyboards/rmi_kb/squishy65/config.h | 61 +++ keyboards/rmi_kb/squishy65/halconf.h | 27 ++ keyboards/rmi_kb/squishy65/info.json | 24 ++ .../rmi_kb/squishy65/keymaps/default/keymap.c | 35 ++ keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c | 35 ++ keyboards/rmi_kb/squishy65/keymaps/via/config.h | 18 + keyboards/rmi_kb/squishy65/keymaps/via/keymap.c | 49 +++ keyboards/rmi_kb/squishy65/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/squishy65/mcuconf.h | 37 ++ keyboards/rmi_kb/squishy65/readme.md | 14 + keyboards/rmi_kb/squishy65/rules.mk | 15 + keyboards/rmi_kb/squishy65/squishy65.c | 17 + keyboards/rmi_kb/squishy65/squishy65.h | 73 ++++ keyboards/rmi_kb/squishyfrl/config.h | 96 +++++ keyboards/rmi_kb/squishyfrl/halconf.h | 23 ++ keyboards/rmi_kb/squishyfrl/info.json | 260 ++++++++++++ .../rmi_kb/squishyfrl/keymaps/default/keymap.c | 33 ++ .../rmi_kb/squishyfrl/keymaps/default/readme.md | 3 + keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c | 33 ++ keyboards/rmi_kb/squishyfrl/keymaps/via/config.h | 20 + keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c | 33 ++ keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/squishyfrl/mcuconf.h | 24 ++ keyboards/rmi_kb/squishyfrl/readme.md | 18 + keyboards/rmi_kb/squishyfrl/rules.mk | 15 + keyboards/rmi_kb/squishyfrl/squishyfrl.c | 17 + keyboards/rmi_kb/squishyfrl/squishyfrl.h | 91 +++++ keyboards/rmi_kb/squishytkl/config.h | 105 +++++ keyboards/rmi_kb/squishytkl/halconf.h | 23 ++ keyboards/rmi_kb/squishytkl/info.json | 447 +++++++++++++++++++++ .../rmi_kb/squishytkl/keymaps/default/keymap.c | 36 ++ .../rmi_kb/squishytkl/keymaps/default/readme.md | 3 + keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c | 36 ++ keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c | 38 ++ keyboards/rmi_kb/squishytkl/keymaps/via/config.h | 25 ++ keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c | 65 +++ keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/squishytkl/mcuconf.h | 24 ++ keyboards/rmi_kb/squishytkl/readme.md | 18 + keyboards/rmi_kb/squishytkl/rules.mk | 16 + keyboards/rmi_kb/squishytkl/squishytkl.c | 17 + keyboards/rmi_kb/squishytkl/squishytkl.h | 127 ++++++ keyboards/rmi_kb/tkl_ff/config.h | 82 ++++ keyboards/rmi_kb/tkl_ff/info.json | 317 +++++++++++++++ keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c | 66 +++ keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c | 66 +++ keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c | 90 +++++ keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/tkl_ff/readme.md | 20 + keyboards/rmi_kb/tkl_ff/rules.mk | 14 + keyboards/rmi_kb/tkl_ff/tkl_ff.c | 17 + keyboards/rmi_kb/tkl_ff/tkl_ff.h | 93 +++++ keyboards/rmi_kb/tkl_ff/v1/info.json | 5 + keyboards/rmi_kb/tkl_ff/v1/rules.mk | 0 keyboards/rmi_kb/tkl_ff/v2/config.h | 45 +++ keyboards/rmi_kb/tkl_ff/v2/info.json | 5 + keyboards/rmi_kb/tkl_ff/v2/rules.mk | 1 + keyboards/rmi_kb/tkl_ff/v2/v2.c | 17 + keyboards/rmi_kb/tkl_ff/v2/v2.h | 18 + keyboards/rmi_kb/wete/readme.md | 14 + keyboards/rmi_kb/wete/rules.mk | 1 + keyboards/rmi_kb/wete/v1/chconf.h | 31 ++ keyboards/rmi_kb/wete/v1/config.h | 72 ++++ keyboards/rmi_kb/wete/v1/halconf.h | 29 ++ keyboards/rmi_kb/wete/v1/info.json | 45 +++ keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c | 37 ++ keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c | 37 ++ keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c | 39 ++ keyboards/rmi_kb/wete/v1/keymaps/via/config.h | 18 + keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c | 53 +++ keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk | 2 + keyboards/rmi_kb/wete/v1/mcuconf.h | 39 ++ keyboards/rmi_kb/wete/v1/readme.md | 14 + keyboards/rmi_kb/wete/v1/rules.mk | 16 + keyboards/rmi_kb/wete/v1/v1.c | 35 ++ keyboards/rmi_kb/wete/v1/v1.h | 238 +++++++++++ keyboards/rmi_kb/wete/v2/config.h | 102 +++++ keyboards/rmi_kb/wete/v2/info.json | 358 +++++++++++++++++ keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c | 97 +++++ keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c | 97 +++++ keyboards/rmi_kb/wete/v2/keymaps/via/config.h | 20 + keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c | 135 +++++++ keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/wete/v2/readme.md | 26 ++ keyboards/rmi_kb/wete/v2/rules.mk | 13 + keyboards/rmi_kb/wete/v2/v2.c | 17 + keyboards/rmi_kb/wete/v2/v2.h | 110 +++++ 325 files changed, 9558 insertions(+), 9450 deletions(-) delete mode 100644 keyboards/ramonimbao/aelith/aelith.c delete mode 100644 keyboards/ramonimbao/aelith/aelith.h delete mode 100644 keyboards/ramonimbao/aelith/config.h delete mode 100644 keyboards/ramonimbao/aelith/info.json delete mode 100644 keyboards/ramonimbao/aelith/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/aelith/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/aelith/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/aelith/readme.md delete mode 100644 keyboards/ramonimbao/aelith/rules.mk delete mode 100644 keyboards/ramonimbao/chevron/chevron.c delete mode 100644 keyboards/ramonimbao/chevron/chevron.h delete mode 100644 keyboards/ramonimbao/chevron/config.h delete mode 100644 keyboards/ramonimbao/chevron/info.json delete mode 100644 keyboards/ramonimbao/chevron/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/chevron/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/chevron/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/chevron/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/chevron/readme.md delete mode 100644 keyboards/ramonimbao/chevron/rules.mk delete mode 100644 keyboards/ramonimbao/herringbone/pro/config.h delete mode 100644 keyboards/ramonimbao/herringbone/pro/info.json delete mode 100644 keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/herringbone/pro/pattern.c delete mode 100644 keyboards/ramonimbao/herringbone/pro/pattern.h delete mode 100644 keyboards/ramonimbao/herringbone/pro/pro.c delete mode 100644 keyboards/ramonimbao/herringbone/pro/pro.h delete mode 100644 keyboards/ramonimbao/herringbone/pro/readme.md delete mode 100644 keyboards/ramonimbao/herringbone/pro/rules.mk delete mode 100644 keyboards/ramonimbao/herringbone/readme.md delete mode 100644 keyboards/ramonimbao/herringbone/rules.mk delete mode 100644 keyboards/ramonimbao/herringbone/v1/config.h delete mode 100644 keyboards/ramonimbao/herringbone/v1/info.json delete mode 100644 keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/herringbone/v1/readme.md delete mode 100644 keyboards/ramonimbao/herringbone/v1/rules.mk delete mode 100644 keyboards/ramonimbao/herringbone/v1/v1.c delete mode 100644 keyboards/ramonimbao/herringbone/v1/v1.h delete mode 100644 keyboards/ramonimbao/mona/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v1/config.h delete mode 100644 keyboards/ramonimbao/mona/v1/info.json delete mode 100644 keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v1/readme.md delete mode 100644 keyboards/ramonimbao/mona/v1/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v1/v1.c delete mode 100644 keyboards/ramonimbao/mona/v1/v1.h delete mode 100644 keyboards/ramonimbao/mona/v1_1/config.h delete mode 100644 keyboards/ramonimbao/mona/v1_1/info.json delete mode 100644 keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v1_1/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v1_1/readme.md delete mode 100644 keyboards/ramonimbao/mona/v1_1/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v1_1/v1_1.c delete mode 100644 keyboards/ramonimbao/mona/v1_1/v1_1.h delete mode 100644 keyboards/ramonimbao/mona/v32a/config.h delete mode 100644 keyboards/ramonimbao/mona/v32a/info.json delete mode 100644 keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/mona/v32a/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v32a/readme.md delete mode 100644 keyboards/ramonimbao/mona/v32a/rules.mk delete mode 100644 keyboards/ramonimbao/mona/v32a/v32a.c delete mode 100644 keyboards/ramonimbao/mona/v32a/v32a.h delete mode 100644 keyboards/ramonimbao/squishy65/chconf.h delete mode 100644 keyboards/ramonimbao/squishy65/config.h delete mode 100644 keyboards/ramonimbao/squishy65/halconf.h delete mode 100644 keyboards/ramonimbao/squishy65/info.json delete mode 100644 keyboards/ramonimbao/squishy65/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/squishy65/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/squishy65/keymaps/via/config.h delete mode 100644 keyboards/ramonimbao/squishy65/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/squishy65/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/squishy65/mcuconf.h delete mode 100644 keyboards/ramonimbao/squishy65/readme.md delete mode 100644 keyboards/ramonimbao/squishy65/rules.mk delete mode 100644 keyboards/ramonimbao/squishy65/squishy65.c delete mode 100644 keyboards/ramonimbao/squishy65/squishy65.h delete mode 100644 keyboards/ramonimbao/squishyfrl/config.h delete mode 100644 keyboards/ramonimbao/squishyfrl/halconf.h delete mode 100644 keyboards/ramonimbao/squishyfrl/info.json delete mode 100644 keyboards/ramonimbao/squishyfrl/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/squishyfrl/keymaps/default/readme.md delete mode 100644 keyboards/ramonimbao/squishyfrl/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/squishyfrl/keymaps/via/config.h delete mode 100644 keyboards/ramonimbao/squishyfrl/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/squishyfrl/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/squishyfrl/mcuconf.h delete mode 100644 keyboards/ramonimbao/squishyfrl/readme.md delete mode 100644 keyboards/ramonimbao/squishyfrl/rules.mk delete mode 100644 keyboards/ramonimbao/squishyfrl/squishyfrl.c delete mode 100644 keyboards/ramonimbao/squishyfrl/squishyfrl.h delete mode 100644 keyboards/ramonimbao/squishytkl/config.h delete mode 100644 keyboards/ramonimbao/squishytkl/halconf.h delete mode 100644 keyboards/ramonimbao/squishytkl/info.json delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/default/readme.md delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/via/config.h delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/squishytkl/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/squishytkl/mcuconf.h delete mode 100644 keyboards/ramonimbao/squishytkl/readme.md delete mode 100644 keyboards/ramonimbao/squishytkl/rules.mk delete mode 100644 keyboards/ramonimbao/squishytkl/squishytkl.c delete mode 100644 keyboards/ramonimbao/squishytkl/squishytkl.h delete mode 100644 keyboards/ramonimbao/tkl_ff/config.h delete mode 100644 keyboards/ramonimbao/tkl_ff/info.json delete mode 100644 keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/tkl_ff/readme.md delete mode 100644 keyboards/ramonimbao/tkl_ff/rules.mk delete mode 100644 keyboards/ramonimbao/tkl_ff/tkl_ff.c delete mode 100644 keyboards/ramonimbao/tkl_ff/tkl_ff.h delete mode 100644 keyboards/ramonimbao/tkl_ff/v1/info.json delete mode 100644 keyboards/ramonimbao/tkl_ff/v1/rules.mk delete mode 100644 keyboards/ramonimbao/tkl_ff/v2/config.h delete mode 100644 keyboards/ramonimbao/tkl_ff/v2/info.json delete mode 100644 keyboards/ramonimbao/tkl_ff/v2/rules.mk delete mode 100644 keyboards/ramonimbao/tkl_ff/v2/v2.c delete mode 100644 keyboards/ramonimbao/tkl_ff/v2/v2.h delete mode 100644 keyboards/ramonimbao/wete/readme.md delete mode 100644 keyboards/ramonimbao/wete/rules.mk delete mode 100644 keyboards/ramonimbao/wete/v1/chconf.h delete mode 100644 keyboards/ramonimbao/wete/v1/config.h delete mode 100644 keyboards/ramonimbao/wete/v1/halconf.h delete mode 100644 keyboards/ramonimbao/wete/v1/info.json delete mode 100644 keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v1/keymaps/via/config.h delete mode 100644 keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/wete/v1/mcuconf.h delete mode 100644 keyboards/ramonimbao/wete/v1/readme.md delete mode 100644 keyboards/ramonimbao/wete/v1/rules.mk delete mode 100644 keyboards/ramonimbao/wete/v1/v1.c delete mode 100644 keyboards/ramonimbao/wete/v1/v1.h delete mode 100644 keyboards/ramonimbao/wete/v2/config.h delete mode 100644 keyboards/ramonimbao/wete/v2/info.json delete mode 100644 keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v2/keymaps/via/config.h delete mode 100644 keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c delete mode 100644 keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk delete mode 100644 keyboards/ramonimbao/wete/v2/readme.md delete mode 100644 keyboards/ramonimbao/wete/v2/rules.mk delete mode 100644 keyboards/ramonimbao/wete/v2/v2.c delete mode 100644 keyboards/ramonimbao/wete/v2/v2.h create mode 100644 keyboards/rmi_kb/aelith/aelith.c create mode 100644 keyboards/rmi_kb/aelith/aelith.h create mode 100644 keyboards/rmi_kb/aelith/config.h create mode 100644 keyboards/rmi_kb/aelith/info.json create mode 100644 keyboards/rmi_kb/aelith/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/aelith/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/aelith/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/aelith/readme.md create mode 100644 keyboards/rmi_kb/aelith/rules.mk create mode 100644 keyboards/rmi_kb/chevron/chevron.c create mode 100644 keyboards/rmi_kb/chevron/chevron.h create mode 100644 keyboards/rmi_kb/chevron/config.h create mode 100644 keyboards/rmi_kb/chevron/info.json create mode 100644 keyboards/rmi_kb/chevron/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/chevron/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/chevron/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/chevron/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/chevron/readme.md create mode 100644 keyboards/rmi_kb/chevron/rules.mk create mode 100644 keyboards/rmi_kb/herringbone/pro/config.h create mode 100644 keyboards/rmi_kb/herringbone/pro/info.json create mode 100644 keyboards/rmi_kb/herringbone/pro/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/herringbone/pro/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/herringbone/pro/pattern.c create mode 100644 keyboards/rmi_kb/herringbone/pro/pattern.h create mode 100644 keyboards/rmi_kb/herringbone/pro/pro.c create mode 100644 keyboards/rmi_kb/herringbone/pro/pro.h create mode 100644 keyboards/rmi_kb/herringbone/pro/readme.md create mode 100644 keyboards/rmi_kb/herringbone/pro/rules.mk create mode 100644 keyboards/rmi_kb/herringbone/readme.md create mode 100644 keyboards/rmi_kb/herringbone/rules.mk create mode 100644 keyboards/rmi_kb/herringbone/v1/config.h create mode 100644 keyboards/rmi_kb/herringbone/v1/info.json create mode 100644 keyboards/rmi_kb/herringbone/v1/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/herringbone/v1/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/herringbone/v1/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/herringbone/v1/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/herringbone/v1/readme.md create mode 100644 keyboards/rmi_kb/herringbone/v1/rules.mk create mode 100644 keyboards/rmi_kb/herringbone/v1/v1.c create mode 100644 keyboards/rmi_kb/herringbone/v1/v1.h create mode 100644 keyboards/rmi_kb/mona/rules.mk create mode 100644 keyboards/rmi_kb/mona/v1/config.h create mode 100644 keyboards/rmi_kb/mona/v1/info.json create mode 100644 keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/mona/v1/readme.md create mode 100644 keyboards/rmi_kb/mona/v1/rules.mk create mode 100644 keyboards/rmi_kb/mona/v1/v1.c create mode 100644 keyboards/rmi_kb/mona/v1/v1.h create mode 100644 keyboards/rmi_kb/mona/v1_1/config.h create mode 100644 keyboards/rmi_kb/mona/v1_1/info.json create mode 100644 keyboards/rmi_kb/mona/v1_1/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/mona/v1_1/readme.md create mode 100644 keyboards/rmi_kb/mona/v1_1/rules.mk create mode 100644 keyboards/rmi_kb/mona/v1_1/v1_1.c create mode 100644 keyboards/rmi_kb/mona/v1_1/v1_1.h create mode 100644 keyboards/rmi_kb/mona/v32a/config.h create mode 100644 keyboards/rmi_kb/mona/v32a/info.json create mode 100644 keyboards/rmi_kb/mona/v32a/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/mona/v32a/readme.md create mode 100644 keyboards/rmi_kb/mona/v32a/rules.mk create mode 100644 keyboards/rmi_kb/mona/v32a/v32a.c create mode 100644 keyboards/rmi_kb/mona/v32a/v32a.h create mode 100644 keyboards/rmi_kb/squishy65/chconf.h create mode 100644 keyboards/rmi_kb/squishy65/config.h create mode 100644 keyboards/rmi_kb/squishy65/halconf.h create mode 100644 keyboards/rmi_kb/squishy65/info.json create mode 100644 keyboards/rmi_kb/squishy65/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/squishy65/keymaps/via/config.h create mode 100644 keyboards/rmi_kb/squishy65/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/squishy65/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/squishy65/mcuconf.h create mode 100644 keyboards/rmi_kb/squishy65/readme.md create mode 100644 keyboards/rmi_kb/squishy65/rules.mk create mode 100644 keyboards/rmi_kb/squishy65/squishy65.c create mode 100644 keyboards/rmi_kb/squishy65/squishy65.h create mode 100644 keyboards/rmi_kb/squishyfrl/config.h create mode 100644 keyboards/rmi_kb/squishyfrl/halconf.h create mode 100644 keyboards/rmi_kb/squishyfrl/info.json create mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md create mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/via/config.h create mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/squishyfrl/mcuconf.h create mode 100644 keyboards/rmi_kb/squishyfrl/readme.md create mode 100644 keyboards/rmi_kb/squishyfrl/rules.mk create mode 100644 keyboards/rmi_kb/squishyfrl/squishyfrl.c create mode 100644 keyboards/rmi_kb/squishyfrl/squishyfrl.h create mode 100644 keyboards/rmi_kb/squishytkl/config.h create mode 100644 keyboards/rmi_kb/squishytkl/halconf.h create mode 100644 keyboards/rmi_kb/squishytkl/info.json create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/default/readme.md create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/via/config.h create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/squishytkl/mcuconf.h create mode 100644 keyboards/rmi_kb/squishytkl/readme.md create mode 100644 keyboards/rmi_kb/squishytkl/rules.mk create mode 100644 keyboards/rmi_kb/squishytkl/squishytkl.c create mode 100644 keyboards/rmi_kb/squishytkl/squishytkl.h create mode 100644 keyboards/rmi_kb/tkl_ff/config.h create mode 100644 keyboards/rmi_kb/tkl_ff/info.json create mode 100644 keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/tkl_ff/readme.md create mode 100644 keyboards/rmi_kb/tkl_ff/rules.mk create mode 100644 keyboards/rmi_kb/tkl_ff/tkl_ff.c create mode 100644 keyboards/rmi_kb/tkl_ff/tkl_ff.h create mode 100644 keyboards/rmi_kb/tkl_ff/v1/info.json create mode 100644 keyboards/rmi_kb/tkl_ff/v1/rules.mk create mode 100644 keyboards/rmi_kb/tkl_ff/v2/config.h create mode 100644 keyboards/rmi_kb/tkl_ff/v2/info.json create mode 100644 keyboards/rmi_kb/tkl_ff/v2/rules.mk create mode 100644 keyboards/rmi_kb/tkl_ff/v2/v2.c create mode 100644 keyboards/rmi_kb/tkl_ff/v2/v2.h create mode 100644 keyboards/rmi_kb/wete/readme.md create mode 100644 keyboards/rmi_kb/wete/rules.mk create mode 100644 keyboards/rmi_kb/wete/v1/chconf.h create mode 100644 keyboards/rmi_kb/wete/v1/config.h create mode 100644 keyboards/rmi_kb/wete/v1/halconf.h create mode 100644 keyboards/rmi_kb/wete/v1/info.json create mode 100644 keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c create mode 100644 keyboards/rmi_kb/wete/v1/keymaps/via/config.h create mode 100644 keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/wete/v1/mcuconf.h create mode 100644 keyboards/rmi_kb/wete/v1/readme.md create mode 100644 keyboards/rmi_kb/wete/v1/rules.mk create mode 100644 keyboards/rmi_kb/wete/v1/v1.c create mode 100644 keyboards/rmi_kb/wete/v1/v1.h create mode 100644 keyboards/rmi_kb/wete/v2/config.h create mode 100644 keyboards/rmi_kb/wete/v2/info.json create mode 100644 keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c create mode 100644 keyboards/rmi_kb/wete/v2/keymaps/via/config.h create mode 100644 keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/wete/v2/readme.md create mode 100644 keyboards/rmi_kb/wete/v2/rules.mk create mode 100644 keyboards/rmi_kb/wete/v2/v2.c create mode 100644 keyboards/rmi_kb/wete/v2/v2.h (limited to 'data') 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" }, diff --git a/keyboards/ramonimbao/aelith/aelith.c b/keyboards/ramonimbao/aelith/aelith.c deleted file mode 100644 index e2153f7645..0000000000 --- a/keyboards/ramonimbao/aelith/aelith.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#include "aelith.h" diff --git a/keyboards/ramonimbao/aelith/aelith.h b/keyboards/ramonimbao/aelith/aelith.h deleted file mode 100644 index 47fe9a90ed..0000000000 --- a/keyboards/ramonimbao/aelith/aelith.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define XXX KC_NO - -// Split backspace -// Split right shift -#define LAYOUT_alice_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \ - k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ - k41, k43, k44, k46, k49, k4b, k4f \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \ - { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \ - { XXX, k41, XXX, k43, k44, XXX, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \ -} - -// 2u backspace -// Split right shift -#define LAYOUT_alice( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \ - k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ - k41, k43, k44, k46, k49, k4b, k4f \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \ - { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \ - { XXX, k41, XXX, k43, k44, XXX, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \ -} diff --git a/keyboards/ramonimbao/aelith/config.h b/keyboards/ramonimbao/aelith/config.h deleted file mode 100644 index 99bc99049f..0000000000 --- a/keyboards/ramonimbao/aelith/config.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D1, D0, D6, A7 } -#define MATRIX_COL_PINS { D7, C0, C1, C2, C3, C4, C5, C6, C7, A6, A5, A0, A1, A2, A3, A4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ramonimbao/aelith/info.json b/keyboards/ramonimbao/aelith/info.json deleted file mode 100644 index cef0556993..0000000000 --- a/keyboards/ramonimbao/aelith/info.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "keyboard_name": "AELITH", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0xE460", - "device_version": "0.1.2" - }, - "processor": "atmega32a", - "bootloader": "usbasploader", - "community_layouts": ["alice", "alice_split_bs"], - "layouts": { - "LAYOUT_alice_split_bs": { - "layout": [ - {"x":0.5, "y":0}, - - {"x":1.75, "y":0}, - {"x":2.75, "y":0}, - {"x":3.75, "y":0}, - {"x":4.75, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":16, "y":0}, - {"x":17, "y":0}, - {"x":18, "y":0}, - - {"x":0.25, "y":1}, - {"x":1.75, "y":1, "w":1.5}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1}, - {"x":16.5, "y":1}, - {"x":17.5, "y":1, "w":1.5}, - - {"x":0, "y":2}, - - {"x":1.75, "y":2, "w":1.75}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, - - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2}, - {"x":14.75, "y":2}, - {"x":15.75, "y":2}, - {"x":16.75, "y":2, "w":2.25}, - - {"x":1.75, "y":3, "w":2.25}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3}, - {"x":15.25, "y":3}, - {"x":16.25, "y":3, "w":1.75}, - {"x":18, "y":3}, - - {"x":1.75, "y":4, "w":1.5}, - {"x":4.5, "y":4, "w":1.5}, - {"x":6, "y":4, "w":2.25}, - {"x":8.25, "y":4}, - - {"x":10.25, "y":4, "w":2.75}, - {"x":13, "y":4, "w":1.5}, - {"x":17.5, "y":4, "w":1.5} - ] - }, - "LAYOUT_alice": { - "layout": [ - {"x":0.5, "y":0}, - - {"x":1.75, "y":0}, - {"x":2.75, "y":0}, - {"x":3.75, "y":0}, - {"x":4.75, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":16, "y":0}, - {"x":17, "y":0, "w":2}, - - {"x":0.25, "y":1}, - {"x":1.75, "y":1, "w":1.5}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1}, - {"x":16.5, "y":1}, - {"x":17.5, "y":1, "w":1.5}, - - {"x":0, "y":2}, - - {"x":1.75, "y":2, "w":1.75}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, - - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2}, - {"x":14.75, "y":2}, - {"x":15.75, "y":2}, - {"x":16.75, "y":2, "w":2.25}, - - {"x":1.75, "y":3, "w":2.25}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3}, - {"x":15.25, "y":3}, - {"x":16.25, "y":3, "w":1.75}, - {"x":18, "y":3}, - - {"x":1.75, "y":4, "w":1.5}, - {"x":4.5, "y":4, "w":1.5}, - {"x":6, "y":4, "w":2.25}, - {"x":8.25, "y":4}, - - {"x":10.25, "y":4, "w":2.75}, - {"x":13, "y":4, "w":1.5}, - {"x":17.5, "y":4, "w":1.5} - ] - } - } -} diff --git a/keyboards/ramonimbao/aelith/keymaps/default/keymap.c b/keyboards/ramonimbao/aelith/keymaps/default/keymap.c deleted file mode 100644 index 64e74607e1..0000000000 --- a/keyboards/ramonimbao/aelith/keymaps/default/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_alice_split_bs( - KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, - KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL - ), - [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - ), -}; diff --git a/keyboards/ramonimbao/aelith/keymaps/via/keymap.c b/keyboards/ramonimbao/aelith/keymaps/via/keymap.c deleted file mode 100644 index e916d6e6c1..0000000000 --- a/keyboards/ramonimbao/aelith/keymaps/via/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_alice_split_bs( - KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, - KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL - ), - [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_alice_split_bs( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_alice_split_bs( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - ), -}; diff --git a/keyboards/ramonimbao/aelith/keymaps/via/rules.mk b/keyboards/ramonimbao/aelith/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/aelith/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/aelith/readme.md b/keyboards/ramonimbao/aelith/readme.md deleted file mode 100644 index 243d58e292..0000000000 --- a/keyboards/ramonimbao/aelith/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# ÆLITH - -![ÆLITH](https://i.imgur.com/wG1OWLol.png) - -A through-hole Alice-layout keyboard. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32A - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/aelith:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/aelith/rules.mk b/keyboards/ramonimbao/aelith/rules.mk deleted file mode 100644 index 1e9f925544..0000000000 --- a/keyboards/ramonimbao/aelith/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ramonimbao/chevron/chevron.c b/keyboards/ramonimbao/chevron/chevron.c deleted file mode 100644 index 5b15d3324c..0000000000 --- a/keyboards/ramonimbao/chevron/chevron.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "chevron.h" diff --git a/keyboards/ramonimbao/chevron/chevron.h b/keyboards/ramonimbao/chevron/chevron.h deleted file mode 100644 index 0f95555c55..0000000000 --- a/keyboards/ramonimbao/chevron/chevron.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define XXX KC_NO - -#define LAYOUT_ansi( \ - k1d, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \ - k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \ - { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ -} - -#define LAYOUT_iso( \ - k1d, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \ - k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \ - { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ -} - -#define LAYOUT_all( \ - k40, k1d, k41, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \ - k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \ - { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \ - { k40, k41, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ -} diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/ramonimbao/chevron/config.h deleted file mode 100644 index 624162cff1..0000000000 --- a/keyboards/ramonimbao/chevron/config.h +++ /dev/null @@ -1,86 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D6, C0, D7, NO_PIN } -#define MATRIX_COL_PINS { A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, A4, A3, A2, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* QoL improvements */ -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT - -/* Encoder */ -#define ENCODERS_PAD_A { A0 } -#define ENCODERS_PAD_B { A1 } - -//#define ENCODER_DIRECTION_FLIP diff --git a/keyboards/ramonimbao/chevron/info.json b/keyboards/ramonimbao/chevron/info.json deleted file mode 100644 index 8e2c26563a..0000000000 --- a/keyboards/ramonimbao/chevron/info.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "keyboard_name": "Chevron", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "ramonimbao", - "usb": { - "vid": "0xB16B", - "pid": "0xC4EE", - "device_version": "0.1.2" - }, - "processor": "atmega32a", - "bootloader": "usbasploader", - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"x":13.5, "y":0}, - - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.25}, - {"x":1.25, "y":2}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2}, - {"x":8.25, "y":2}, - {"x":9.25, "y":2}, - {"x":10.25, "y":2}, - {"x":11.25, "y":2}, - {"x":12.25, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, - {"x":8.75, "y":3}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3}, - {"x":11.75, "y":3, "w":1.75}, - {"x":13.5, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":3}, - {"x":6.75, "y":4}, - {"x":7.75, "y":4, "w":3}, - {"x":10.75, "y":4, "w":1.25}, - {"x":12, "y":4, "w":1.25}, - {"x":13.25, "y":4, "w":1.25} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"x":13.5, "y":0}, - - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - - {"x":0, "y":2, "w":1.25}, - {"x":1.25, "y":2}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2}, - {"x":8.25, "y":2}, - {"x":9.25, "y":2}, - {"x":10.25, "y":2}, - {"x":11.25, "y":2}, - {"x":12.25, "y":2}, - {"x":13.25, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, - {"x":8.75, "y":3}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3}, - {"x":11.75, "y":3, "w":1.75}, - {"x":13.5, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":3}, - {"x":6.75, "y":4}, - {"x":7.75, "y":4, "w":3}, - {"x":10.75, "y":4, "w":1.25}, - {"x":12, "y":4, "w":1.25}, - {"x":13.25, "y":4, "w":1.25} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0}, - - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.25}, - {"x":1.25, "y":2}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2}, - {"x":8.25, "y":2}, - {"x":9.25, "y":2}, - {"x":10.25, "y":2}, - {"x":11.25, "y":2}, - {"x":12.25, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, - {"x":8.75, "y":3}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3}, - {"x":11.75, "y":3, "w":1.75}, - {"x":13.5, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":3}, - {"x":6.75, "y":4}, - {"x":7.75, "y":4, "w":3}, - {"x":10.75, "y":4, "w":1.25}, - {"x":12, "y":4, "w":1.25}, - {"x":13.25, "y":4, "w":1.25} - ] - } - } -} diff --git a/keyboards/ramonimbao/chevron/keymaps/default/keymap.c b/keyboards/ramonimbao/chevron/keymaps/default/keymap.c deleted file mode 100644 index 45c7494f8b..0000000000 --- a/keyboards/ramonimbao/chevron/keymaps/default/keymap.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_MUTE, - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_BSPC, KC_RALT, KC_RGUI, KC_RCTL - ), - [1] = LAYOUT_ansi( - _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/ramonimbao/chevron/keymaps/iso/keymap.c b/keyboards/ramonimbao/chevron/keymaps/iso/keymap.c deleted file mode 100644 index ed18fc0e54..0000000000 --- a/keyboards/ramonimbao/chevron/keymaps/iso/keymap.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_MUTE, - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_BSPC, KC_RALT, KC_RGUI, KC_RCTL - ), - [1] = LAYOUT_iso( - _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/ramonimbao/chevron/keymaps/via/keymap.c b/keyboards/ramonimbao/chevron/keymaps/via/keymap.c deleted file mode 100644 index 190a39e257..0000000000 --- a/keyboards/ramonimbao/chevron/keymaps/via/keymap.c +++ /dev/null @@ -1,86 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_VOLD, KC_MUTE, KC_VOLU, - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_BSPC, KC_RALT, KC_RGUI, KC_RCTL - ), - [1] = LAYOUT_all( - _______, _______, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; - -keyevent_t encoder_ccw = { - .key = (keypos_t){.row = 4, .col = 0}, - .pressed = false -}; - -keyevent_t encoder_cw = { - .key = (keypos_t){.row = 4, .col = 1}, - .pressed = false -}; - -void matrix_scan_user(void) { - if (IS_PRESSED(encoder_ccw)) { - encoder_ccw.pressed = false; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - } - - if (IS_PRESSED(encoder_cw)) { - encoder_cw.pressed = false; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - } -} - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - encoder_cw.pressed = true; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - wait_ms(20); - } else { - encoder_ccw.pressed = true; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - wait_ms(20); - } - return true; -} diff --git a/keyboards/ramonimbao/chevron/keymaps/via/rules.mk b/keyboards/ramonimbao/chevron/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/chevron/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/chevron/readme.md b/keyboards/ramonimbao/chevron/readme.md deleted file mode 100644 index 9c2b990ef2..0000000000 --- a/keyboards/ramonimbao/chevron/readme.md +++ /dev/null @@ -1,20 +0,0 @@ -# Chevron - -![Chevron](https://i.imgur.com/abOuPNdl.png) - -A through-hole 40% keyboard. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32A - -To get to the bootloader, - - 1. Press and hold the BOOT button - 2. Press the RESET button - 3. Release the BOOT button - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/chevron:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/chevron/rules.mk b/keyboards/ramonimbao/chevron/rules.mk deleted file mode 100644 index 36c6a2d050..0000000000 --- a/keyboards/ramonimbao/chevron/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h deleted file mode 100644 index 60b1a3f64b..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/config.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 7 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6, NO_PIN } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* Encoder pin assignment */ -#define ENCODERS_PAD_A { C3 } -#define ENCODERS_PAD_B { C2 } - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Small QoL improvements */ -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ramonimbao/herringbone/pro/info.json b/keyboards/ramonimbao/herringbone/pro/info.json deleted file mode 100644 index 3c7e7bead1..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/info.json +++ /dev/null @@ -1,327 +0,0 @@ -{ - "keyboard_name": "Herringbone Pro", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x440B", - "device_version": "0.1.2" - }, - "processor": "atmega32a", - "bootloader": "usbasploader", - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - - {"x": 15.5, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - - {"x": 15.5, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25, "w": 2.25}, - - {"x": 15.5, "y": 3.25}, - - {"x": 0, "y": 4.25, "w": 2.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 1.75}, - - {"x": 14.25, "y": 4.5}, - - {"x": 15.5, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.5}, - {"x": 11.5, "y": 5.25, "w": 1.5}, - - {"x": 13.25, "y": 5.5}, - {"x": 14.25, "y": 5.5}, - {"x": 15.25, "y": 5.5} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - - {"x": 15.5, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - - {"x": 15.5, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - {"x": 15.5, "y": 3.25}, - - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 1.75}, - - {"x": 14.25, "y": 4.5}, - - {"x": 15.5, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.5}, - {"x": 11.5, "y": 5.25, "w": 1.5}, - - {"x": 13.25, "y": 5.5}, - {"x": 14.25, "y": 5.5}, - {"x": 15.25, "y": 5.5} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25}, - {"x": 14, "y": 1.25}, - - {"x": 15.5, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - - {"x": 15.5, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25, "w": 2.25}, - - {"x": 15.5, "y": 3.25}, - - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 1.75}, - - {"x": 14.25, "y": 4.5}, - - {"x": 15.5, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 2.25}, - {"x": 6, "y": 5.25, "w": 1.25}, - {"x": 7.25, "y": 5.25, "w": 2.75}, - {"x": 10, "y": 5.25, "w": 1.5}, - {"x": 11.5, "y": 5.25, "w": 1.5}, - - {"x": 13.25, "y": 5.5}, - {"x": 14.25, "y": 5.5}, - {"x": 15.25, "y": 5.5} - ] - } - } -} diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c deleted file mode 100644 index a04192a3e4..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c +++ /dev/null @@ -1,99 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -#include "pattern.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), -}; - -#ifdef OLED_ENABLE -uint32_t anim_timer = 0; -uint32_t anim_sleep = 0; -uint8_t current_frame = 0; - -#define FRAME_DURATION 50 - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - anim_sleep = timer_read32(); - oled_on(); - } else { - tap_code(KC_VOLD); - anim_sleep = timer_read32(); - oled_on(); - } - return true; -} - -static void render_pattern(void) { - void animate(void) { - oled_set_cursor(4, 0); - oled_write_raw_P(pattern_a[current_frame], 96); - oled_set_cursor(4, 1); - oled_write_raw_P(pattern_b[current_frame], 96); - oled_set_cursor(4, 2); - oled_write_raw_P(pattern_a[current_frame], 96); - - current_frame = (current_frame + 1) % 32; - } - - if (get_current_wpm() != 000) { - oled_on(); - if (timer_elapsed32(anim_timer) > FRAME_DURATION) { - anim_timer = timer_read32(); - animate(); - } - anim_sleep = timer_read32(); - } else { - if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { - oled_off(); - } else { - oled_on(); - if (timer_elapsed32(anim_timer) > FRAME_DURATION) { - anim_timer = timer_read32(); - animate(); - } - } - } -} - -bool oled_task_user(void) { - // Render Herringbone pattern - render_pattern(); - oled_render(); - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(0, 0); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_set_cursor(0, 1); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_set_cursor(0, 2); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - oled_render(); - return false; -} -#endif diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c deleted file mode 100644 index 6d280905dc..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c +++ /dev/null @@ -1,99 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -#include "pattern.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), -}; - -#ifdef OLED_ENABLE -uint32_t anim_timer = 0; -uint32_t anim_sleep = 0; -uint8_t current_frame = 0; - -#define FRAME_DURATION 50 - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - anim_sleep = timer_read32(); - oled_on(); - } else { - tap_code(KC_VOLD); - anim_sleep = timer_read32(); - oled_on(); - } - return true; -} - -static void render_pattern(void) { - void animate(void) { - oled_set_cursor(4, 0); - oled_write_raw_P(pattern_a[current_frame], 96); - oled_set_cursor(4, 1); - oled_write_raw_P(pattern_b[current_frame], 96); - oled_set_cursor(4, 2); - oled_write_raw_P(pattern_a[current_frame], 96); - - current_frame = (current_frame + 1) % 32; - } - - if (get_current_wpm() != 000) { - oled_on(); - if (timer_elapsed32(anim_timer) > FRAME_DURATION) { - anim_timer = timer_read32(); - animate(); - } - anim_sleep = timer_read32(); - } else { - if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { - oled_off(); - } else { - oled_on(); - if (timer_elapsed32(anim_timer) > FRAME_DURATION) { - anim_timer = timer_read32(); - animate(); - } - } - } -} - -bool oled_task_user(void) { - // Render Herringbone pattern - render_pattern(); - oled_render(); - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(0, 0); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_set_cursor(0, 1); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_set_cursor(0, 2); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - oled_render(); - return false; -} -#endif diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c deleted file mode 100644 index 71622cddcf..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c +++ /dev/null @@ -1,153 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -#include "pattern.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_VOLD, KC_MUTE, KC_VOLU, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; - -keyevent_t encoder_ccw = { - .key = (keypos_t){.row = 6, .col = 0}, - .pressed = false -}; - -keyevent_t encoder_cw = { - .key = (keypos_t){.row = 6, .col = 1}, - .pressed = false -}; - -void matrix_scan_user(void) { - if (IS_PRESSED(encoder_ccw)) { - encoder_ccw.pressed = false; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - } - - if (IS_PRESSED(encoder_cw)) { - encoder_cw.pressed = false; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - } -} - -#ifdef OLED_ENABLE -uint32_t anim_timer = 0; -uint32_t anim_sleep = 0; -uint8_t current_frame = 0; - -#define FRAME_DURATION 50 - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - encoder_cw.pressed = true; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - wait_ms(20); - anim_sleep = timer_read32(); - oled_on(); - } else { - encoder_ccw.pressed = true; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - wait_ms(20); - anim_sleep = timer_read32(); - oled_on(); - } - return true; -} - -static void render_pattern(void) { - void animate(void) { - oled_set_cursor(4, 0); - oled_write_raw_P(pattern_a[current_frame], 96); - oled_set_cursor(4, 1); - oled_write_raw_P(pattern_b[current_frame], 96); - oled_set_cursor(4, 2); - oled_write_raw_P(pattern_a[current_frame], 96); - - current_frame = (current_frame + 1) % 32; - } - - if (get_current_wpm() != 000) { - oled_on(); - if (timer_elapsed32(anim_timer) > FRAME_DURATION) { - anim_timer = timer_read32(); - animate(); - } - anim_sleep = timer_read32(); - } else { - if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { - oled_off(); - } else { - oled_on(); - if (timer_elapsed32(anim_timer) > FRAME_DURATION) { - anim_timer = timer_read32(); - animate(); - } - } - } -} - -bool oled_task_user(void) { - // Render Herringbone pattern - render_pattern(); - oled_render(); - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(0, 0); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_set_cursor(0, 1); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_set_cursor(0, 2); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - oled_render(); - return false; -} -#endif diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk b/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/herringbone/pro/pattern.c b/keyboards/ramonimbao/herringbone/pro/pattern.c deleted file mode 100644 index 135c067b68..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/pattern.c +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#include "pattern.h" -#include "progmem.h" - -// I tried doing this with 32x8 but I can't align it perfectly -const char PROGMEM pattern_a[32][96] = { - { 255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127 }, - { 127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63 }, - { 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31 }, - { 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15 }, - { 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7 }, - { 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3 }, - { 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1 }, - { 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128 }, - { 128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192 }, - { 192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224 }, - { 224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240 }, - { 240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248 }, - { 248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252 }, - { 252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254 }, - { 254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255 }, - { 255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255 }, - { 255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0 }, - { 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0 }, - { 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1 }, - { 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3 }, - { 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7 }, - { 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15 }, - { 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31 }, - { 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63 }, - { 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127 }, - { 127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254 }, - { 254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252 }, - { 252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248 }, - { 248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240 }, - { 240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224 }, - { 224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192 }, - { 192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255 }, -}; -const char PROGMEM pattern_b[32][96] = { - { 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192 }, - { 192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224 }, - { 224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240 }, - { 240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248 }, - { 248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252 }, - { 252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254 }, - { 254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255 }, - { 255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255 }, - { 255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127 }, - { 127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63 }, - { 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31 }, - { 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15 }, - { 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7 }, - { 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3 }, - { 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1 }, - { 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128 }, - { 128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127 }, - { 127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254 }, - { 254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252 }, - { 252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248 }, - { 248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240 }, - { 240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224 }, - { 224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192 }, - { 192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128 }, - { 128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0 }, - { 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0 }, - { 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1 }, - { 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3 }, - { 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7 }, - { 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15 }, - { 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31 }, - { 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63 }, -}; diff --git a/keyboards/ramonimbao/herringbone/pro/pattern.h b/keyboards/ramonimbao/herringbone/pro/pattern.h deleted file mode 100644 index a564e4abb4..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/pattern.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -extern const char pattern_a[32][96]; -extern const char pattern_b[32][96]; diff --git a/keyboards/ramonimbao/herringbone/pro/pro.c b/keyboards/ramonimbao/herringbone/pro/pro.c deleted file mode 100644 index 4c11baefcc..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/pro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#include "pro.h" diff --git a/keyboards/ramonimbao/herringbone/pro/pro.h b/keyboards/ramonimbao/herringbone/pro/pro.h deleted file mode 100644 index 28494e0ddc..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/pro.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define XXX KC_NO - -#define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ - k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ - { k50, XXX, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX} \ -} - -#define LAYOUT_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k2d, k3e, \ - k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ - k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ - { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -// Split backspace -// Split space -// Encoder functionality exposed -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k60, k0e, k61, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ - k50, k52, k53, k54, k55, k57, k59, k5a, k5c, k5d, k5e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ - { k50, k51, k52, k53, k54, k55, XXX, k57, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ - { k60, k61, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/ramonimbao/herringbone/pro/readme.md b/keyboards/ramonimbao/herringbone/pro/readme.md deleted file mode 100644 index abf5fc851c..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Herringbone Pro - -![Herringbone Pro](https://i.imgur.com/cewklY5l.png) - -A through-hole 75% keyboard with a rotary encoder and OLED display! - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32A -* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) - -To get to the bootloader, - -1. Press and hold the BOOT button - -2. Press the RESET button - -3. Release the BOOT button - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/herringbone/pro:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/herringbone/pro/rules.mk b/keyboards/ramonimbao/herringbone/pro/rules.mk deleted file mode 100644 index db45e4f61c..0000000000 --- a/keyboards/ramonimbao/herringbone/pro/rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -WPM_ENABLE = yes -LTO_ENABLE = yes - -SRC += pattern.c diff --git a/keyboards/ramonimbao/herringbone/readme.md b/keyboards/ramonimbao/herringbone/readme.md deleted file mode 100644 index b1f745c719..0000000000 --- a/keyboards/ramonimbao/herringbone/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Herringbone and Herringbone Pro - -Through-hole 75% keyboards. The Pro version has support for rotary knob, OLED display, and split space. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32A -* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) - -To get to the bootloader, - -1. Press and hold the BOOT button - -2. Press the RESET button - -3. Release the BOOT button - -Make example for these keyboards (after setting up your build environment): - - make ramonimbao/herringbone/v1:default - - make ramonimbao/herringbone/pro:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/herringbone/rules.mk b/keyboards/ramonimbao/herringbone/rules.mk deleted file mode 100644 index cd0dc7b855..0000000000 --- a/keyboards/ramonimbao/herringbone/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = ramonimbao/herringbone/v1 diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/ramonimbao/herringbone/v1/config.h deleted file mode 100644 index 89fbf781d5..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/config.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Small QoL improvements */ -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ramonimbao/herringbone/v1/info.json b/keyboards/ramonimbao/herringbone/v1/info.json deleted file mode 100644 index 35bdd08af2..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/info.json +++ /dev/null @@ -1,323 +0,0 @@ -{ - "keyboard_name": "Herringbone", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x04E5", - "device_version": "0.1.2" - }, - "processor": "atmega32a", - "bootloader": "usbasploader", - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - - {"x": 15.5, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - - {"x": 15.5, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25, "w": 2.25}, - - {"x": 15.5, "y": 3.25}, - - {"x": 0, "y": 4.25, "w": 2.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 1.75}, - - {"x": 14.25, "y": 4.5}, - - {"x": 15.5, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.5}, - {"x": 11.5, "y": 5.25, "w": 1.5}, - - {"x": 13.25, "y": 5.5}, - {"x": 14.25, "y": 5.5}, - {"x": 15.25, "y": 5.5} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - - {"x": 15.5, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - - {"x": 15.5, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25}, - {"x": 15.5, "y": 3.25}, - - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 1.75}, - - {"x": 14.25, "y": 4.5}, - - {"x": 15.5, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.5}, - {"x": 11.5, "y": 5.25, "w": 1.5}, - - {"x": 13.25, "y": 5.5}, - {"x": 14.25, "y": 5.5}, - {"x": 15.25, "y": 5.5} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25}, - {"x": 14, "y": 1.25}, - - {"x": 15.5, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - - {"x": 15.5, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25, "w": 2.25}, - - {"x": 15.5, "y": 3.25}, - - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 1.75}, - - {"x": 14.25, "y": 4.5}, - - {"x": 15.5, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.5}, - {"x": 11.5, "y": 5.25, "w": 1.5}, - - {"x": 13.25, "y": 5.5}, - {"x": 14.25, "y": 5.5}, - {"x": 15.25, "y": 5.5} - ] - } - } -} diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c deleted file mode 100644 index b9cf45351f..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), -}; diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c deleted file mode 100644 index d6d2b15f19..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT - ), -}; diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c deleted file mode 100644 index 6438021f3a..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk b/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/herringbone/v1/readme.md b/keyboards/ramonimbao/herringbone/v1/readme.md deleted file mode 100644 index eb5546cb70..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Herringbone - -![Herringbone](https://i.imgur.com/SQyS0j8l.png) - -A through-hole 75% keyboard. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32A -* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) - -To get to the bootloader, - -1. Press and hold the BOOT button - -2. Press the RESET button - -3. Release the BOOT button - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/herringbone/v1:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/herringbone/v1/rules.mk b/keyboards/ramonimbao/herringbone/v1/rules.mk deleted file mode 100644 index 18550f0a64..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ramonimbao/herringbone/v1/v1.c b/keyboards/ramonimbao/herringbone/v1/v1.c deleted file mode 100644 index 4bdb5fad38..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#include "v1.h" diff --git a/keyboards/ramonimbao/herringbone/v1/v1.h b/keyboards/ramonimbao/herringbone/v1/v1.h deleted file mode 100644 index 80c411690e..0000000000 --- a/keyboards/ramonimbao/herringbone/v1/v1.h +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define XXX KC_NO - -#define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ - k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ - { k50, XXX, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e } \ -} - -#define LAYOUT_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ - k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ - { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e } \ -} - -// Split backspace -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ - k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ - { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e } \ -} diff --git a/keyboards/ramonimbao/mona/rules.mk b/keyboards/ramonimbao/mona/rules.mk deleted file mode 100644 index ba6b059569..0000000000 --- a/keyboards/ramonimbao/mona/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = ramonimbao/mona/v1_1 diff --git a/keyboards/ramonimbao/mona/v1/config.h b/keyboards/ramonimbao/mona/v1/config.h deleted file mode 100644 index 15029cfc37..0000000000 --- a/keyboards/ramonimbao/mona/v1/config.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 } -#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ramonimbao/mona/v1/info.json b/keyboards/ramonimbao/mona/v1/info.json deleted file mode 100644 index 6a6f8ccc0e..0000000000 --- a/keyboards/ramonimbao/mona/v1/info.json +++ /dev/null @@ -1,365 +0,0 @@ -{ - "keyboard_name": "Mona", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x404A", - "device_version": "0.0.1" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_60_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - {"x":0, "y":1, "w":1.5}, - - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_tsangan_hhkb": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} - ] - }, - "LAYOUT_60_iso": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_iso_split_bs_rshift": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_iso_tsangan": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} - ] - } - } -} diff --git a/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c deleted file mode 100644 index 430c77b289..0000000000 --- a/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL - ), - - [1] = LAYOUT_60_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c deleted file mode 100644 index 966f0b6efe..0000000000 --- a/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_iso( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL - ), - - [1] = LAYOUT_60_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c deleted file mode 100644 index 14ba2a4339..0000000000 --- a/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - - [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk b/keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/mona/v1/readme.md b/keyboards/ramonimbao/mona/v1/readme.md deleted file mode 100644 index 8b6af0526e..0000000000 --- a/keyboards/ramonimbao/mona/v1/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# Mona - -![Mona](https://i.imgur.com/jaRv4vW.png) - -A gummy-worm o-ring mount 60% marble keyboard. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32u4 -* Hardware Availability: [Erbakeys](https://www.erbakeys.com/) - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/mona/v1:default - -Flashing example for this keyboard: - - make ramonimbao/mona/v1:default:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/mona/v1/rules.mk b/keyboards/ramonimbao/mona/v1/rules.mk deleted file mode 100644 index ab2c49da70..0000000000 --- a/keyboards/ramonimbao/mona/v1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ramonimbao/mona/v1/v1.c b/keyboards/ramonimbao/mona/v1/v1.c deleted file mode 100644 index d55373272d..0000000000 --- a/keyboards/ramonimbao/mona/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "v1.h" diff --git a/keyboards/ramonimbao/mona/v1/v1.h b/keyboards/ramonimbao/mona/v1/v1.h deleted file mode 100644 index 1bb416daed..0000000000 --- a/keyboards/ramonimbao/mona/v1/v1.h +++ /dev/null @@ -1,102 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO - -#define LAYOUT_60_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_tsangan_hhkb( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k46, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso_split_bs_rshift( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso_tsangan( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_all LAYOUT_60_iso_split_bs_rshift - diff --git a/keyboards/ramonimbao/mona/v1_1/config.h b/keyboards/ramonimbao/mona/v1_1/config.h deleted file mode 100644 index 2d7b5e33e4..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 } -#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* indicator LEDs */ -#define LED_CAPS_LOCK_PIN B3 diff --git a/keyboards/ramonimbao/mona/v1_1/info.json b/keyboards/ramonimbao/mona/v1_1/info.json deleted file mode 100644 index dd1909b39d..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/info.json +++ /dev/null @@ -1,439 +0,0 @@ -{ - "keyboard_name": "Mona", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x404B", - "device_version": "0.1.1" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_60_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - {"x":0, "y":1, "w":1.5}, - - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_tsangan_hhkb": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} - ] - }, - "LAYOUT_60_iso": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_iso_split_bs_rshift": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_iso_tsangan": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":2.5}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4, "w":2.75}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - } - } -} diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c b/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c deleted file mode 100644 index 430c77b289..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL - ), - - [1] = LAYOUT_60_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c b/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c deleted file mode 100644 index 966f0b6efe..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_iso( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL - ), - - [1] = LAYOUT_60_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c b/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c deleted file mode 100644 index f7e88610f0..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - - [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/via/rules.mk b/keyboards/ramonimbao/mona/v1_1/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/mona/v1_1/readme.md b/keyboards/ramonimbao/mona/v1_1/readme.md deleted file mode 100644 index b28fedd76c..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/readme.md +++ /dev/null @@ -1,20 +0,0 @@ -# Mona v1.1 - -![Mona v1.1](https://i.imgur.com/VaWcIkjl.png) - -A gummy-worm o-ring mount 60% marble keyboard. Now with ALPS/MX, Caps Lock LED, and split spacebar support. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32u4 - -To get to the bootloader, with the USB cable plugged in, press the `RESET` button on the back of the PCB. - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/mona:default - -Flashing example for this keyboard: - - make ramonimbao/mona:default:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/mona/v1_1/rules.mk b/keyboards/ramonimbao/mona/v1_1/rules.mk deleted file mode 100644 index ab2c49da70..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ramonimbao/mona/v1_1/v1_1.c b/keyboards/ramonimbao/mona/v1_1/v1_1.c deleted file mode 100644 index d6ebf98053..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/v1_1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#include "v1_1.h" diff --git a/keyboards/ramonimbao/mona/v1_1/v1_1.h b/keyboards/ramonimbao/mona/v1_1/v1_1.h deleted file mode 100644 index a7327c3b80..0000000000 --- a/keyboards/ramonimbao/mona/v1_1/v1_1.h +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO - -#define LAYOUT_60_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_tsangan_hhkb( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k46, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso_split_bs_rshift( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso_tsangan( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k44, k46, k48, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, k44, XXX, k46, XXX, k48, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} diff --git a/keyboards/ramonimbao/mona/v32a/config.h b/keyboards/ramonimbao/mona/v32a/config.h deleted file mode 100644 index 1363c8635a..0000000000 --- a/keyboards/ramonimbao/mona/v32a/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C2, C3, D6, D1, A6 } -#define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A5, A4, A3, A7, D5, C7, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* indicator LEDs */ -#define LED_CAPS_LOCK_PIN C1 diff --git a/keyboards/ramonimbao/mona/v32a/info.json b/keyboards/ramonimbao/mona/v32a/info.json deleted file mode 100644 index 00d8641440..0000000000 --- a/keyboards/ramonimbao/mona/v32a/info.json +++ /dev/null @@ -1,439 +0,0 @@ -{ - "keyboard_name": "Mona", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x4032", - "device_version": "0.1.1" - }, - "processor": "atmega32a", - "bootloader": "usbasploader", - "layouts": { - "LAYOUT_60_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - {"x":0, "y":1, "w":1.5}, - - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_tsangan_hhkb": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} - ] - }, - "LAYOUT_60_iso": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_iso_split_bs_rshift": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - }, - "LAYOUT_60_iso_tsangan": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":2.5}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4, "w":2.75}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} - ] - } - } -} diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c b/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c deleted file mode 100644 index 430c77b289..0000000000 --- a/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL - ), - - [1] = LAYOUT_60_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c b/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c deleted file mode 100644 index 966f0b6efe..0000000000 --- a/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_iso( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL - ), - - [1] = LAYOUT_60_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c b/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c deleted file mode 100644 index f7e88610f0..0000000000 --- a/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - - [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/via/rules.mk b/keyboards/ramonimbao/mona/v32a/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/mona/v32a/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/mona/v32a/readme.md b/keyboards/ramonimbao/mona/v32a/readme.md deleted file mode 100644 index 61a3deefaa..0000000000 --- a/keyboards/ramonimbao/mona/v32a/readme.md +++ /dev/null @@ -1,20 +0,0 @@ -# Mona v1.1 (ATmega32A version) - -![Mona v1.1](https://i.imgur.com/VaWcIkjl.png) - -A gummy-worm o-ring mount 60% marble keyboard. Now with ALPS/MX, Caps Lock LED, and split spacebar support. ATmega32A version exists because I need alternatives because of the chip shortage. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32A - -To get to the bootloader, with the USB cable plugged in, press the `RESET` button on the back of the PCB. - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/mona/v32a:default - -Flashing example for this keyboard: - - make ramonimbao/mona/v32a:default:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/mona/v32a/rules.mk b/keyboards/ramonimbao/mona/v32a/rules.mk deleted file mode 100644 index 1e9f925544..0000000000 --- a/keyboards/ramonimbao/mona/v32a/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ramonimbao/mona/v32a/v32a.c b/keyboards/ramonimbao/mona/v32a/v32a.c deleted file mode 100644 index cc35f4d5ff..0000000000 --- a/keyboards/ramonimbao/mona/v32a/v32a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "v32a.h" diff --git a/keyboards/ramonimbao/mona/v32a/v32a.h b/keyboards/ramonimbao/mona/v32a/v32a.h deleted file mode 100644 index ac58b851a6..0000000000 --- a/keyboards/ramonimbao/mona/v32a/v32a.h +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO - -#define LAYOUT_60_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_tsangan_hhkb( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k46, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso_split_bs_rshift( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k46, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_60_iso_tsangan( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ - k40, k41, k42, k46, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ -} - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ - k40, k41, k42, k45, k46, k49, k4a, k4b, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ - { k40, k41, k42, XXX, XXX, k45, k46, XXX, XXX, k49, k4a, k4b, XXX, k4d, k4e }, \ -} diff --git a/keyboards/ramonimbao/squishy65/chconf.h b/keyboards/ramonimbao/squishy65/chconf.h deleted file mode 100644 index 144f324bc5..0000000000 --- a/keyboards/ramonimbao/squishy65/chconf.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#define CH_CFG_OPTIMIZE_SPEED FALSE - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#include_next - diff --git a/keyboards/ramonimbao/squishy65/config.h b/keyboards/ramonimbao/squishy65/config.h deleted file mode 100644 index b31d8d2ebd..0000000000 --- a/keyboards/ramonimbao/squishy65/config.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 2 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 . -*/ - -#pragma once - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -#define MATRIX_COL_PINS { A9, B9, B7, B6, B5, B4, B2, B1, B0, A7, A6, A5, A4, A10, A3, A2 } -#define MATRIX_ROW_PINS { A15, B3, A0, B10, B11 } -#define DIODE_DIRECTION COL2ROW - -// RGB B4 -#define RGB_DI_PIN B15 -#define RGBLED_NUM 18 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ramonimbao/squishy65/halconf.h b/keyboards/ramonimbao/squishy65/halconf.h deleted file mode 100644 index 4ebba2e53b..0000000000 --- a/keyboards/ramonimbao/squishy65/halconf.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - -#pragma once - -#define HAL_USE_PWM TRUE - -#include_next - diff --git a/keyboards/ramonimbao/squishy65/info.json b/keyboards/ramonimbao/squishy65/info.json deleted file mode 100644 index 58c4199590..0000000000 --- a/keyboards/ramonimbao/squishy65/info.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "keyboard_name": "Squishy65", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x10B5", - "device_version": "0.6.5" - }, - "processor": "STM32F072", - "bootloader": "stm32-dfu", - "layouts": { - "LAYOUT_ansi": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] - }, - "LAYOUT_iso": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] - }, - "LAYOUT_all": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"<", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Menu", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] - } - } -} diff --git a/keyboards/ramonimbao/squishy65/keymaps/default/keymap.c b/keyboards/ramonimbao/squishy65/keymaps/default/keymap.c deleted file mode 100644 index f22daf1760..0000000000 --- a/keyboards/ramonimbao/squishy65/keymaps/default/keymap.c +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, RGB_HUI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_VAD, RGB_RMOD - ) -}; diff --git a/keyboards/ramonimbao/squishy65/keymaps/iso/keymap.c b/keyboards/ramonimbao/squishy65/keymaps/iso/keymap.c deleted file mode 100644 index dedb48f333..0000000000 --- a/keyboards/ramonimbao/squishy65/keymaps/iso/keymap.c +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_SAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_VAD, RGB_RMOD - ) -}; diff --git a/keyboards/ramonimbao/squishy65/keymaps/via/config.h b/keyboards/ramonimbao/squishy65/keymaps/via/config.h deleted file mode 100644 index 4dadf6a169..0000000000 --- a/keyboards/ramonimbao/squishy65/keymaps/via/config.h +++ /dev/null @@ -1 +0,0 @@ -#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 diff --git a/keyboards/ramonimbao/squishy65/keymaps/via/keymap.c b/keyboards/ramonimbao/squishy65/keymaps/via/keymap.c deleted file mode 100644 index c1abb8cff6..0000000000 --- a/keyboards/ramonimbao/squishy65/keymaps/via/keymap.c +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, RGB_HUI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, _______, _______, RGB_TOG, _______, _______, _______, RGB_MOD, RGB_VAD, RGB_RMOD - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/squishy65/keymaps/via/rules.mk b/keyboards/ramonimbao/squishy65/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/squishy65/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/squishy65/mcuconf.h b/keyboards/ramonimbao/squishy65/mcuconf.h deleted file mode 100644 index f7ce173262..0000000000 --- a/keyboards/ramonimbao/squishy65/mcuconf.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` - */ - -#pragma once - -#include_next - -#undef STM32_RTCSEL -#define STM32_RTCSEL STM32_RTCSEL_NOCLOCK - -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 TRUE - -#undef STM32_SPI_USE_SPI2 -#define STM32_SPI_USE_SPI2 TRUE - diff --git a/keyboards/ramonimbao/squishy65/readme.md b/keyboards/ramonimbao/squishy65/readme.md deleted file mode 100644 index 95dd1edfaf..0000000000 --- a/keyboards/ramonimbao/squishy65/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# Squishy65 - -![Squishy65](https://i.imgur.com/dZsllxQ.png) - -A gasket mount stacked acrylic 65% keyboard. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: STM32F072CBU6 - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/squishy65:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/squishy65/rules.mk b/keyboards/ramonimbao/squishy65/rules.mk deleted file mode 100644 index 4eaa5819ac..0000000000 --- a/keyboards/ramonimbao/squishy65/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/ramonimbao/squishy65/squishy65.c b/keyboards/ramonimbao/squishy65/squishy65.c deleted file mode 100644 index 6d9fb24196..0000000000 --- a/keyboards/ramonimbao/squishy65/squishy65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#include "squishy65.h" diff --git a/keyboards/ramonimbao/squishy65/squishy65.h b/keyboards/ramonimbao/squishy65/squishy65.h deleted file mode 100644 index 25480c8748..0000000000 --- a/keyboards/ramonimbao/squishy65/squishy65.h +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - - -// ANSI -// split backspace -// 2x right mods -#define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, \ - k40, k41, k42, k46, k49, k4a, k4b, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \ - { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \ -} - -// ISO -// 2u backspace -// 2x right mods -#define LAYOUT_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, \ - k40, k41, k42, k46, k49, k4a, k4b, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \ - { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \ -} - -// Exposed -// split backspace -// 3x right mods -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, \ - k40, k41, k42, k46, k49, k4a, k4b, k4c, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \ - { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, XXX, k4e, k4f }, \ -} diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/ramonimbao/squishyfrl/config.h deleted file mode 100644 index 041407aed3..0000000000 --- a/keyboards/ramonimbao/squishyfrl/config.h +++ /dev/null @@ -1,96 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 9 -#define MATRIX_COLS 21 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B9, B8, A0, A1, A9, A8, B11, A6, A5} -#define MATRIX_COL_PINS { A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -#define RGB_DI_PIN C15 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -#endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* QoL improvements */ -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ramonimbao/squishyfrl/halconf.h b/keyboards/ramonimbao/squishyfrl/halconf.h deleted file mode 100644 index 344e66379f..0000000000 --- a/keyboards/ramonimbao/squishyfrl/halconf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -#pragma once - -#define HAL_USE_PWM TRUE - -#include_next - - diff --git a/keyboards/ramonimbao/squishyfrl/info.json b/keyboards/ramonimbao/squishyfrl/info.json deleted file mode 100644 index b64dbe1c46..0000000000 --- a/keyboards/ramonimbao/squishyfrl/info.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "keyboard_name": "SquishyFRL", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x4BE5", - "device_version": "0.0.1" - }, - "processor": "STM32F103", - "bootloader": "stm32duino", - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - {"x":15.25, "y":1}, - {"x":16.25, "y":1}, - {"x":17.25, "y":1}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - {"x":16.25, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25}, - {"x":15.25, "y":4}, - {"x":16.25, "y":4}, - {"x":17.25, "y":4} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":15.25, "y":1}, - {"x":16.25, "y":1}, - {"x":17.25, "y":1}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":1, "w":1.25, "h":2}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - {"x":16.25, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25}, - {"x":15.25, "y":4}, - {"x":16.25, "y":4}, - {"x":17.25, "y":4} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - {"x":15.25, "y":1}, - {"x":16.25, "y":1}, - {"x":17.25, "y":1}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - {"x":16.25, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":3}, - {"x":6.75, "y":4}, - {"x":7.75, "y":4, "w":2.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25}, - {"x":15.25, "y":4}, - {"x":16.25, "y":4}, - {"x":17.25, "y":4} - ] - } - } -} diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/default/keymap.c b/keyboards/ramonimbao/squishyfrl/keymaps/default/keymap.c deleted file mode 100644 index c29df874c5..0000000000 --- a/keyboards/ramonimbao/squishyfrl/keymaps/default/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/default/readme.md b/keyboards/ramonimbao/squishyfrl/keymaps/default/readme.md deleted file mode 100644 index b20cf74361..0000000000 --- a/keyboards/ramonimbao/squishyfrl/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for SquishyTKL - -ANSI, 6.25u bottom row diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/iso/keymap.c b/keyboards/ramonimbao/squishyfrl/keymaps/iso/keymap.c deleted file mode 100644 index e6dc1c974e..0000000000 --- a/keyboards/ramonimbao/squishyfrl/keymaps/iso/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h b/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h deleted file mode 100644 index c7cec8a9d7..0000000000 --- a/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/keymap.c b/keyboards/ramonimbao/squishyfrl/keymaps/via/keymap.c deleted file mode 100644 index 06e14e016e..0000000000 --- a/keyboards/ramonimbao/squishyfrl/keymaps/via/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/rules.mk b/keyboards/ramonimbao/squishyfrl/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/squishyfrl/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/squishyfrl/mcuconf.h b/keyboards/ramonimbao/squishyfrl/mcuconf.h deleted file mode 100644 index b14bd32f80..0000000000 --- a/keyboards/ramonimbao/squishyfrl/mcuconf.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -#include_next - -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE - -#undef STM32_SPI_USE_SPI2 -#define STM32_SPI_USE_SPI2 FALSE - diff --git a/keyboards/ramonimbao/squishyfrl/readme.md b/keyboards/ramonimbao/squishyfrl/readme.md deleted file mode 100644 index e1039d560c..0000000000 --- a/keyboards/ramonimbao/squishyfrl/readme.md +++ /dev/null @@ -1,18 +0,0 @@ -# SquishyFRL - -![SquishyFRL](https://i.imgur.com/UT7Pik3l.jpg) - -A stacked acrylic o-ring gasket mounted F-row-less TKL keyboard with a twist! - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: STM32F103RB - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/squishyfrl:via - -Flashing example for this keyboard: - - dfu-util -d 1eaf:0003 -a 2 -D path/to/ramonimbao_squishyfrl_via.bin - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/squishyfrl/rules.mk b/keyboards/ramonimbao/squishyfrl/rules.mk deleted file mode 100644 index 5c31520ab4..0000000000 --- a/keyboards/ramonimbao/squishyfrl/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/ramonimbao/squishyfrl/squishyfrl.c b/keyboards/ramonimbao/squishyfrl/squishyfrl.c deleted file mode 100644 index db2a2ae933..0000000000 --- a/keyboards/ramonimbao/squishyfrl/squishyfrl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "squishyfrl.h" diff --git a/keyboards/ramonimbao/squishyfrl/squishyfrl.h b/keyboards/ramonimbao/squishyfrl/squishyfrl.h deleted file mode 100644 index e98139da16..0000000000 --- a/keyboards/ramonimbao/squishyfrl/squishyfrl.h +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define ___ KC_NO - -#define LAYOUT_ansi( \ - k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k4k, k4l, k4m, \ - k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, k9j, k5k, k5l, k5m, \ - ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai, \ - kb5, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, kbi, kbj, k6l, \ - kc5, kc6, kc7, kcd, kcf, kcg, kch, kci, k7k, k7l, k7m \ -) { \ - /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 */ \ - /* 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k */ \ - /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \ - /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \ - /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \ - /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \ - /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, ___, ___, ___, ___, ___, ___, ___ }, \ - /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \ - /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \ - /* 7 | 7 */ { kb5, ___, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \ - /* 8 | 8 */ { kc5, kc6, kc7, ___, ___, ___, ___, ___, kcd, ___, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \ -} - -#define LAYOUT_iso( \ - k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k4k, k4l, k4m, \ - k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, k5k, k5l, k5m, \ - ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai, k9j, \ - kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, kbi, kbj, k6l, \ - kc5, kc6, kc7, kcd, kcf, kcg, kch, kci, k7k, k7l, k7m \ -) { \ - /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 */ \ - /* 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k */ \ - /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \ - /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \ - /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \ - /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \ - /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, ___, ___, ___, ___, ___, ___, ___ }, \ - /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \ - /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \ - /* 7 | 7 */ { kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \ - /* 8 | 8 */ { kc5, kc6, kc7, ___, ___, ___, ___, ___, kcd, ___, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \ -} - - -#define LAYOUT_all( \ - k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k8j, k4k, k4l, k4m, \ - k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, k9j, k5k, k5l, k5m, \ - ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai, \ - kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, kbi, kbj, k6l, \ - kc5, kc6, kc7, kc8, kcd, kce, kcf, kcg, kch, kci, k7k, k7l, k7m \ -) { \ - /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 */ \ - /* 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k */ \ - /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \ - /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \ - /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \ - /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \ - /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k8j, ___, ___, ___, ___, ___, ___ }, \ - /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \ - /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \ - /* 7 | 7 */ { kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \ - /* 8 | 8 */ { kc5, kc6, kc7, kc8, ___, ___, ___, ___, kcd, kce, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \ -} diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h deleted file mode 100644 index e46aeea45a..0000000000 --- a/keyboards/ramonimbao/squishytkl/config.h +++ /dev/null @@ -1,105 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 14 -#define MATRIX_COLS 26 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 } -#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -#define RGB_DI_PIN C15 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -#endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* QoL improvements */ -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT - -/* Rotary encoder */ -#define ENCODERS_PAD_A { B6 } -#define ENCODERS_PAD_B { B7 } - -#define ENCODER_RESOLUTION 1 - -//#define ENCODER_DIRECTION_FLIP diff --git a/keyboards/ramonimbao/squishytkl/halconf.h b/keyboards/ramonimbao/squishytkl/halconf.h deleted file mode 100644 index 344e66379f..0000000000 --- a/keyboards/ramonimbao/squishytkl/halconf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -#pragma once - -#define HAL_USE_PWM TRUE - -#include_next - - diff --git a/keyboards/ramonimbao/squishytkl/info.json b/keyboards/ramonimbao/squishytkl/info.json deleted file mode 100644 index b5baf900a1..0000000000 --- a/keyboards/ramonimbao/squishytkl/info.json +++ /dev/null @@ -1,447 +0,0 @@ -{ - "keyboard_name": "SquishyTKL", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x00B1", - "device_version": "1.0.0" - }, - "processor": "STM32F103", - "bootloader": "stm32duino", - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.25}, - {"x": 17.25, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.25}, - {"x": 17.25, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25, "w": 2.25}, - - {"x": 0, "y": 4.25, "w": 2.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 2.75}, - - {"x": 16.25, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.25}, - {"x": 11.25, "y": 5.25, "w": 1.25}, - {"x": 12.5, "y": 5.25, "w": 1.25}, - {"x": 13.75, "y": 5.25, "w": 1.25}, - - {"x": 15.25, "y": 5.25}, - {"x": 16.25, "y": 5.25}, - {"x": 17.25, "y": 5.25} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - - {"x": 14, "y": 0}, - - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.25}, - {"x": 17.25, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.25}, - {"x": 17.25, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 2.75}, - - {"x": 16.25, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.25}, - {"x": 11.25, "y": 5.25, "w": 1.25}, - {"x": 12.5, "y": 5.25, "w": 1.25}, - {"x": 13.75, "y": 5.25, "w": 1.25}, - - {"x": 15.25, "y": 5.25}, - {"x": 16.25, "y": 5.25}, - {"x": 17.25, "y": 5.25} - ] - }, - "LAYOUT_jis": { - "layout": [ - {"x": 0, "y": 0}, - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25}, - {"x": 14, "y": 1.25}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.25}, - {"x": 17.25, "y": 1.25}, - - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.25}, - {"x": 17.25, "y": 2.25}, - - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - - {"x": 0, "y": 4.25, "w": 2.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25}, - {"x": 13.25, "y": 4.25, "w": 1.75}, - - {"x": 16.25, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 1.5}, - {"x": 1.5, "y": 5.25}, - {"x": 2.5, "y": 5.25, "w": 1.5}, - {"x": 4, "y": 5.25}, - {"x": 5, "y": 5.25}, - {"x": 6, "y": 5.25, "w": 3}, - {"x": 9, "y": 5.25}, - {"x": 10, "y": 5.25}, - {"x": 11, "y": 5.25, "w": 1.5}, - {"x": 12.5, "y": 5.25}, - {"x": 13.5, "y": 5.25, "w": 1.5}, - - {"x": 15.25, "y": 5.25}, - {"x": 16.25, "y": 5.25}, - {"x": 17.25, "y": 5.25} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x": 0, "y": 0.5}, - - {"x": 1.25, "y": 0.5}, - {"x": 2.25, "y": 0.5}, - {"x": 3.25, "y": 0.5}, - {"x": 4.25, "y": 0.5}, - - {"x": 5.5, "y": 0.5}, - {"x": 6.5, "y": 0.5}, - {"x": 7.5, "y": 0.5}, - {"x": 8.5, "y": 0.5}, - - {"x": 9.75, "y": 0.5}, - {"x": 10.75, "y": 0.5}, - {"x": 11.75, "y": 0.5}, - {"x": 12.75, "y": 0.5}, - - {"x": 14, "y": 0.5}, - - {"x": 15.25, "y": 0.5}, - {"x": 16.25, "y": 0.5}, - {"x": 17.25, "y": 0.5}, - - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.75}, - {"x": 2, "y": 1.75}, - {"x": 3, "y": 1.75}, - {"x": 4, "y": 1.75}, - {"x": 5, "y": 1.75}, - {"x": 6, "y": 1.75}, - {"x": 7, "y": 1.75}, - {"x": 8, "y": 1.75}, - {"x": 9, "y": 1.75}, - {"x": 10, "y": 1.75}, - {"x": 11, "y": 1.75}, - {"x": 12, "y": 1.75}, - {"x": 13, "y": 1.75}, - {"x": 14, "y": 1.75}, - - {"x": 15.25, "y": 1.75}, - {"x": 16.25, "y": 1.75}, - {"x": 17.25, "y": 1.75}, - - {"x": 0, "y": 2.75, "w": 1.5}, - {"x": 1.5, "y": 2.75}, - {"x": 2.5, "y": 2.75}, - {"x": 3.5, "y": 2.75}, - {"x": 4.5, "y": 2.75}, - {"x": 5.5, "y": 2.75}, - {"x": 6.5, "y": 2.75}, - {"x": 7.5, "y": 2.75}, - {"x": 8.5, "y": 2.75}, - {"x": 9.5, "y": 2.75}, - {"x": 10.5, "y": 2.75}, - {"x": 11.5, "y": 2.75}, - {"x": 12.5, "y": 2.75}, - {"x": 13.5, "y": 2.75, "w": 1.5}, - - {"x": 15.25, "y": 2.75}, - {"x": 16.25, "y": 2.75}, - {"x": 17.25, "y": 2.75}, - - {"x": 0, "y": 3.75, "w": 1.75}, - {"x": 1.75, "y": 3.75}, - {"x": 2.75, "y": 3.75}, - {"x": 3.75, "y": 3.75}, - {"x": 4.75, "y": 3.75}, - {"x": 5.75, "y": 3.75}, - {"x": 6.75, "y": 3.75}, - {"x": 7.75, "y": 3.75}, - {"x": 8.75, "y": 3.75}, - {"x": 9.75, "y": 3.75}, - {"x": 10.75, "y": 3.75}, - {"x": 11.75, "y": 3.75}, - {"x": 12.75, "y": 3.75, "w": 2.25}, - - {"x": 0, "y": 4.75, "w": 1.25}, - {"x": 1.25, "y": 4.75}, - {"x": 2.25, "y": 4.75}, - {"x": 3.25, "y": 4.75}, - {"x": 4.25, "y": 4.75}, - {"x": 5.25, "y": 4.75}, - {"x": 6.25, "y": 4.75}, - {"x": 7.25, "y": 4.75}, - {"x": 8.25, "y": 4.75}, - {"x": 9.25, "y": 4.75}, - {"x": 10.25, "y": 4.75}, - {"x": 11.25, "y": 4.75}, - {"x": 12.25, "y": 4.75, "w": 1.75}, - {"x": 14, "y": 4.75}, - - {"x": 16.25, "y": 4.75}, - - {"x": 0, "y": 5.75, "w": 1.25}, - {"x": 1.25, "y": 5.75, "w": 1.25}, - {"x": 2.5, "y": 5.75, "w": 1.25}, - {"x": 3.75, "y": 5.75}, - {"x": 4.75, "y": 5.75, "w": 1.5}, - {"x": 6.25, "y": 5.75}, - {"x": 7.25, "y": 5.75, "w": 2.75}, - {"x": 10, "y": 5.75, "w": 1.25}, - {"x": 11.25, "y": 5.75, "w": 1.25}, - {"x": 12.5, "y": 5.75, "w": 1.25}, - {"x": 13.75, "y": 5.75, "w": 1.25}, - - {"x": 15.25, "y": 5.75}, - {"x": 16.25, "y": 5.75}, - {"x": 17.25, "y": 5.75}, - - {"x": 18.5, "y": 0}, - {"x": 18.5, "y": 1} - ] - } - } -} diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c deleted file mode 100644 index 2a6754c4af..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/readme.md b/keyboards/ramonimbao/squishytkl/keymaps/default/readme.md deleted file mode 100644 index b20cf74361..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for SquishyTKL - -ANSI, 6.25u bottom row diff --git a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c deleted file mode 100644 index 0f2502dc3d..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c deleted file mode 100644 index 280de324a6..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -#include "keymap_japanese.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_jis( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, - JP_ZHTG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_MENU, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/config.h b/keyboards/ramonimbao/squishytkl/keymaps/via/config.h deleted file mode 100644 index 884fbd4871..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/via/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 1 -// Only way to get this to compile is to reduce layer count to 1. -// Do TKL users even need more than 1 layer? -// I'd like that option though. Below also works. -// #define DYNAMIC_KEYMAP_LAYER_COUNT 2 -// #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c deleted file mode 100644 index 7bd524f9d9..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, - KC_VOLU, KC_VOLD - ), -}; - -keyevent_t encoder_ccw = { - .key = (keypos_t){.row = 13, .col = 0}, - .pressed = false -}; - -keyevent_t encoder_cw = { - .key = (keypos_t){.row = 13, .col = 1}, - .pressed = false -}; - -void matrix_scan_user(void) { - if (IS_PRESSED(encoder_ccw)) { - encoder_ccw.pressed = false; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - } - - if (IS_PRESSED(encoder_cw)) { - encoder_cw.pressed = false; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - } -} - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - encoder_cw.pressed = true; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - } else { - encoder_ccw.pressed = true; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - } - return true; -} diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/rules.mk b/keyboards/ramonimbao/squishytkl/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/squishytkl/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/squishytkl/mcuconf.h b/keyboards/ramonimbao/squishytkl/mcuconf.h deleted file mode 100644 index b14bd32f80..0000000000 --- a/keyboards/ramonimbao/squishytkl/mcuconf.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -#include_next - -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE - -#undef STM32_SPI_USE_SPI2 -#define STM32_SPI_USE_SPI2 FALSE - diff --git a/keyboards/ramonimbao/squishytkl/readme.md b/keyboards/ramonimbao/squishytkl/readme.md deleted file mode 100644 index 29655d29d6..0000000000 --- a/keyboards/ramonimbao/squishytkl/readme.md +++ /dev/null @@ -1,18 +0,0 @@ -# SquishyTKL - -![SquishyTKL](https://i.imgur.com/b04ooQ7l.png) - -A stacked acrylic o-ring gasket mounted TKL-sized keyboard with a twist! - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: STM32F103RB - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/squishytkl:via - -Flashing example for this keyboard: - - dfu-util -d 1eaf:0003 -a 2 -D path/to/ramonimbao_squishytkl_via.bin - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/squishytkl/rules.mk b/keyboards/ramonimbao/squishytkl/rules.mk deleted file mode 100644 index ae292c0a5a..0000000000 --- a/keyboards/ramonimbao/squishytkl/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoder fuctionality - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE \ No newline at end of file diff --git a/keyboards/ramonimbao/squishytkl/squishytkl.c b/keyboards/ramonimbao/squishytkl/squishytkl.c deleted file mode 100644 index 9a63c81364..0000000000 --- a/keyboards/ramonimbao/squishytkl/squishytkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "squishytkl.h" diff --git a/keyboards/ramonimbao/squishytkl/squishytkl.h b/keyboards/ramonimbao/squishytkl/squishytkl.h deleted file mode 100644 index 204d497a57..0000000000 --- a/keyboards/ramonimbao/squishytkl/squishytkl.h +++ /dev/null @@ -1,127 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define ___ KC_NO - -#define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ - k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k4K, k4L, k4M, \ - k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k9J, k5K, k5L, k5M, \ - kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, \ - kB5, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, k6O, \ - kC5, kC6, kC7, kCD, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \ -) { \ - { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ - { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kB5, ___, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kC5, kC6, kC7, ___, ___, ___, ___, ___, kCD, ___, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ -} - -#define LAYOUT_iso( \ - k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ - k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k4K, k4L, k4M, \ - k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k5K, k5L, k5M, \ - kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, k9J, \ - kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, k6O, \ - kC5, kC6, kC7, kCD, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \ -) { \ - { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ - { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kC5, kC6, kC7, ___, ___, ___, ___, ___, kCD, ___, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ -} - -#define LAYOUT_jis( \ - k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ - k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, k4K, k4L, k4M, \ - k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k5K, k5L, k5M, \ - kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, k9J, \ - kB5, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, kBJ, k6O, \ - kC5, kC6, kC7, kC8, kC9, kCD, kCE, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \ -) { \ - { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ - { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kB5, ___, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, kBJ, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kC5, kC6, kC7, kC8, kC9, ___, ___, ___, kCD, kCE, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ -} - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ - k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, k4K, k4L, k4M, \ - k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k9J, k5K, k5L, k5M, \ - kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, \ - kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, kBJ, k6O, \ - kC5, kC6, kC7, kC8, kC9, kCD, kCE, kCF, kCG, kCI, kCJ, k7N, k7O, k7P, \ - kD0, kD1 \ -) { \ - { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ - { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, kBJ, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, kC5, kC6, kC7, kC8, kC9, ___, ___, ___, kCD, kCE, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ - { kD0, kD1, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ -} diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h deleted file mode 100644 index 4dd0322d70..0000000000 --- a/keyboards/ramonimbao/tkl_ff/config.h +++ /dev/null @@ -1,82 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json deleted file mode 100644 index 9ad88092a3..0000000000 --- a/keyboards/ramonimbao/tkl_ff/info.json +++ /dev/null @@ -1,317 +0,0 @@ -{ - "keyboard_name": "TKL FF", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "device_version": "0.0.1" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layout_aliases": { - "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi", - "LAYOUT_iso": "LAYOUT_tkl_f13_iso" - }, - "community_layouts": [ - "tkl_f13_ansi", - "tkl_f13_iso" - ], - "layouts": { - "LAYOUT_tkl_f13_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":12.5, "y":5.25, "w":1.25}, - {"x":13.75, "y":5.25, "w":1.25}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} - ] - }, - "LAYOUT_tkl_f13_iso": { - "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25}, - {"x":13.75, "y":2.25, "w":1.25, "h":2}, - - {"x":0, "y":4.25, "w":1.25}, - {"x":1.25, "y":4.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":12.5, "y":5.25, "w":1.25}, - {"x":13.75, "y":5.25, "w":1.25}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":0, "y":4.25, "w":1.25}, - {"x":1.25, "y":4.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":1.75}, - {"x":14, "y":4.25}, - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":12.5, "y":5.25, "w":1.25}, - {"x":13.75, "y":5.25, "w":1.25}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} - ] - } - } -} diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c deleted file mode 100644 index d49d9d0b77..0000000000 --- a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_tkl_f13_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; - -#ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_OFF}, - {1, 1, HSV_OFF} -); - -const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_OFF} -); - -const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_OFF} -); - -const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl); - -void keyboard_post_init_kb(void) { - rgblight_layers = rgb_layers; - - keyboard_post_init_user(); -} - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock; - for (uint8_t i=0; i<3; i++) { - rgblight_set_layer_state(i, false); - } - if (lock_bits < 3) { - rgblight_set_layer_state(lock_bits, true); - } - } - - return res; -} -#endif diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c deleted file mode 100644 index 90319d52e6..0000000000 --- a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_tkl_f13_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; - -#ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_OFF}, - {1, 1, HSV_OFF} -); - -const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_OFF} -); - -const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_OFF} -); - -const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl); - -void keyboard_post_init_kb(void) { - rgblight_layers = rgb_layers; - - keyboard_post_init_user(); -} - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock; - for (uint8_t i=0; i<3; i++) { - rgblight_set_layer_state(i, false); - } - if (lock_bits < 3) { - rgblight_set_layer_state(lock_bits, true); - } - } - - return res; -} -#endif diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c b/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c deleted file mode 100644 index c7e5cd786a..0000000000 --- a/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - -#ifdef RGBLIGHT_ENABLE -const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_OFF}, - {1, 1, HSV_OFF} -); - -const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 1, HSV_OFF} -); - -const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 1, HSV_OFF} -); - -const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl); - -void keyboard_post_init_kb(void) { - rgblight_layers = rgb_layers; - - keyboard_post_init_user(); -} - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock; - for (uint8_t i=0; i<3; i++) { - rgblight_set_layer_state(i, false); - } - if (lock_bits < 3) { - rgblight_set_layer_state(lock_bits, true); - } - } - - return res; -} -#endif diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk b/keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/tkl_ff/readme.md b/keyboards/ramonimbao/tkl_ff/readme.md deleted file mode 100644 index ffc11f585e..0000000000 --- a/keyboards/ramonimbao/tkl_ff/readme.md +++ /dev/null @@ -1,20 +0,0 @@ -# TKL-FF - -![TKL-FF](https://i.imgur.com/GJCo3F5l.png) - -A TKL PCB made for the Geonworks Frog keyboard that supports both F12 and F13. V2 simply adds RGB indicator LEDs. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32u4 - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/tkl_ff:default - -To get to the bootloader, simply press the reset button located at the back of the PCB. You can then flash new firmware onto it. - -Flashing example for this keyboard: - - make ramonimbao/tkl_ff:default:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/tkl_ff/rules.mk b/keyboards/ramonimbao/tkl_ff/rules.mk deleted file mode 100644 index abeb993a67..0000000000 --- a/keyboards/ramonimbao/tkl_ff/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -DEFAULT_FOLDER = ramonimbao/tkl_ff/v1 diff --git a/keyboards/ramonimbao/tkl_ff/tkl_ff.c b/keyboards/ramonimbao/tkl_ff/tkl_ff.c deleted file mode 100644 index 4a4b7c204a..0000000000 --- a/keyboards/ramonimbao/tkl_ff/tkl_ff.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "tkl_ff.h" diff --git a/keyboards/ramonimbao/tkl_ff/tkl_ff.h b/keyboards/ramonimbao/tkl_ff/tkl_ff.h deleted file mode 100644 index cdc4ab60cb..0000000000 --- a/keyboards/ramonimbao/tkl_ff/tkl_ff.h +++ /dev/null @@ -1,93 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define ___ KC_NO - -// ANSI layout -// Full backspace -// Full right shift -// Full left shift -// 6.25u bottom row -#define LAYOUT_tkl_f13_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4f, \ - k50, k51, k52, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5g \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \ - { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \ - { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \ -} - -// ISO layout -// Full backspace -// Full right shift -// Split left shift -// 6.25u bottom row -#define LAYOUT_tkl_f13_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4f, \ - k50, k51, k52, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5g \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \ - { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \ -} - -// Layout for VIA -// Split backspace -// Split left shift -// Split right shift -// 6.25u bottom row -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4f, \ - k50, k51, k52, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5g \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \ - { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g } \ -} diff --git a/keyboards/ramonimbao/tkl_ff/v1/info.json b/keyboards/ramonimbao/tkl_ff/v1/info.json deleted file mode 100644 index 3370446f2d..0000000000 --- a/keyboards/ramonimbao/tkl_ff/v1/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usb": { - "pid": "0x00FF" - } -} diff --git a/keyboards/ramonimbao/tkl_ff/v1/rules.mk b/keyboards/ramonimbao/tkl_ff/v1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/ramonimbao/tkl_ff/v2/config.h b/keyboards/ramonimbao/tkl_ff/v2/config.h deleted file mode 100644 index eb60e5c311..0000000000 --- a/keyboards/ramonimbao/tkl_ff/v2/config.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#pragma once - - -#define RGBLIGHT_LAYERS -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 26 -# define RGBLIGHT_HUE_STEP 32 -# define RGBLIGHT_SAT_STEP 32 -# define RGBLIGHT_VAL_STEP 32 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -#endif diff --git a/keyboards/ramonimbao/tkl_ff/v2/info.json b/keyboards/ramonimbao/tkl_ff/v2/info.json deleted file mode 100644 index ed70ec408c..0000000000 --- a/keyboards/ramonimbao/tkl_ff/v2/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usb": { - "pid": "0x10FF" - } -} diff --git a/keyboards/ramonimbao/tkl_ff/v2/rules.mk b/keyboards/ramonimbao/tkl_ff/v2/rules.mk deleted file mode 100644 index 84ef473c02..0000000000 --- a/keyboards/ramonimbao/tkl_ff/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/ramonimbao/tkl_ff/v2/v2.c b/keyboards/ramonimbao/tkl_ff/v2/v2.c deleted file mode 100644 index de5f32e3ca..0000000000 --- a/keyboards/ramonimbao/tkl_ff/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "v2.h" diff --git a/keyboards/ramonimbao/tkl_ff/v2/v2.h b/keyboards/ramonimbao/tkl_ff/v2/v2.h deleted file mode 100644 index 7c4566defb..0000000000 --- a/keyboards/ramonimbao/tkl_ff/v2/v2.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#pragma once - -#include "quantum.h" diff --git a/keyboards/ramonimbao/wete/readme.md b/keyboards/ramonimbao/wete/readme.md deleted file mode 100644 index 575b342b46..0000000000 --- a/keyboards/ramonimbao/wete/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# Wete and Wete R2 - -Southpaw numpad 75% boards. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: STM32F072 (R1) and ATmega32u4 (R2) - -Make example for these keyboards (after setting up your build environment): - - make ramonimbao/wete/v1:default - - make ramonimbao/wete/v2:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/wete/rules.mk b/keyboards/ramonimbao/wete/rules.mk deleted file mode 100644 index f4a04ab47f..0000000000 --- a/keyboards/ramonimbao/wete/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = ramonimbao/wete/v2 diff --git a/keyboards/ramonimbao/wete/v1/chconf.h b/keyboards/ramonimbao/wete/v1/chconf.h deleted file mode 100644 index 18befdb8e1..0000000000 --- a/keyboards/ramonimbao/wete/v1/chconf.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#define CH_CFG_OPTIMIZE_SPEED FALSE - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#include_next - diff --git a/keyboards/ramonimbao/wete/v1/config.h b/keyboards/ramonimbao/wete/v1/config.h deleted file mode 100644 index 732848465e..0000000000 --- a/keyboards/ramonimbao/wete/v1/config.h +++ /dev/null @@ -1,72 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 2 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 . -*/ - -#pragma once - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 20 - -#define MATRIX_COL_PINS { B13, B14, B15, A8, B0, A7, A5, A4, A3, B9, C13, C14, C15, F0, F1, A0, A1, A2, B8, B7 } -#define MATRIX_ROW_PINS { A9, B12, B11, B10, B2, B1 } -#define DIODE_DIRECTION COL2ROW - -//LEDS A6 -#define BACKLIGHT_PIN A6 -#define BACKLIGHT_PWM_DRIVER PWMD3 -#define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 24 -#define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 6 - -// RGB B4 -#define RGB_DI_PIN B4 -#define RGBLED_NUM 24 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - -#define SLEEP_LED_GPT_DRIVER GPTD1 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ramonimbao/wete/v1/halconf.h b/keyboards/ramonimbao/wete/v1/halconf.h deleted file mode 100644 index b3de873be1..0000000000 --- a/keyboards/ramonimbao/wete/v1/halconf.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - -#pragma once - -#define HAL_USE_PWM TRUE - -#define HAL_USE_GPT TRUE - -#include_next - diff --git a/keyboards/ramonimbao/wete/v1/info.json b/keyboards/ramonimbao/wete/v1/info.json deleted file mode 100644 index a8446b1db9..0000000000 --- a/keyboards/ramonimbao/wete/v1/info.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "keyboard_name": "Wete", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x00B5", - "device_version": "0.1.2" - }, - "processor": "STM32F072", - "bootloader": "stm32-dfu", - "layouts": { - "LAYOUT_ansi_rhnp": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_ansi_lhnp": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25, "h":2}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25, "h":2}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25, "w":2}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_ansi_macro": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_iso_rhnp": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_iso_lhnp": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25, "h":2}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25, "h":2}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25, "w":2}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_iso_macro": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_jis_rhnp": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25, "w":1.75}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_jis_lhnp": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25, "h":2}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25, "h":2}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25, "w":1.75}, {"x":19.25, "y":4.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25, "w":2}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_jis_macro": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25, "w":1.75}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - }, - "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] - } - } -} diff --git a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c deleted file mode 100644 index 73f3811e76..0000000000 --- a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi_rhnp( - KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, - KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_PGUP, - KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT - ), - [1] = LAYOUT_ansi_rhnp( - KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_UP, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_ON - ) -}; diff --git a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c deleted file mode 100644 index afaf6bfe9e..0000000000 --- a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_rhnp( - KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_END, - KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_PGUP, - KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT - ), - [1] = LAYOUT_iso_rhnp( - KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_UP, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_ON - ) -}; diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c deleted file mode 100644 index 11db8e7da9..0000000000 --- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -#include "keymap_japanese.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_jis_rhnp( - KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_HOME, - KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_ENTER, KC_END, - KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_PGUP, - KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_PGDN, - KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT - ), - [1] = LAYOUT_jis_rhnp( - KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_UP, BL_ON - ) -}; diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/config.h b/keyboards/ramonimbao/wete/v1/keymaps/via/config.h deleted file mode 100644 index 4dadf6a169..0000000000 --- a/keyboards/ramonimbao/wete/v1/keymaps/via/config.h +++ /dev/null @@ -1 +0,0 @@ -#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c deleted file mode 100644 index b9acb6cace..0000000000 --- a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 2 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 . -*/ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi_rhnp( - KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, - KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_PGUP, - KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT - ), - [1] = LAYOUT_ansi_rhnp( - KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_UP, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_ON - ), - [2] = LAYOUT_ansi_rhnp( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO - ), - [3] = LAYOUT_ansi_rhnp( - KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO - ) -}; diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk b/keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk deleted file mode 100644 index 666e72557b..0000000000 --- a/keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite diff --git a/keyboards/ramonimbao/wete/v1/mcuconf.h b/keyboards/ramonimbao/wete/v1/mcuconf.h deleted file mode 100644 index 7a2e877763..0000000000 --- a/keyboards/ramonimbao/wete/v1/mcuconf.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 2 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` - */ - -#pragma once - -#include_next - -#undef STM32_RTCSEL -#define STM32_RTCSEL STM32_RTCSEL_NOCLOCK - -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - -#undef STM32_PWM_USE_TIM3 -#define STM32_PWM_USE_TIM3 TRUE - -#undef STM32_SPI_USE_SPI2 -#define STM32_SPI_USE_SPI2 TRUE - -#undef STM32_GPT_USE_TIM1 -#define STM32_GPT_USE_TIM1 TRUE diff --git a/keyboards/ramonimbao/wete/v1/readme.md b/keyboards/ramonimbao/wete/v1/readme.md deleted file mode 100644 index f0f26b78bd..0000000000 --- a/keyboards/ramonimbao/wete/v1/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# Wete - -![Wete Keyboard](https://i.imgur.com/dZ4FRar.jpg) - -A southpaw full-sized keyboard. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: STM32F072CBT6 - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/wete:default - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ramonimbao/wete/v1/rules.mk b/keyboards/ramonimbao/wete/v1/rules.mk deleted file mode 100644 index e81a5dd98e..0000000000 --- a/keyboards/ramonimbao/wete/v1/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/ramonimbao/wete/v1/v1.c b/keyboards/ramonimbao/wete/v1/v1.c deleted file mode 100644 index b14a7dc738..0000000000 --- a/keyboards/ramonimbao/wete/v1/v1.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "v1.h" - -void keyboard_pre_init_user(void) { - // Initialize indicator LED pins - setPinOutput(A14); // Num Lock - setPinOutput(A15); // Scroll Lock - setPinOutput(B3); // Caps Lock -} - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - writePin(A14, !led_state.num_lock); - writePin(A15, !led_state.scroll_lock); - writePin(B3, !led_state.caps_lock); - } - - return res; -} diff --git a/keyboards/ramonimbao/wete/v1/v1.h b/keyboards/ramonimbao/wete/v1/v1.h deleted file mode 100644 index 46daf6d6f1..0000000000 --- a/keyboards/ramonimbao/wete/v1/v1.h +++ /dev/null @@ -1,222 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -//////////////////////////////// ANSI //////////////////////////////// -// ANSI layout -// 2u backspace -// Right handed numpad -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 2 keys to the right of space -#define LAYOUT_ansi_rhnp( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, XXX, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ -} - -// ANSI layout -// 2u backspace -// Left handed numpad -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 2 keys to the right of space -#define LAYOUT_ansi_lhnp( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k51, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { XXX, k51, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ -} - -// ANSI layout -// 2u backspace -// Numpad area is all 1u keys -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 2 keys to the right of space -#define LAYOUT_ansi_macro( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k51, k52, k53, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, k51, k52, k53, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ -} - - -//////////////////////////////// ISO //////////////////////////////// -// ISO layout -// Extra 1u next to Left Shift -// 2u Backspace -// Right handed numpad -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 2 keys to the right of space -#define LAYOUT_iso_rhnp( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, XXX, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ -} - -// ISO layout -// Extra 1u next to Left Shift -// 2u backspace -// Left handed numpad -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 2 keys to the right of space -#define LAYOUT_iso_lhnp( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k51, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { XXX, k51, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ -} - -// ISO layout -// Extra 1u next to Left Shift -// 2u backspace -// Numpad area is all 1u keys -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 2 keys to the right of space -#define LAYOUT_iso_macro( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k51, k52, k53, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, k51, k52, k53, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ -} - -//////////////////////////////// JIS //////////////////////////////// -// JIS layout -// Split backspace -// Right handed numpad -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 3 keys to the right of space -#define LAYOUT_jis_rhnp( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k52, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ -} - -// JIS layout -// Split backspace -// Left handed numpad -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 3 keys to the right of space -#define LAYOUT_jis_lhnp( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k51, k52, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { XXX, k51, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ -} - -// JIS layout -// Split backspace -// Numpad area is all 1u keys -// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row -// 3 keys to the right of space -#define LAYOUT_jis_macro( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k51, k52, k53, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ -} - -//////////////////////////////// EXPOSED //////////////////////////////// -// All keys are exposed -// Numpad area is 1u keys -// Extra 1u next to Left Shift -// JIS-style bottom row -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ - k50, k51, k52, k53, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ -} diff --git a/keyboards/ramonimbao/wete/v2/config.h b/keyboards/ramonimbao/wete/v2/config.h deleted file mode 100644 index e719e4f835..0000000000 --- a/keyboards/ramonimbao/wete/v2/config.h +++ /dev/null @@ -1,102 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 13 -#define MATRIX_COLS 10 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B3, B2, B6, C6, C7, E6, F7, F6, F5, F4, F1, F0, NO_PIN } -#define MATRIX_COL_PINS { B1, B0, B7, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Encoder pins */ -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { D1 } - -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -#define RGBLIGHT_LAYERS -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF - -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 18 -# define RGBLIGHT_HUE_STEP 32 -# define RGBLIGHT_SAT_STEP 32 -# define RGBLIGHT_VAL_STEP 32 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -#endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -// QoL improvements -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ramonimbao/wete/v2/info.json b/keyboards/ramonimbao/wete/v2/info.json deleted file mode 100644 index eccd2815be..0000000000 --- a/keyboards/ramonimbao/wete/v2/info.json +++ /dev/null @@ -1,358 +0,0 @@ -{ - "keyboard_name": "Wete R2", - "manufacturer": "Ramon Imbao", - "url": "", - "maintainer": "Ramon Imbao", - "usb": { - "vid": "0xB16B", - "pid": "0x00B3", - "device_version": "35.0.0" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4.25, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.75, "y":0}, - {"x":15.75, "y":0}, - {"x":16.75, "y":0}, - {"x":17.75, "y":0}, - {"x":19.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4.25, "y":1.25}, - {"x":5.25, "y":1.25}, - {"x":6.25, "y":1.25}, - {"x":7.25, "y":1.25}, - {"x":8.25, "y":1.25}, - {"x":9.25, "y":1.25}, - {"x":10.25, "y":1.25}, - {"x":11.25, "y":1.25}, - {"x":12.25, "y":1.25}, - {"x":13.25, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25, "w":2}, - {"x":19.25, "y":1.25}, - - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25, "h":2}, - {"x":4.25, "y":2.25, "w":1.5}, - {"x":5.75, "y":2.25}, - {"x":6.75, "y":2.25}, - {"x":7.75, "y":2.25}, - {"x":8.75, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.25}, - {"x":11.75, "y":2.25}, - {"x":12.75, "y":2.25}, - {"x":13.75, "y":2.25}, - {"x":14.75, "y":2.25}, - {"x":15.75, "y":2.25}, - {"x":16.75, "y":2.25}, - {"x":17.75, "y":2.25, "w":1.5}, - {"x":19.25, "y":2.25}, - - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":4.25, "y":3.25, "w":1.75}, - {"x":6, "y":3.25}, - {"x":7, "y":3.25}, - {"x":8, "y":3.25}, - {"x":9, "y":3.25}, - {"x":10, "y":3.25}, - {"x":11, "y":3.25}, - {"x":12, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.25}, - {"x":15, "y":3.25}, - {"x":16, "y":3.25}, - {"x":17, "y":3.25, "w":2.25}, - {"x":19.25, "y":3.25}, - - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25, "h":2}, - {"x":4.25, "y":4.25, "w":2.25}, - {"x":6.5, "y":4.25}, - {"x":7.5, "y":4.25}, - {"x":8.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":11.5, "y":4.25}, - {"x":12.5, "y":4.25}, - {"x":13.5, "y":4.25}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25}, - {"x":16.5, "y":4.25, "w":1.75}, - {"x":18.25, "y":4.25}, - {"x":19.25, "y":4.25}, - - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25}, - {"x":4.25, "y":5.25, "w":1.25}, - {"x":5.5, "y":5.25, "w":1.25}, - {"x":6.75, "y":5.25, "w":1.25}, - {"x":8, "y":5.25, "w":6.25}, - {"x":14.25, "y":5.25, "w":1.25}, - {"x":15.5, "y":5.25, "w":1.25}, - {"x":17.25, "y":5.25}, - {"x":18.25, "y":5.25}, - {"x":19.25, "y":5.25} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4.25, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.75, "y":0}, - {"x":15.75, "y":0}, - {"x":16.75, "y":0}, - {"x":17.75, "y":0}, - {"x":19.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4.25, "y":1.25}, - {"x":5.25, "y":1.25}, - {"x":6.25, "y":1.25}, - {"x":7.25, "y":1.25}, - {"x":8.25, "y":1.25}, - {"x":9.25, "y":1.25}, - {"x":10.25, "y":1.25}, - {"x":11.25, "y":1.25}, - {"x":12.25, "y":1.25}, - {"x":13.25, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25, "w":2}, - {"x":19.25, "y":1.25}, - - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25, "h":2}, - {"x":4.25, "y":2.25, "w":1.5}, - {"x":5.75, "y":2.25}, - {"x":6.75, "y":2.25}, - {"x":7.75, "y":2.25}, - {"x":8.75, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.25}, - {"x":11.75, "y":2.25}, - {"x":12.75, "y":2.25}, - {"x":13.75, "y":2.25}, - {"x":14.75, "y":2.25}, - {"x":15.75, "y":2.25}, - {"x":16.75, "y":2.25}, - {"x":19.25, "y":2.25}, - - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":4.25, "y":3.25, "w":1.75}, - {"x":6, "y":3.25}, - {"x":7, "y":3.25}, - {"x":8, "y":3.25}, - {"x":9, "y":3.25}, - {"x":10, "y":3.25}, - {"x":11, "y":3.25}, - {"x":12, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.25}, - {"x":15, "y":3.25}, - {"x":16, "y":3.25}, - {"x":17, "y":3.25}, - {"x":18, "y":2.25, "w":1.25, "h":2}, - {"x":19.25, "y":3.25}, - - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25, "h":2}, - {"x":4.25, "y":4.25, "w":1.25}, - {"x":5.5, "y":4.25}, - {"x":6.5, "y":4.25}, - {"x":7.5, "y":4.25}, - {"x":8.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":11.5, "y":4.25}, - {"x":12.5, "y":4.25}, - {"x":13.5, "y":4.25}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25}, - {"x":16.5, "y":4.25, "w":1.75}, - {"x":18.25, "y":4.25}, - {"x":19.25, "y":4.25}, - - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25}, - {"x":4.25, "y":5.25, "w":1.25}, - {"x":5.5, "y":5.25, "w":1.25}, - {"x":6.75, "y":5.25, "w":1.25}, - {"x":8, "y":5.25, "w":6.25}, - {"x":14.25, "y":5.25, "w":1.25}, - {"x":15.5, "y":5.25, "w":1.25}, - {"x":17.25, "y":5.25}, - {"x":18.25, "y":5.25}, - {"x":19.25, "y":5.25} - ] - }, - "LAYOUT_all": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4.25, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.75, "y":0}, - {"x":15.75, "y":0}, - {"x":16.75, "y":0}, - {"x":17.75, "y":0}, - {"x":19.5, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4.25, "y":1.25}, - {"x":5.25, "y":1.25}, - {"x":6.25, "y":1.25}, - {"x":7.25, "y":1.25}, - {"x":8.25, "y":1.25}, - {"x":9.25, "y":1.25}, - {"x":10.25, "y":1.25}, - {"x":11.25, "y":1.25}, - {"x":12.25, "y":1.25}, - {"x":13.25, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - {"x":18.25, "y":1.25}, - {"x":19.25, "y":1.25}, - - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25}, - {"x":4.25, "y":2.25, "w":1.5}, - {"x":5.75, "y":2.25}, - {"x":6.75, "y":2.25}, - {"x":7.75, "y":2.25}, - {"x":8.75, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.25}, - {"x":11.75, "y":2.25}, - {"x":12.75, "y":2.25}, - {"x":13.75, "y":2.25}, - {"x":14.75, "y":2.25}, - {"x":15.75, "y":2.25}, - {"x":16.75, "y":2.25}, - {"x":17.75, "y":2.25, "w":1.5}, - {"x":19.25, "y":2.25}, - - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":3.25}, - {"x":4.25, "y":3.25, "w":1.75}, - {"x":6, "y":3.25}, - {"x":7, "y":3.25}, - {"x":8, "y":3.25}, - {"x":9, "y":3.25}, - {"x":10, "y":3.25}, - {"x":11, "y":3.25}, - {"x":12, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.25}, - {"x":15, "y":3.25}, - {"x":16, "y":3.25}, - {"x":17, "y":3.25, "w":2.25}, - {"x":19.25, "y":3.25}, - - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25}, - {"x":4.25, "y":4.25, "w":1.25}, - {"x":5.5, "y":4.25}, - {"x":6.5, "y":4.25}, - {"x":7.5, "y":4.25}, - {"x":8.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":11.5, "y":4.25}, - {"x":12.5, "y":4.25}, - {"x":13.5, "y":4.25}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25}, - {"x":16.5, "y":4.25, "w":1.75}, - {"x":18.25, "y":4.25}, - {"x":19.25, "y":4.25}, - - {"x":0, "y":5.25}, - {"x":1, "y":5.25}, - {"x":2, "y":5.25}, - {"x":3, "y":5.25}, - {"x":4.25, "y":5.25, "w":1.25}, - {"x":5.5, "y":5.25, "w":1.25}, - {"x":6.75, "y":5.25, "w":1.25}, - {"x":8, "y":5.25, "w":6.25}, - {"x":14.25, "y":5.25}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25}, - {"x":18.25, "y":5.25}, - {"x":19.25, "y":5.25}, - - {"x":19, "y":0, "w":0.5}, - {"x":20.5, "y":0, "w":0.5} - ] - } - } -} diff --git a/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c b/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c deleted file mode 100644 index 3916d18366..0000000000 --- a/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, - KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} - -#ifdef RGBLIGHT_ENABLE -// Can probably still be optimized, but I like it as is for clarity -const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( - {0,1, HSV_OFF}, - {1,1, HSV_OFF}, - {2,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_nl[] = RGBLIGHT_LAYER_SEGMENTS( - {1,1, HSV_OFF}, - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF}, - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_clnl[] = RGBLIGHT_LAYER_SEGMENTS( - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF}, - {1,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_slnl[] = RGBLIGHT_LAYER_SEGMENTS( - {1,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_slcl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF} -); - -const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST( - ll_none, - ll_nl, - ll_cl, - ll_clnl, - ll_sl, - ll_slnl, - ll_slcl -); - -void keyboard_post_init_kb(void) { - rgblight_layers = rgb_layers; - - keyboard_post_init_user(); -} - -bool led_update_kb (led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - uint8_t lock_bits = led_state.scroll_lock << 2 | led_state.caps_lock << 1 | led_state.num_lock; - for (uint8_t i=0; i<7; i++) { - rgblight_set_layer_state(i, false); - } - if (lock_bits < 7) { - rgblight_set_layer_state(lock_bits, true); - } - } - - return res; -} -#endif diff --git a/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c b/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c deleted file mode 100644 index 12933c4b57..0000000000 --- a/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_END, - KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT, KC_PGUP, - KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} - -#ifdef RGBLIGHT_ENABLE -// Can probably still be optimized, but I like it as is for clarity -const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( - {0,1, HSV_OFF}, - {1,1, HSV_OFF}, - {2,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_nl[] = RGBLIGHT_LAYER_SEGMENTS( - {1,1, HSV_OFF}, - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF}, - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_clnl[] = RGBLIGHT_LAYER_SEGMENTS( - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF}, - {1,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_slnl[] = RGBLIGHT_LAYER_SEGMENTS( - {1,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_slcl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF} -); - -const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST( - ll_none, - ll_nl, - ll_cl, - ll_clnl, - ll_sl, - ll_slnl, - ll_slcl -); - -void keyboard_post_init_kb(void) { - rgblight_layers = rgb_layers; - - keyboard_post_init_user(); -} - -bool led_update_kb (led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - uint8_t lock_bits = led_state.scroll_lock << 2 | led_state.caps_lock << 1 | led_state.num_lock; - for (uint8_t i=0; i<7; i++) { - rgblight_set_layer_state(i, false); - } - if (lock_bits < 7) { - rgblight_set_layer_state(lock_bits, true); - } - } - - return res; -} -#endif diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/config.h b/keyboards/ramonimbao/wete/v2/keymaps/via/config.h deleted file mode 100644 index c7cec8a9d7..0000000000 --- a/keyboards/ramonimbao/wete/v2/keymaps/via/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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 2 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 . -*/ - -#pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c b/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c deleted file mode 100644 index 8afc6f9c25..0000000000 --- a/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c +++ /dev/null @@ -1,135 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_HOME, - KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, - KC_P4, KC_P5, KC_P6, KC_NO, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_P0, KC_NO, KC_PDOT, KC_NO, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, - KC_VOLD, KC_VOLU - ), - [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______ - ), -}; - -keyevent_t encoder_ccw = { - .key = (keypos_t){.row = 12, .col = 0}, - .pressed = false -}; - -keyevent_t encoder_cw = { - .key = (keypos_t){.row = 12, .col = 1}, - .pressed = false -}; - -void matrix_scan_user(void) { - if (IS_PRESSED(encoder_ccw)) { - encoder_ccw.pressed = false; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - } - - if (IS_PRESSED(encoder_cw)) { - encoder_cw.pressed = false; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - } -} - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - encoder_cw.pressed = true; - encoder_cw.time = (timer_read() | 1); - action_exec(encoder_cw); - } else { - encoder_ccw.pressed = true; - encoder_ccw.time = (timer_read() | 1); - action_exec(encoder_ccw); - } - return true; -} - -#ifdef RGBLIGHT_ENABLE -// Can probably still be optimized, but I like it as is for clarity -const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( - {0,1, HSV_OFF}, - {1,1, HSV_OFF}, - {2,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_nl[] = RGBLIGHT_LAYER_SEGMENTS( - {1,1, HSV_OFF}, - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF}, - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_clnl[] = RGBLIGHT_LAYER_SEGMENTS( - {0,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF}, - {1,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_slnl[] = RGBLIGHT_LAYER_SEGMENTS( - {1,1, HSV_OFF} -); -const rgblight_segment_t PROGMEM ll_slcl[] = RGBLIGHT_LAYER_SEGMENTS( - {2,1, HSV_OFF} -); - -const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST( - ll_none, - ll_nl, - ll_cl, - ll_clnl, - ll_sl, - ll_slnl, - ll_slcl -); - -void keyboard_post_init_kb(void) { - rgblight_layers = rgb_layers; - - keyboard_post_init_user(); -} - -bool led_update_kb (led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - uint8_t lock_bits = led_state.scroll_lock << 2 | led_state.caps_lock << 1 | led_state.num_lock; - for (uint8_t i=0; i<7; i++) { - rgblight_set_layer_state(i, false); - } - if (lock_bits < 7) { - rgblight_set_layer_state(lock_bits, true); - } - } - - return res; -} -#endif diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk b/keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/wete/v2/readme.md b/keyboards/ramonimbao/wete/v2/readme.md deleted file mode 100644 index d99c611560..0000000000 --- a/keyboards/ramonimbao/wete/v2/readme.md +++ /dev/null @@ -1,26 +0,0 @@ -# Wete R2 - -![Wete R2](https://i.imgur.com/WKFe7T8l.png) - -Round two of the Wete keyboard. Now uses the ATmega32u4, adds an encoder, and switches the indicator LEDs to RGB. - -* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) -* Hardware Supported: ATmega32u4 - -Make example for this keyboard (after setting up your build environment): - - make ramonimbao/wete/v2:default - -Flashing example for this keyboard: - - make ramonimbao/wete/v2:default:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). - -## Bootloader - -Enter the bootloader in 3 ways: - -* **Bootmagic reset**: Hold down the upper left key and plug in the keyboard -* **Physical reset button**: Briefly press the reset button on the back of the PCB. -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/ramonimbao/wete/v2/rules.mk b/keyboards/ramonimbao/wete/v2/rules.mk deleted file mode 100644 index 7386bf6999..0000000000 --- a/keyboards/ramonimbao/wete/v2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary encoder diff --git a/keyboards/ramonimbao/wete/v2/v2.c b/keyboards/ramonimbao/wete/v2/v2.c deleted file mode 100644 index de5f32e3ca..0000000000 --- a/keyboards/ramonimbao/wete/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#include "v2.h" diff --git a/keyboards/ramonimbao/wete/v2/v2.h b/keyboards/ramonimbao/wete/v2/v2.h deleted file mode 100644 index 75c9430c02..0000000000 --- a/keyboards/ramonimbao/wete/v2/v2.h +++ /dev/null @@ -1,110 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" - -void adjust_leds(void); - -#define ___ KC_NO - - -// Regular numpad layout -// Full sized backspace -// Full left shift -// ANSI enter -// 1.25 | 1.25 | 1.25 | 6.25 | 1.25 | 1.25 bottom row -#define LAYOUT_ansi( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k05, k15, k06, k16, k17, k08, k18, k09, k19, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, k39, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k49, k59, \ - k60, k70, k61, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k78, k79, \ - k80, k90, k81, k91, k82, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k98, k89, k99, \ - ka0, ka1, ka2, kb2, ka3, ka5, ka7, kb7, kb8, ka9, kb9 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \ - { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \ - { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, ___, ___ }, \ - { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \ - { k90, k91, ___, k93, k94, k95, k96, k97, k98, k99 }, \ - { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \ - { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ -} - -// Regular numpad layout -// Full sized backspace -// Split left shift -// ISO enter -// 1.25 | 1.25 | 1.25 | 6.25 | 1.25 | 1.25 bottom row -#define LAYOUT_iso( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k05, k15, k06, k16, k17, k08, k18, k09, k19, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, k39, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k59, \ - k60, k70, k61, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k78, k49, k79, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k98, k89, k99, \ - ka0, ka1, ka2, kb2, ka3, ka5, ka7, kb7, kb8, ka9, kb9 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \ - { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \ - { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, ___, ___ }, \ - { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \ - { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \ - { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ -} - -// Macro numpad layout -// Split backspace -// Split left shift -// ANSI enter -// 1.25 | 1.25 | 1.25 | 6.25 | 1 | 1 | 1 bottom row -// Encoder keymap exposed for VIA -#define LAYOUT_all( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k05, k15, k06, k16, k17, k08, k18, k09, k19, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38,k29, k39, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k49, k59, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k78, k79, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k98, k89, k99, \ - ka0, kb0, ka1, kb1, ka2, kb2, ka3, ka5, ka7, kb7, ka8, kb8, ka9, kb9, \ - re0, re1 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \ - { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \ - { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, ___, ___ }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \ - { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ka8, ka9 }, \ - { kb0, kb1, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \ - { re0, re1, ___, ___, ___, ___, ___, ___, ___, ___ }, \ -} diff --git a/keyboards/rmi_kb/aelith/aelith.c b/keyboards/rmi_kb/aelith/aelith.c new file mode 100644 index 0000000000..e2153f7645 --- /dev/null +++ b/keyboards/rmi_kb/aelith/aelith.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "aelith.h" diff --git a/keyboards/rmi_kb/aelith/aelith.h b/keyboards/rmi_kb/aelith/aelith.h new file mode 100644 index 0000000000..47fe9a90ed --- /dev/null +++ b/keyboards/rmi_kb/aelith/aelith.h @@ -0,0 +1,64 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define XXX KC_NO + +// Split backspace +// Split right shift +#define LAYOUT_alice_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ + k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ + k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \ + k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ + k41, k43, k44, k46, k49, k4b, k4f \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ + { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ + { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \ + { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \ + { XXX, k41, XXX, k43, k44, XXX, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \ +} + +// 2u backspace +// Split right shift +#define LAYOUT_alice( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \ + k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ + k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \ + k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ + k41, k43, k44, k46, k49, k4b, k4f \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \ + { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ + { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \ + { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \ + { XXX, k41, XXX, k43, k44, XXX, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \ +} diff --git a/keyboards/rmi_kb/aelith/config.h b/keyboards/rmi_kb/aelith/config.h new file mode 100644 index 0000000000..99bc99049f --- /dev/null +++ b/keyboards/rmi_kb/aelith/config.h @@ -0,0 +1,60 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D5, D1, D0, D6, A7 } +#define MATRIX_COL_PINS { D7, C0, C1, C2, C3, C4, C5, C6, C7, A6, A5, A0, A1, A2, A3, A4 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/rmi_kb/aelith/info.json b/keyboards/rmi_kb/aelith/info.json new file mode 100644 index 0000000000..87c491a7bd --- /dev/null +++ b/keyboards/rmi_kb/aelith/info.json @@ -0,0 +1,177 @@ +{ + "keyboard_name": "AELITH", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0xE460", + "device_version": "0.1.2" + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "community_layouts": ["alice", "alice_split_bs"], + "layouts": { + "LAYOUT_alice_split_bs": { + "layout": [ + {"x":0.5, "y":0}, + + {"x":1.75, "y":0}, + {"x":2.75, "y":0}, + {"x":3.75, "y":0}, + {"x":4.75, "y":0}, + {"x":5.75, "y":0}, + {"x":6.75, "y":0}, + {"x":7.75, "y":0}, + + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + {"x":15, "y":0}, + {"x":16, "y":0}, + {"x":17, "y":0}, + {"x":18, "y":0}, + + {"x":0.25, "y":1}, + {"x":1.75, "y":1, "w":1.5}, + {"x":3.25, "y":1}, + {"x":4.25, "y":1}, + {"x":5.25, "y":1}, + {"x":6.25, "y":1}, + {"x":7.25, "y":1}, + + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1}, + {"x":14.5, "y":1}, + {"x":15.5, "y":1}, + {"x":16.5, "y":1}, + {"x":17.5, "y":1, "w":1.5}, + + {"x":0, "y":2}, + + {"x":1.75, "y":2, "w":1.75}, + {"x":3.5, "y":2}, + {"x":4.5, "y":2}, + {"x":5.5, "y":2}, + {"x":6.5, "y":2}, + {"x":7.5, "y":2}, + + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + {"x":13.75, "y":2}, + {"x":14.75, "y":2}, + {"x":15.75, "y":2}, + {"x":16.75, "y":2, "w":2.25}, + + {"x":1.75, "y":3, "w":2.25}, + {"x":4, "y":3}, + {"x":5, "y":3}, + {"x":6, "y":3}, + {"x":7, "y":3}, + {"x":8, "y":3}, + + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3}, + {"x":13.25, "y":3}, + {"x":14.25, "y":3}, + {"x":15.25, "y":3}, + {"x":16.25, "y":3, "w":1.75}, + {"x":18, "y":3}, + + {"x":1.75, "y":4, "w":1.5}, + {"x":4.5, "y":4, "w":1.5}, + {"x":6, "y":4, "w":2.25}, + {"x":8.25, "y":4}, + + {"x":10.25, "y":4, "w":2.75}, + {"x":13, "y":4, "w":1.5}, + {"x":17.5, "y":4, "w":1.5} + ] + }, + "LAYOUT_alice": { + "layout": [ + {"x":0.5, "y":0}, + + {"x":1.75, "y":0}, + {"x":2.75, "y":0}, + {"x":3.75, "y":0}, + {"x":4.75, "y":0}, + {"x":5.75, "y":0}, + {"x":6.75, "y":0}, + {"x":7.75, "y":0}, + + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + {"x":15, "y":0}, + {"x":16, "y":0}, + {"x":17, "y":0, "w":2}, + + {"x":0.25, "y":1}, + {"x":1.75, "y":1, "w":1.5}, + {"x":3.25, "y":1}, + {"x":4.25, "y":1}, + {"x":5.25, "y":1}, + {"x":6.25, "y":1}, + {"x":7.25, "y":1}, + + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1}, + {"x":14.5, "y":1}, + {"x":15.5, "y":1}, + {"x":16.5, "y":1}, + {"x":17.5, "y":1, "w":1.5}, + + {"x":0, "y":2}, + + {"x":1.75, "y":2, "w":1.75}, + {"x":3.5, "y":2}, + {"x":4.5, "y":2}, + {"x":5.5, "y":2}, + {"x":6.5, "y":2}, + {"x":7.5, "y":2}, + + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + {"x":13.75, "y":2}, + {"x":14.75, "y":2}, + {"x":15.75, "y":2}, + {"x":16.75, "y":2, "w":2.25}, + + {"x":1.75, "y":3, "w":2.25}, + {"x":4, "y":3}, + {"x":5, "y":3}, + {"x":6, "y":3}, + {"x":7, "y":3}, + {"x":8, "y":3}, + + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3}, + {"x":13.25, "y":3}, + {"x":14.25, "y":3}, + {"x":15.25, "y":3}, + {"x":16.25, "y":3, "w":1.75}, + {"x":18, "y":3}, + + {"x":1.75, "y":4, "w":1.5}, + {"x":4.5, "y":4, "w":1.5}, + {"x":6, "y":4, "w":2.25}, + {"x":8.25, "y":4}, + + {"x":10.25, "y":4, "w":2.75}, + {"x":13, "y":4, "w":1.5}, + {"x":17.5, "y":4, "w":1.5} + ] + } + } +} diff --git a/keyboards/rmi_kb/aelith/keymaps/default/keymap.c b/keyboards/rmi_kb/aelith/keymaps/default/keymap.c new file mode 100644 index 0000000000..64e74607e1 --- /dev/null +++ b/keyboards/rmi_kb/aelith/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_alice_split_bs( + KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_alice_split_bs( + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/rmi_kb/aelith/keymaps/via/keymap.c b/keyboards/rmi_kb/aelith/keymaps/via/keymap.c new file mode 100644 index 0000000000..e916d6e6c1 --- /dev/null +++ b/keyboards/rmi_kb/aelith/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_alice_split_bs( + KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_alice_split_bs( + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_alice_split_bs( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_alice_split_bs( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/rmi_kb/aelith/keymaps/via/rules.mk b/keyboards/rmi_kb/aelith/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/aelith/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/aelith/readme.md b/keyboards/rmi_kb/aelith/readme.md new file mode 100644 index 0000000000..23d24cb5f9 --- /dev/null +++ b/keyboards/rmi_kb/aelith/readme.md @@ -0,0 +1,14 @@ +# ÆLITH + +![ÆLITH](https://i.imgur.com/wG1OWLol.png) + +A through-hole Alice-layout keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/aelith:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/aelith/rules.mk b/keyboards/rmi_kb/aelith/rules.mk new file mode 100644 index 0000000000..1e9f925544 --- /dev/null +++ b/keyboards/rmi_kb/aelith/rules.mk @@ -0,0 +1,15 @@ +# Processor frequency +F_CPU = 16000000 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rmi_kb/chevron/chevron.c b/keyboards/rmi_kb/chevron/chevron.c new file mode 100644 index 0000000000..5b15d3324c --- /dev/null +++ b/keyboards/rmi_kb/chevron/chevron.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "chevron.h" diff --git a/keyboards/rmi_kb/chevron/chevron.h b/keyboards/rmi_kb/chevron/chevron.h new file mode 100644 index 0000000000..0f95555c55 --- /dev/null +++ b/keyboards/rmi_kb/chevron/chevron.h @@ -0,0 +1,75 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define XXX KC_NO + +#define LAYOUT_ansi( \ + k1d, \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \ + k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \ + { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +} + +#define LAYOUT_iso( \ + k1d, \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \ + k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \ + { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +} + +#define LAYOUT_all( \ + k40, k1d, k41, \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, k2d, \ + k30, k31, k32, k34, k36, k38, k3b, k3c, k3d \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c, k2d }, \ + { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, XXX, XXX, k3b, k3c, k3d }, \ + { k40, k41, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +} diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h new file mode 100644 index 0000000000..624162cff1 --- /dev/null +++ b/keyboards/rmi_kb/chevron/config.h @@ -0,0 +1,86 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D5, D6, C0, D7, NO_PIN } +#define MATRIX_COL_PINS { A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, A4, A3, A2, B4 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +// #endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + +/* Encoder */ +#define ENCODERS_PAD_A { A0 } +#define ENCODERS_PAD_B { A1 } + +//#define ENCODER_DIRECTION_FLIP diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json new file mode 100644 index 0000000000..654da4ace8 --- /dev/null +++ b/keyboards/rmi_kb/chevron/info.json @@ -0,0 +1,191 @@ +{ + "keyboard_name": "Chevron", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0xC4EE", + "device_version": "0.1.2" + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x":13.5, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1}, + {"x":6, "y":1}, + {"x":7, "y":1}, + {"x":8, "y":1}, + {"x":9, "y":1}, + {"x":10, "y":1}, + {"x":11, "y":1}, + {"x":12, "y":1}, + {"x":13, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.25}, + {"x":1.25, "y":2}, + {"x":2.25, "y":2}, + {"x":3.25, "y":2}, + {"x":4.25, "y":2}, + {"x":5.25, "y":2}, + {"x":6.25, "y":2}, + {"x":7.25, "y":2}, + {"x":8.25, "y":2}, + {"x":9.25, "y":2}, + {"x":10.25, "y":2}, + {"x":11.25, "y":2}, + {"x":12.25, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":1.75}, + {"x":1.75, "y":3}, + {"x":2.75, "y":3}, + {"x":3.75, "y":3}, + {"x":4.75, "y":3}, + {"x":5.75, "y":3}, + {"x":6.75, "y":3}, + {"x":7.75, "y":3}, + {"x":8.75, "y":3}, + {"x":9.75, "y":3}, + {"x":10.75, "y":3}, + {"x":11.75, "y":3, "w":1.75}, + {"x":13.5, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":3}, + {"x":6.75, "y":4}, + {"x":7.75, "y":4, "w":3}, + {"x":10.75, "y":4, "w":1.25}, + {"x":12, "y":4, "w":1.25}, + {"x":13.25, "y":4, "w":1.25} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x":13.5, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1}, + {"x":6, "y":1}, + {"x":7, "y":1}, + {"x":8, "y":1}, + {"x":9, "y":1}, + {"x":10, "y":1}, + {"x":11, "y":1}, + {"x":12, "y":1}, + + {"x":0, "y":2, "w":1.25}, + {"x":1.25, "y":2}, + {"x":2.25, "y":2}, + {"x":3.25, "y":2}, + {"x":4.25, "y":2}, + {"x":5.25, "y":2}, + {"x":6.25, "y":2}, + {"x":7.25, "y":2}, + {"x":8.25, "y":2}, + {"x":9.25, "y":2}, + {"x":10.25, "y":2}, + {"x":11.25, "y":2}, + {"x":12.25, "y":2}, + {"x":13.25, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":3, "w":1.75}, + {"x":1.75, "y":3}, + {"x":2.75, "y":3}, + {"x":3.75, "y":3}, + {"x":4.75, "y":3}, + {"x":5.75, "y":3}, + {"x":6.75, "y":3}, + {"x":7.75, "y":3}, + {"x":8.75, "y":3}, + {"x":9.75, "y":3}, + {"x":10.75, "y":3}, + {"x":11.75, "y":3, "w":1.75}, + {"x":13.5, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":3}, + {"x":6.75, "y":4}, + {"x":7.75, "y":4, "w":3}, + {"x":10.75, "y":4, "w":1.25}, + {"x":12, "y":4, "w":1.25}, + {"x":13.25, "y":4, "w":1.25} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x":11.5, "y":0}, + {"x":12.5, "y":0}, + {"x":13.5, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1}, + {"x":6, "y":1}, + {"x":7, "y":1}, + {"x":8, "y":1}, + {"x":9, "y":1}, + {"x":10, "y":1}, + {"x":11, "y":1}, + {"x":12, "y":1}, + {"x":13, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.25}, + {"x":1.25, "y":2}, + {"x":2.25, "y":2}, + {"x":3.25, "y":2}, + {"x":4.25, "y":2}, + {"x":5.25, "y":2}, + {"x":6.25, "y":2}, + {"x":7.25, "y":2}, + {"x":8.25, "y":2}, + {"x":9.25, "y":2}, + {"x":10.25, "y":2}, + {"x":11.25, "y":2}, + {"x":12.25, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":1.75}, + {"x":1.75, "y":3}, + {"x":2.75, "y":3}, + {"x":3.75, "y":3}, + {"x":4.75, "y":3}, + {"x":5.75, "y":3}, + {"x":6.75, "y":3}, + {"x":7.75, "y":3}, + {"x":8.75, "y":3}, + {"x":9.75, "y":3}, + {"x":10.75, "y":3}, + {"x":11.75, "y":3, "w":1.75}, + {"x":13.5, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":3}, + {"x":6.75, "y":4}, + {"x":7.75, "y":4, "w":3}, + {"x":10.75, "y":4, "w":1.25}, + {"x":12, "y":4, "w":1.25}, + {"x":13.25, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/rmi_kb/chevron/keymaps/default/keymap.c b/keyboards/rmi_kb/chevron/keymaps/default/keymap.c new file mode 100644 index 0000000000..45c7494f8b --- /dev/null +++ b/keyboards/rmi_kb/chevron/keymaps/default/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_MUTE, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_BSPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_ansi( + _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, + _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} diff --git a/keyboards/rmi_kb/chevron/keymaps/iso/keymap.c b/keyboards/rmi_kb/chevron/keymaps/iso/keymap.c new file mode 100644 index 0000000000..ed18fc0e54 --- /dev/null +++ b/keyboards/rmi_kb/chevron/keymaps/iso/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_MUTE, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_BSPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_iso( + _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, + _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} diff --git a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c new file mode 100644 index 0000000000..190a39e257 --- /dev/null +++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c @@ -0,0 +1,86 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_VOLD, KC_MUTE, KC_VOLU, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_BSPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_all( + _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, + _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +keyevent_t encoder_ccw = { + .key = (keypos_t){.row = 4, .col = 0}, + .pressed = false +}; + +keyevent_t encoder_cw = { + .key = (keypos_t){.row = 4, .col = 1}, + .pressed = false +}; + +void matrix_scan_user(void) { + if (IS_PRESSED(encoder_ccw)) { + encoder_ccw.pressed = false; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + + if (IS_PRESSED(encoder_cw)) { + encoder_cw.pressed = false; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + encoder_cw.pressed = true; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + wait_ms(20); + } else { + encoder_ccw.pressed = true; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + wait_ms(20); + } + return true; +} diff --git a/keyboards/rmi_kb/chevron/keymaps/via/rules.mk b/keyboards/rmi_kb/chevron/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/chevron/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/chevron/readme.md b/keyboards/rmi_kb/chevron/readme.md new file mode 100644 index 0000000000..456ad9db43 --- /dev/null +++ b/keyboards/rmi_kb/chevron/readme.md @@ -0,0 +1,20 @@ +# Chevron + +![Chevron](https://i.imgur.com/abOuPNdl.png) + +A through-hole 40% keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A + +To get to the bootloader, + + 1. Press and hold the BOOT button + 2. Press the RESET button + 3. Release the BOOT button + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/chevron:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/chevron/rules.mk b/keyboards/rmi_kb/chevron/rules.mk new file mode 100644 index 0000000000..36c6a2d050 --- /dev/null +++ b/keyboards/rmi_kb/chevron/rules.mk @@ -0,0 +1,16 @@ +# Processor frequency +F_CPU = 16000000 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h new file mode 100644 index 0000000000..60b1a3f64b --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/config.h @@ -0,0 +1,68 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 7 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6, NO_PIN } +#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Encoder pin assignment */ +#define ENCODERS_PAD_A { C3 } +#define ENCODERS_PAD_B { C2 } + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Small QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json new file mode 100644 index 0000000000..6a365b17c1 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/info.json @@ -0,0 +1,327 @@ +{ + "keyboard_name": "Herringbone Pro", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x440B", + "device_version": "0.1.2" + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 2.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.25, "y": 0}, + {"x": 16.25, "y": 0}, + {"x": 17.25, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25}, + {"x": 14, "y": 1.25}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 2.25}, + {"x": 6, "y": 5.25, "w": 1.25}, + {"x": 7.25, "y": 5.25, "w": 2.75}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/default/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/default/keymap.c new file mode 100644 index 0000000000..a04192a3e4 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/keymaps/default/keymap.c @@ -0,0 +1,99 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +#include "pattern.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + +#ifdef OLED_ENABLE +uint32_t anim_timer = 0; +uint32_t anim_sleep = 0; +uint8_t current_frame = 0; + +#define FRAME_DURATION 50 + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + anim_sleep = timer_read32(); + oled_on(); + } else { + tap_code(KC_VOLD); + anim_sleep = timer_read32(); + oled_on(); + } + return true; +} + +static void render_pattern(void) { + void animate(void) { + oled_set_cursor(4, 0); + oled_write_raw_P(pattern_a[current_frame], 96); + oled_set_cursor(4, 1); + oled_write_raw_P(pattern_b[current_frame], 96); + oled_set_cursor(4, 2); + oled_write_raw_P(pattern_a[current_frame], 96); + + current_frame = (current_frame + 1) % 32; + } + + if (get_current_wpm() != 000) { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + anim_sleep = timer_read32(); + } else { + if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { + oled_off(); + } else { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + } + } +} + +bool oled_task_user(void) { + // Render Herringbone pattern + render_pattern(); + oled_render(); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 0); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 1); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + oled_render(); + return false; +} +#endif diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/iso/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/iso/keymap.c new file mode 100644 index 0000000000..6d280905dc --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/keymaps/iso/keymap.c @@ -0,0 +1,99 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +#include "pattern.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + +#ifdef OLED_ENABLE +uint32_t anim_timer = 0; +uint32_t anim_sleep = 0; +uint8_t current_frame = 0; + +#define FRAME_DURATION 50 + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + anim_sleep = timer_read32(); + oled_on(); + } else { + tap_code(KC_VOLD); + anim_sleep = timer_read32(); + oled_on(); + } + return true; +} + +static void render_pattern(void) { + void animate(void) { + oled_set_cursor(4, 0); + oled_write_raw_P(pattern_a[current_frame], 96); + oled_set_cursor(4, 1); + oled_write_raw_P(pattern_b[current_frame], 96); + oled_set_cursor(4, 2); + oled_write_raw_P(pattern_a[current_frame], 96); + + current_frame = (current_frame + 1) % 32; + } + + if (get_current_wpm() != 000) { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + anim_sleep = timer_read32(); + } else { + if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { + oled_off(); + } else { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + } + } +} + +bool oled_task_user(void) { + // Render Herringbone pattern + render_pattern(); + oled_render(); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 0); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 1); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + oled_render(); + return false; +} +#endif diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c new file mode 100644 index 0000000000..71622cddcf --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c @@ -0,0 +1,153 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +#include "pattern.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_VOLD, KC_MUTE, KC_VOLU, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +keyevent_t encoder_ccw = { + .key = (keypos_t){.row = 6, .col = 0}, + .pressed = false +}; + +keyevent_t encoder_cw = { + .key = (keypos_t){.row = 6, .col = 1}, + .pressed = false +}; + +void matrix_scan_user(void) { + if (IS_PRESSED(encoder_ccw)) { + encoder_ccw.pressed = false; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + + if (IS_PRESSED(encoder_cw)) { + encoder_cw.pressed = false; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } +} + +#ifdef OLED_ENABLE +uint32_t anim_timer = 0; +uint32_t anim_sleep = 0; +uint8_t current_frame = 0; + +#define FRAME_DURATION 50 + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + encoder_cw.pressed = true; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + wait_ms(20); + anim_sleep = timer_read32(); + oled_on(); + } else { + encoder_ccw.pressed = true; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + wait_ms(20); + anim_sleep = timer_read32(); + oled_on(); + } + return true; +} + +static void render_pattern(void) { + void animate(void) { + oled_set_cursor(4, 0); + oled_write_raw_P(pattern_a[current_frame], 96); + oled_set_cursor(4, 1); + oled_write_raw_P(pattern_b[current_frame], 96); + oled_set_cursor(4, 2); + oled_write_raw_P(pattern_a[current_frame], 96); + + current_frame = (current_frame + 1) % 32; + } + + if (get_current_wpm() != 000) { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + anim_sleep = timer_read32(); + } else { + if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { + oled_off(); + } else { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + } + } +} + +bool oled_task_user(void) { + // Render Herringbone pattern + render_pattern(); + oled_render(); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 0); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 1); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + oled_render(); + return false; +} +#endif diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk b/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/herringbone/pro/pattern.c b/keyboards/rmi_kb/herringbone/pro/pattern.c new file mode 100644 index 0000000000..135c067b68 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/pattern.c @@ -0,0 +1,88 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "pattern.h" +#include "progmem.h" + +// I tried doing this with 32x8 but I can't align it perfectly +const char PROGMEM pattern_a[32][96] = { + { 255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127 }, + { 127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63 }, + { 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31 }, + { 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15 }, + { 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7 }, + { 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3 }, + { 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1 }, + { 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128 }, + { 128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192 }, + { 192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224 }, + { 224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240 }, + { 240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248 }, + { 248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252 }, + { 252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254 }, + { 254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255 }, + { 255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255 }, + { 255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0 }, + { 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0 }, + { 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1 }, + { 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3 }, + { 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7 }, + { 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15 }, + { 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31 }, + { 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63 }, + { 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127 }, + { 127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254 }, + { 254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252 }, + { 252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248 }, + { 248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240 }, + { 240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224 }, + { 224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192 }, + { 192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255 }, +}; +const char PROGMEM pattern_b[32][96] = { + { 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192 }, + { 192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224 }, + { 224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240 }, + { 240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248 }, + { 248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252 }, + { 252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254 }, + { 254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255 }, + { 255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255 }, + { 255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127 }, + { 127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63 }, + { 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31 }, + { 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15 }, + { 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7 }, + { 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3 }, + { 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1 }, + { 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128 }, + { 128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127 }, + { 127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254 }, + { 254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252 }, + { 252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248 }, + { 248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240 }, + { 240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224 }, + { 224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192 }, + { 192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128 }, + { 128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0 }, + { 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0 }, + { 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1 }, + { 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3 }, + { 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7 }, + { 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15 }, + { 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31 }, + { 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63 }, +}; diff --git a/keyboards/rmi_kb/herringbone/pro/pattern.h b/keyboards/rmi_kb/herringbone/pro/pattern.h new file mode 100644 index 0000000000..a564e4abb4 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/pattern.h @@ -0,0 +1,20 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +extern const char pattern_a[32][96]; +extern const char pattern_b[32][96]; diff --git a/keyboards/rmi_kb/herringbone/pro/pro.c b/keyboards/rmi_kb/herringbone/pro/pro.c new file mode 100644 index 0000000000..4c11baefcc --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/pro.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "pro.h" diff --git a/keyboards/rmi_kb/herringbone/pro/pro.h b/keyboards/rmi_kb/herringbone/pro/pro.h new file mode 100644 index 0000000000..28494e0ddc --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/pro.h @@ -0,0 +1,87 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define XXX KC_NO + +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, XXX, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX} \ +} + +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k2d, k3e, \ + k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ +} + +// Split backspace +// Split space +// Encoder functionality exposed +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k60, k0e, k61, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k54, k55, k57, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, k51, k52, k53, k54, k55, XXX, k57, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ + { k60, k61, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ +} diff --git a/keyboards/rmi_kb/herringbone/pro/readme.md b/keyboards/rmi_kb/herringbone/pro/readme.md new file mode 100644 index 0000000000..4e3eef39f6 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/readme.md @@ -0,0 +1,23 @@ +# Herringbone Pro + +![Herringbone Pro](https://i.imgur.com/cewklY5l.png) + +A through-hole 75% keyboard with a rotary encoder and OLED display! + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A +* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) + +To get to the bootloader, + +1. Press and hold the BOOT button + +2. Press the RESET button + +3. Release the BOOT button + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/herringbone/pro:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/herringbone/pro/rules.mk b/keyboards/rmi_kb/herringbone/pro/rules.mk new file mode 100644 index 0000000000..db45e4f61c --- /dev/null +++ b/keyboards/rmi_kb/herringbone/pro/rules.mk @@ -0,0 +1,22 @@ +# Processor frequency +F_CPU = 16000000 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 +WPM_ENABLE = yes +LTO_ENABLE = yes + +SRC += pattern.c diff --git a/keyboards/rmi_kb/herringbone/readme.md b/keyboards/rmi_kb/herringbone/readme.md new file mode 100644 index 0000000000..b1f745c719 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/readme.md @@ -0,0 +1,23 @@ +# Herringbone and Herringbone Pro + +Through-hole 75% keyboards. The Pro version has support for rotary knob, OLED display, and split space. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A +* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) + +To get to the bootloader, + +1. Press and hold the BOOT button + +2. Press the RESET button + +3. Release the BOOT button + +Make example for these keyboards (after setting up your build environment): + + make ramonimbao/herringbone/v1:default + + make ramonimbao/herringbone/pro:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/herringbone/rules.mk b/keyboards/rmi_kb/herringbone/rules.mk new file mode 100644 index 0000000000..1efe9fa4f5 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = rmi_kb/herringbone/v1 diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h new file mode 100644 index 0000000000..89fbf781d5 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/config.h @@ -0,0 +1,80 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6 } +#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +// #endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Small QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/rmi_kb/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/info.json new file mode 100644 index 0000000000..2e12362994 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/info.json @@ -0,0 +1,323 @@ +{ + "keyboard_name": "Herringbone", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x04E5", + "device_version": "0.1.2" + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 2.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25}, + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25}, + {"x": 14, "y": 1.25}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/rmi_kb/herringbone/v1/keymaps/default/keymap.c b/keyboards/rmi_kb/herringbone/v1/keymaps/default/keymap.c new file mode 100644 index 0000000000..b9cf45351f --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; diff --git a/keyboards/rmi_kb/herringbone/v1/keymaps/iso/keymap.c b/keyboards/rmi_kb/herringbone/v1/keymaps/iso/keymap.c new file mode 100644 index 0000000000..d6d2b15f19 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/keymaps/iso/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), +}; diff --git a/keyboards/rmi_kb/herringbone/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/v1/keymaps/via/keymap.c new file mode 100644 index 0000000000..6438021f3a --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/keymaps/via/keymap.c @@ -0,0 +1,51 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/rmi_kb/herringbone/v1/keymaps/via/rules.mk b/keyboards/rmi_kb/herringbone/v1/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/herringbone/v1/readme.md b/keyboards/rmi_kb/herringbone/v1/readme.md new file mode 100644 index 0000000000..0ba9d34cd6 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/readme.md @@ -0,0 +1,23 @@ +# Herringbone + +![Herringbone](https://i.imgur.com/SQyS0j8l.png) + +A through-hole 75% keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A +* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) + +To get to the bootloader, + +1. Press and hold the BOOT button + +2. Press the RESET button + +3. Release the BOOT button + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/herringbone/v1:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/herringbone/v1/rules.mk b/keyboards/rmi_kb/herringbone/v1/rules.mk new file mode 100644 index 0000000000..18550f0a64 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/rules.mk @@ -0,0 +1,15 @@ +# Processor frequency +F_CPU = 16000000 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rmi_kb/herringbone/v1/v1.c b/keyboards/rmi_kb/herringbone/v1/v1.c new file mode 100644 index 0000000000..4bdb5fad38 --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/v1.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v1.h" diff --git a/keyboards/rmi_kb/herringbone/v1/v1.h b/keyboards/rmi_kb/herringbone/v1/v1.h new file mode 100644 index 0000000000..80c411690e --- /dev/null +++ b/keyboards/rmi_kb/herringbone/v1/v1.h @@ -0,0 +1,82 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define XXX KC_NO + +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, XXX, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e } \ +} + +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e } \ +} + +// Split backspace +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e } \ +} diff --git a/keyboards/rmi_kb/mona/rules.mk b/keyboards/rmi_kb/mona/rules.mk new file mode 100644 index 0000000000..54aa705d96 --- /dev/null +++ b/keyboards/rmi_kb/mona/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = rmi_kb/mona/v1_1 diff --git a/keyboards/rmi_kb/mona/v1/config.h b/keyboards/rmi_kb/mona/v1/config.h new file mode 100644 index 0000000000..15029cfc37 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/config.h @@ -0,0 +1,44 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 } +#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/rmi_kb/mona/v1/info.json b/keyboards/rmi_kb/mona/v1/info.json new file mode 100644 index 0000000000..84ed48762d --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/info.json @@ -0,0 +1,365 @@ +{ + "keyboard_name": "Mona", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x404A", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + {"x":0, "y":1, "w":1.5}, + + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.5}, + {"x":1.5, "y":4}, + {"x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"x":11, "y":4, "w":1.5}, + {"x":12.5, "y":4}, + {"x":13.5, "y":4, "w":1.5} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.5}, + {"x":1.5, "y":4}, + {"x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"x":11, "y":4, "w":1.5}, + {"x":12.5, "y":4}, + {"x":13.5, "y":4, "w":1.5} + ] + } + } +} diff --git a/keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c new file mode 100644 index 0000000000..430c77b289 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c new file mode 100644 index 0000000000..966f0b6efe --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_iso( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_iso( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c new file mode 100644 index 0000000000..14ba2a4339 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_all( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk b/keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/mona/v1/readme.md b/keyboards/rmi_kb/mona/v1/readme.md new file mode 100644 index 0000000000..192d452a5a --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/readme.md @@ -0,0 +1,19 @@ +# Mona + +![Mona](https://i.imgur.com/jaRv4vW.png) + +A gummy-worm o-ring mount 60% marble keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32u4 +* Hardware Availability: [Erbakeys](https://www.erbakeys.com/) + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/mona/v1:default + +Flashing example for this keyboard: + + make rmi_kb/mona/v1:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/mona/v1/rules.mk b/keyboards/rmi_kb/mona/v1/rules.mk new file mode 100644 index 0000000000..ab2c49da70 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/rules.mk @@ -0,0 +1,12 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rmi_kb/mona/v1/v1.c b/keyboards/rmi_kb/mona/v1/v1.c new file mode 100644 index 0000000000..d55373272d --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/v1.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v1.h" diff --git a/keyboards/rmi_kb/mona/v1/v1.h b/keyboards/rmi_kb/mona/v1/v1.h new file mode 100644 index 0000000000..1bb416daed --- /dev/null +++ b/keyboards/rmi_kb/mona/v1/v1.h @@ -0,0 +1,102 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define XXX KC_NO + +#define LAYOUT_60_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_tsangan_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k46, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_all LAYOUT_60_iso_split_bs_rshift + diff --git a/keyboards/rmi_kb/mona/v1_1/config.h b/keyboards/rmi_kb/mona/v1_1/config.h new file mode 100644 index 0000000000..2d7b5e33e4 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/config.h @@ -0,0 +1,42 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 } +#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* indicator LEDs */ +#define LED_CAPS_LOCK_PIN B3 diff --git a/keyboards/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json new file mode 100644 index 0000000000..77488da230 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/info.json @@ -0,0 +1,439 @@ +{ + "keyboard_name": "Mona", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x404B", + "device_version": "0.1.1" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + {"x":0, "y":1, "w":1.5}, + + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.5}, + {"x":1.5, "y":4}, + {"x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"x":11, "y":4, "w":1.5}, + {"x":12.5, "y":4}, + {"x":13.5, "y":4, "w":1.5} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.5}, + {"x":1.5, "y":4}, + {"x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"x":11, "y":4, "w":1.5}, + {"x":12.5, "y":4}, + {"x":13.5, "y":4, "w":1.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":2.5}, + {"x":6.25, "y":4}, + {"x":7.25, "y":4, "w":2.75}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/rmi_kb/mona/v1_1/keymaps/default/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/default/keymap.c new file mode 100644 index 0000000000..430c77b289 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c new file mode 100644 index 0000000000..966f0b6efe --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_iso( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_iso( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c new file mode 100644 index 0000000000..f7e88610f0 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_all( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk b/keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/mona/v1_1/readme.md b/keyboards/rmi_kb/mona/v1_1/readme.md new file mode 100644 index 0000000000..2df9019fcf --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/readme.md @@ -0,0 +1,20 @@ +# Mona v1.1 + +![Mona v1.1](https://i.imgur.com/VaWcIkjl.png) + +A gummy-worm o-ring mount 60% marble keyboard. Now with ALPS/MX, Caps Lock LED, and split spacebar support. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32u4 + +To get to the bootloader, with the USB cable plugged in, press the `RESET` button on the back of the PCB. + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/mona:default + +Flashing example for this keyboard: + + make rmi_kb/mona:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/mona/v1_1/rules.mk b/keyboards/rmi_kb/mona/v1_1/rules.mk new file mode 100644 index 0000000000..ab2c49da70 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/rules.mk @@ -0,0 +1,12 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rmi_kb/mona/v1_1/v1_1.c b/keyboards/rmi_kb/mona/v1_1/v1_1.c new file mode 100644 index 0000000000..d6ebf98053 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/v1_1.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v1_1.h" diff --git a/keyboards/rmi_kb/mona/v1_1/v1_1.h b/keyboards/rmi_kb/mona/v1_1/v1_1.h new file mode 100644 index 0000000000..a7327c3b80 --- /dev/null +++ b/keyboards/rmi_kb/mona/v1_1/v1_1.h @@ -0,0 +1,113 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define XXX KC_NO + +#define LAYOUT_60_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_tsangan_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k46, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k44, k46, k48, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, k44, XXX, k46, XXX, k48, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} diff --git a/keyboards/rmi_kb/mona/v32a/config.h b/keyboards/rmi_kb/mona/v32a/config.h new file mode 100644 index 0000000000..1363c8635a --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/config.h @@ -0,0 +1,42 @@ +/* +Copyright 2020 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { C2, C3, D6, D1, A6 } +#define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A5, A4, A3, A7, D5, C7, C6 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* indicator LEDs */ +#define LED_CAPS_LOCK_PIN C1 diff --git a/keyboards/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json new file mode 100644 index 0000000000..3e802d1a4e --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/info.json @@ -0,0 +1,439 @@ +{ + "keyboard_name": "Mona", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x4032", + "device_version": "0.1.1" + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + {"x":0, "y":1, "w":1.5}, + + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.5}, + {"x":1.5, "y":4}, + {"x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"x":11, "y":4, "w":1.5}, + {"x":12.5, "y":4}, + {"x":13.5, "y":4, "w":1.5} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.5}, + {"x":1.5, "y":4}, + {"x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"x":11, "y":4, "w":1.5}, + {"x":12.5, "y":4}, + {"x":13.5, "y":4, "w":1.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":2.5}, + {"x":6.25, "y":4}, + {"x":7.25, "y":4, "w":2.75}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/rmi_kb/mona/v32a/keymaps/default/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/default/keymap.c new file mode 100644 index 0000000000..430c77b289 --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c new file mode 100644 index 0000000000..966f0b6efe --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_iso( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_iso( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c new file mode 100644 index 0000000000..f7e88610f0 --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_all( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk b/keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/mona/v32a/readme.md b/keyboards/rmi_kb/mona/v32a/readme.md new file mode 100644 index 0000000000..0666f95fec --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/readme.md @@ -0,0 +1,20 @@ +# Mona v1.1 (ATmega32A version) + +![Mona v1.1](https://i.imgur.com/VaWcIkjl.png) + +A gummy-worm o-ring mount 60% marble keyboard. Now with ALPS/MX, Caps Lock LED, and split spacebar support. ATmega32A version exists because I need alternatives because of the chip shortage. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A + +To get to the bootloader, with the USB cable plugged in, press the `RESET` button on the back of the PCB. + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/mona/v32a:default + +Flashing example for this keyboard: + + make rmi_kb/mona/v32a:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/mona/v32a/rules.mk b/keyboards/rmi_kb/mona/v32a/rules.mk new file mode 100644 index 0000000000..1e9f925544 --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/rules.mk @@ -0,0 +1,15 @@ +# Processor frequency +F_CPU = 16000000 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rmi_kb/mona/v32a/v32a.c b/keyboards/rmi_kb/mona/v32a/v32a.c new file mode 100644 index 0000000000..cc35f4d5ff --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/v32a.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v32a.h" diff --git a/keyboards/rmi_kb/mona/v32a/v32a.h b/keyboards/rmi_kb/mona/v32a/v32a.h new file mode 100644 index 0000000000..ac58b851a6 --- /dev/null +++ b/keyboards/rmi_kb/mona/v32a/v32a.h @@ -0,0 +1,113 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define XXX KC_NO + +#define LAYOUT_60_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_tsangan_hhkb( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k46, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso_split_bs_rshift( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k46, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_60_iso_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ + k40, k41, k42, k46, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \ + { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, XXX, k4d, k4e }, \ +} + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k45, k46, k49, k4a, k4b, k4d, k4e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, XXX, XXX, k45, k46, XXX, XXX, k49, k4a, k4b, XXX, k4d, k4e }, \ +} diff --git a/keyboards/rmi_kb/squishy65/chconf.h b/keyboards/rmi_kb/squishy65/chconf.h new file mode 100644 index 0000000000..144f324bc5 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/chconf.h @@ -0,0 +1,31 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_FREQUENCY 10000 + +#define CH_CFG_OPTIMIZE_SPEED FALSE + +#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + +#include_next + diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h new file mode 100644 index 0000000000..b31d8d2ebd --- /dev/null +++ b/keyboards/rmi_kb/squishy65/config.h @@ -0,0 +1,61 @@ +/* +Copyright 2015 Jun Wako + +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 2 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 . +*/ + +#pragma once + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 + +#define MATRIX_COL_PINS { A9, B9, B7, B6, B5, B4, B2, B1, B0, A7, A6, A5, A4, A10, A3, A2 } +#define MATRIX_ROW_PINS { A15, B3, A0, B10, B11 } +#define DIODE_DIRECTION COL2ROW + +// RGB B4 +#define RGB_DI_PIN B15 +#define RGBLED_NUM 18 +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/rmi_kb/squishy65/halconf.h b/keyboards/rmi_kb/squishy65/halconf.h new file mode 100644 index 0000000000..4ebba2e53b --- /dev/null +++ b/keyboards/rmi_kb/squishy65/halconf.h @@ -0,0 +1,27 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next + diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json new file mode 100644 index 0000000000..6e374d5f2b --- /dev/null +++ b/keyboards/rmi_kb/squishy65/info.json @@ -0,0 +1,24 @@ +{ + "keyboard_name": "Squishy65", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x10B5", + "device_version": "0.6.5" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_ansi": { + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] + }, + "LAYOUT_iso": { + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] + }, + "LAYOUT_all": { + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"<", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Menu", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] + } + } +} diff --git a/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c new file mode 100644 index 0000000000..f22daf1760 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_ansi( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, RGB_HUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, + _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_VAD, RGB_RMOD + ) +}; diff --git a/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c new file mode 100644 index 0000000000..dedb48f333 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_iso( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_SAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, + _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_VAD, RGB_RMOD + ) +}; diff --git a/keyboards/rmi_kb/squishy65/keymaps/via/config.h b/keyboards/rmi_kb/squishy65/keymaps/via/config.h new file mode 100644 index 0000000000..8b3f3ebf97 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/keymaps/via/config.h @@ -0,0 +1,18 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#pragma once + +#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 diff --git a/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c new file mode 100644 index 0000000000..c1abb8cff6 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, RGB_HUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, + _______, _______, _______, RGB_TOG, _______, _______, _______, RGB_MOD, RGB_VAD, RGB_RMOD + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/squishy65/keymaps/via/rules.mk b/keyboards/rmi_kb/squishy65/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/squishy65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/squishy65/mcuconf.h b/keyboards/rmi_kb/squishy65/mcuconf.h new file mode 100644 index 0000000000..f7ce173262 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/mcuconf.h @@ -0,0 +1,37 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_RTCSEL +#define STM32_RTCSEL STM32_RTCSEL_NOCLOCK + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE + diff --git a/keyboards/rmi_kb/squishy65/readme.md b/keyboards/rmi_kb/squishy65/readme.md new file mode 100644 index 0000000000..7fbf0f6b85 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/readme.md @@ -0,0 +1,14 @@ +# Squishy65 + +![Squishy65](https://i.imgur.com/dZsllxQ.png) + +A gasket mount stacked acrylic 65% keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: STM32F072CBU6 + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/squishy65:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/squishy65/rules.mk b/keyboards/rmi_kb/squishy65/rules.mk new file mode 100644 index 0000000000..4eaa5819ac --- /dev/null +++ b/keyboards/rmi_kb/squishy65/rules.mk @@ -0,0 +1,15 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/rmi_kb/squishy65/squishy65.c b/keyboards/rmi_kb/squishy65/squishy65.c new file mode 100644 index 0000000000..6d9fb24196 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/squishy65.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "squishy65.h" diff --git a/keyboards/rmi_kb/squishy65/squishy65.h b/keyboards/rmi_kb/squishy65/squishy65.h new file mode 100644 index 0000000000..25480c8748 --- /dev/null +++ b/keyboards/rmi_kb/squishy65/squishy65.h @@ -0,0 +1,73 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + + +// ANSI +// split backspace +// 2x right mods +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, \ + k40, k41, k42, k46, k49, k4a, k4b, k4e, k4f \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \ + { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \ +} + +// ISO +// 2u backspace +// 2x right mods +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, \ + k40, k41, k42, k46, k49, k4a, k4b, k4e, k4f \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \ + { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \ +} + +// Exposed +// split backspace +// 3x right mods +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, \ + k40, k41, k42, k46, k49, k4a, k4b, k4c, k4e, k4f \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \ + { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, XXX, k4e, k4f }, \ +} diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h new file mode 100644 index 0000000000..041407aed3 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -0,0 +1,96 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 9 +#define MATRIX_COLS 21 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B9, B8, A0, A1, A9, A8, B11, A6, A5} +#define MATRIX_COL_PINS { A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } + + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +#define RGB_DI_PIN C15 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/rmi_kb/squishyfrl/halconf.h b/keyboards/rmi_kb/squishyfrl/halconf.h new file mode 100644 index 0000000000..344e66379f --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next + + diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json new file mode 100644 index 0000000000..f2dc2ebd24 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/info.json @@ -0,0 +1,260 @@ +{ + "keyboard_name": "SquishyFRL", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x4BE5", + "device_version": "0.0.1" + }, + "processor": "STM32F103", + "bootloader": "stm32duino", + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + {"x":15.25, "y":1}, + {"x":16.25, "y":1}, + {"x":17.25, "y":1}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + {"x":16.25, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25}, + {"x":15.25, "y":4}, + {"x":16.25, "y":4}, + {"x":17.25, "y":4} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":15.25, "y":1}, + {"x":16.25, "y":1}, + {"x":17.25, "y":1}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + {"x":16.25, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25}, + {"x":15.25, "y":4}, + {"x":16.25, "y":4}, + {"x":17.25, "y":4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + {"x":15.25, "y":1}, + {"x":16.25, "y":1}, + {"x":17.25, "y":1}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":1.75}, + {"x":14, "y":3}, + {"x":16.25, "y":3}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":3}, + {"x":6.75, "y":4}, + {"x":7.75, "y":4, "w":2.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25}, + {"x":15.25, "y":4}, + {"x":16.25, "y":4}, + {"x":17.25, "y":4} + ] + } + } +} diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/default/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/default/keymap.c new file mode 100644 index 0000000000..c29df874c5 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md b/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md new file mode 100644 index 0000000000..b20cf74361 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md @@ -0,0 +1,3 @@ +# The default keymap for SquishyTKL + +ANSI, 6.25u bottom row diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c new file mode 100644 index 0000000000..e6dc1c974e --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_iso( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/via/config.h b/keyboards/rmi_kb/squishyfrl/keymaps/via/config.h new file mode 100644 index 0000000000..c7cec8a9d7 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c new file mode 100644 index 0000000000..06e14e016e --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk b/keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/squishyfrl/mcuconf.h b/keyboards/rmi_kb/squishyfrl/mcuconf.h new file mode 100644 index 0000000000..b14bd32f80 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/mcuconf.h @@ -0,0 +1,24 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +#include_next + +#undef STM32_PWM_USE_TIM2 +#define STM32_PWM_USE_TIM2 TRUE + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 FALSE + diff --git a/keyboards/rmi_kb/squishyfrl/readme.md b/keyboards/rmi_kb/squishyfrl/readme.md new file mode 100644 index 0000000000..98bbec27e9 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/readme.md @@ -0,0 +1,18 @@ +# SquishyFRL + +![SquishyFRL](https://i.imgur.com/UT7Pik3l.jpg) + +A stacked acrylic o-ring gasket mounted F-row-less TKL keyboard with a twist! + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: STM32F103RB + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/squishyfrl:via + +Flashing example for this keyboard: + + dfu-util -d 1eaf:0003 -a 2 -D path/to/rmi_kb_squishyfrl_via.bin + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/squishyfrl/rules.mk b/keyboards/rmi_kb/squishyfrl/rules.mk new file mode 100644 index 0000000000..5c31520ab4 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/rules.mk @@ -0,0 +1,15 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/rmi_kb/squishyfrl/squishyfrl.c b/keyboards/rmi_kb/squishyfrl/squishyfrl.c new file mode 100644 index 0000000000..db2a2ae933 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/squishyfrl.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "squishyfrl.h" diff --git a/keyboards/rmi_kb/squishyfrl/squishyfrl.h b/keyboards/rmi_kb/squishyfrl/squishyfrl.h new file mode 100644 index 0000000000..e98139da16 --- /dev/null +++ b/keyboards/rmi_kb/squishyfrl/squishyfrl.h @@ -0,0 +1,91 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define ___ KC_NO + +#define LAYOUT_ansi( \ + k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k4k, k4l, k4m, \ + k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, k9j, k5k, k5l, k5m, \ + ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai, \ + kb5, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, kbi, kbj, k6l, \ + kc5, kc6, kc7, kcd, kcf, kcg, kch, kci, k7k, k7l, k7m \ +) { \ + /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 */ \ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k */ \ + /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \ + /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \ + /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \ + /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \ + /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, ___, ___, ___, ___, ___, ___, ___ }, \ + /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \ + /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \ + /* 7 | 7 */ { kb5, ___, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \ + /* 8 | 8 */ { kc5, kc6, kc7, ___, ___, ___, ___, ___, kcd, ___, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \ +} + +#define LAYOUT_iso( \ + k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k4k, k4l, k4m, \ + k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, k5k, k5l, k5m, \ + ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai, k9j, \ + kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, kbi, kbj, k6l, \ + kc5, kc6, kc7, kcd, kcf, kcg, kch, kci, k7k, k7l, k7m \ +) { \ + /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 */ \ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k */ \ + /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \ + /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \ + /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \ + /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \ + /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, ___, ___, ___, ___, ___, ___, ___ }, \ + /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \ + /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \ + /* 7 | 7 */ { kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \ + /* 8 | 8 */ { kc5, kc6, kc7, ___, ___, ___, ___, ___, kcd, ___, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \ +} + + +#define LAYOUT_all( \ + k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k8j, k4k, k4l, k4m, \ + k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, k9j, k5k, k5l, k5m, \ + ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai, \ + kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, kbi, kbj, k6l, \ + kc5, kc6, kc7, kc8, kcd, kce, kcf, kcg, kch, kci, k7k, k7l, k7m \ +) { \ + /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 */ \ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k */ \ + /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \ + /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \ + /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \ + /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \ + /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k8j, ___, ___, ___, ___, ___, ___ }, \ + /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \ + /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \ + /* 7 | 7 */ { kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \ + /* 8 | 8 */ { kc5, kc6, kc7, kc8, ___, ___, ___, ___, kcd, kce, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \ +} diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h new file mode 100644 index 0000000000..e46aeea45a --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/config.h @@ -0,0 +1,105 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 14 +#define MATRIX_COLS 26 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 } +#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } + + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +#define RGB_DI_PIN C15 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + +/* Rotary encoder */ +#define ENCODERS_PAD_A { B6 } +#define ENCODERS_PAD_B { B7 } + +#define ENCODER_RESOLUTION 1 + +//#define ENCODER_DIRECTION_FLIP diff --git a/keyboards/rmi_kb/squishytkl/halconf.h b/keyboards/rmi_kb/squishytkl/halconf.h new file mode 100644 index 0000000000..344e66379f --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next + + diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json new file mode 100644 index 0000000000..febd39bdf5 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/info.json @@ -0,0 +1,447 @@ +{ + "keyboard_name": "SquishyTKL", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x00B1", + "device_version": "1.0.0" + }, + "processor": "STM32F103", + "bootloader": "stm32duino", + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.25, "y": 0}, + {"x": 16.25, "y": 0}, + {"x": 17.25, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.25, "y": 1.25}, + {"x": 16.25, "y": 1.25}, + {"x": 17.25, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.25, "y": 2.25}, + {"x": 16.25, "y": 2.25}, + {"x": 17.25, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 0, "y": 4.25, "w": 2.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 2.75}, + + {"x": 16.25, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.25}, + {"x": 11.25, "y": 5.25, "w": 1.25}, + {"x": 12.5, "y": 5.25, "w": 1.25}, + {"x": 13.75, "y": 5.25, "w": 1.25}, + + {"x": 15.25, "y": 5.25}, + {"x": 16.25, "y": 5.25}, + {"x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.25, "y": 0}, + {"x": 16.25, "y": 0}, + {"x": 17.25, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.25, "y": 1.25}, + {"x": 16.25, "y": 1.25}, + {"x": 17.25, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + + {"x": 15.25, "y": 2.25}, + {"x": 16.25, "y": 2.25}, + {"x": 17.25, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 2.75}, + + {"x": 16.25, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.25}, + {"x": 11.25, "y": 5.25, "w": 1.25}, + {"x": 12.5, "y": 5.25, "w": 1.25}, + {"x": 13.75, "y": 5.25, "w": 1.25}, + + {"x": 15.25, "y": 5.25}, + {"x": 16.25, "y": 5.25}, + {"x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_jis": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + {"x": 14, "y": 0}, + {"x": 15.25, "y": 0}, + {"x": 16.25, "y": 0}, + {"x": 17.25, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25}, + {"x": 14, "y": 1.25}, + {"x": 15.25, "y": 1.25}, + {"x": 16.25, "y": 1.25}, + {"x": 17.25, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 15.25, "y": 2.25}, + {"x": 16.25, "y": 2.25}, + {"x": 17.25, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"x": 0, "y": 4.25, "w": 2.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25}, + {"x": 13.25, "y": 4.25, "w": 1.75}, + + {"x": 16.25, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.5}, + {"x": 1.5, "y": 5.25}, + {"x": 2.5, "y": 5.25, "w": 1.5}, + {"x": 4, "y": 5.25}, + {"x": 5, "y": 5.25}, + {"x": 6, "y": 5.25, "w": 3}, + {"x": 9, "y": 5.25}, + {"x": 10, "y": 5.25}, + {"x": 11, "y": 5.25, "w": 1.5}, + {"x": 12.5, "y": 5.25}, + {"x": 13.5, "y": 5.25, "w": 1.5}, + + {"x": 15.25, "y": 5.25}, + {"x": 16.25, "y": 5.25}, + {"x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x": 0, "y": 0.5}, + + {"x": 1.25, "y": 0.5}, + {"x": 2.25, "y": 0.5}, + {"x": 3.25, "y": 0.5}, + {"x": 4.25, "y": 0.5}, + + {"x": 5.5, "y": 0.5}, + {"x": 6.5, "y": 0.5}, + {"x": 7.5, "y": 0.5}, + {"x": 8.5, "y": 0.5}, + + {"x": 9.75, "y": 0.5}, + {"x": 10.75, "y": 0.5}, + {"x": 11.75, "y": 0.5}, + {"x": 12.75, "y": 0.5}, + + {"x": 14, "y": 0.5}, + + {"x": 15.25, "y": 0.5}, + {"x": 16.25, "y": 0.5}, + {"x": 17.25, "y": 0.5}, + + {"x": 0, "y": 1.75}, + {"x": 1, "y": 1.75}, + {"x": 2, "y": 1.75}, + {"x": 3, "y": 1.75}, + {"x": 4, "y": 1.75}, + {"x": 5, "y": 1.75}, + {"x": 6, "y": 1.75}, + {"x": 7, "y": 1.75}, + {"x": 8, "y": 1.75}, + {"x": 9, "y": 1.75}, + {"x": 10, "y": 1.75}, + {"x": 11, "y": 1.75}, + {"x": 12, "y": 1.75}, + {"x": 13, "y": 1.75}, + {"x": 14, "y": 1.75}, + + {"x": 15.25, "y": 1.75}, + {"x": 16.25, "y": 1.75}, + {"x": 17.25, "y": 1.75}, + + {"x": 0, "y": 2.75, "w": 1.5}, + {"x": 1.5, "y": 2.75}, + {"x": 2.5, "y": 2.75}, + {"x": 3.5, "y": 2.75}, + {"x": 4.5, "y": 2.75}, + {"x": 5.5, "y": 2.75}, + {"x": 6.5, "y": 2.75}, + {"x": 7.5, "y": 2.75}, + {"x": 8.5, "y": 2.75}, + {"x": 9.5, "y": 2.75}, + {"x": 10.5, "y": 2.75}, + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.75}, + {"x": 13.5, "y": 2.75, "w": 1.5}, + + {"x": 15.25, "y": 2.75}, + {"x": 16.25, "y": 2.75}, + {"x": 17.25, "y": 2.75}, + + {"x": 0, "y": 3.75, "w": 1.75}, + {"x": 1.75, "y": 3.75}, + {"x": 2.75, "y": 3.75}, + {"x": 3.75, "y": 3.75}, + {"x": 4.75, "y": 3.75}, + {"x": 5.75, "y": 3.75}, + {"x": 6.75, "y": 3.75}, + {"x": 7.75, "y": 3.75}, + {"x": 8.75, "y": 3.75}, + {"x": 9.75, "y": 3.75}, + {"x": 10.75, "y": 3.75}, + {"x": 11.75, "y": 3.75}, + {"x": 12.75, "y": 3.75, "w": 2.25}, + + {"x": 0, "y": 4.75, "w": 1.25}, + {"x": 1.25, "y": 4.75}, + {"x": 2.25, "y": 4.75}, + {"x": 3.25, "y": 4.75}, + {"x": 4.25, "y": 4.75}, + {"x": 5.25, "y": 4.75}, + {"x": 6.25, "y": 4.75}, + {"x": 7.25, "y": 4.75}, + {"x": 8.25, "y": 4.75}, + {"x": 9.25, "y": 4.75}, + {"x": 10.25, "y": 4.75}, + {"x": 11.25, "y": 4.75}, + {"x": 12.25, "y": 4.75, "w": 1.75}, + {"x": 14, "y": 4.75}, + + {"x": 16.25, "y": 4.75}, + + {"x": 0, "y": 5.75, "w": 1.25}, + {"x": 1.25, "y": 5.75, "w": 1.25}, + {"x": 2.5, "y": 5.75, "w": 1.25}, + {"x": 3.75, "y": 5.75}, + {"x": 4.75, "y": 5.75, "w": 1.5}, + {"x": 6.25, "y": 5.75}, + {"x": 7.25, "y": 5.75, "w": 2.75}, + {"x": 10, "y": 5.75, "w": 1.25}, + {"x": 11.25, "y": 5.75, "w": 1.25}, + {"x": 12.5, "y": 5.75, "w": 1.25}, + {"x": 13.75, "y": 5.75, "w": 1.25}, + + {"x": 15.25, "y": 5.75}, + {"x": 16.25, "y": 5.75}, + {"x": 17.25, "y": 5.75}, + + {"x": 18.5, "y": 0}, + {"x": 18.5, "y": 1} + ] + } + } +} diff --git a/keyboards/rmi_kb/squishytkl/keymaps/default/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/default/keymap.c new file mode 100644 index 0000000000..2a6754c4af --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} diff --git a/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md b/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md new file mode 100644 index 0000000000..b20cf74361 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md @@ -0,0 +1,3 @@ +# The default keymap for SquishyTKL + +ANSI, 6.25u bottom row diff --git a/keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c new file mode 100644 index 0000000000..0f2502dc3d --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} diff --git a/keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c new file mode 100644 index 0000000000..8e56ec5f30 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c @@ -0,0 +1,38 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_jis( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, + JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_MENU, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/config.h b/keyboards/rmi_kb/squishytkl/keymaps/via/config.h new file mode 100644 index 0000000000..884fbd4871 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/via/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 1 +// Only way to get this to compile is to reduce layer count to 1. +// Do TKL users even need more than 1 layer? +// I'd like that option though. Below also works. +// #define DYNAMIC_KEYMAP_LAYER_COUNT 2 +// #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c new file mode 100644 index 0000000000..7bd524f9d9 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c @@ -0,0 +1,65 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, + KC_VOLU, KC_VOLD + ), +}; + +keyevent_t encoder_ccw = { + .key = (keypos_t){.row = 13, .col = 0}, + .pressed = false +}; + +keyevent_t encoder_cw = { + .key = (keypos_t){.row = 13, .col = 1}, + .pressed = false +}; + +void matrix_scan_user(void) { + if (IS_PRESSED(encoder_ccw)) { + encoder_ccw.pressed = false; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + + if (IS_PRESSED(encoder_cw)) { + encoder_cw.pressed = false; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + encoder_cw.pressed = true; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } else { + encoder_ccw.pressed = true; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + return true; +} diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/squishytkl/mcuconf.h b/keyboards/rmi_kb/squishytkl/mcuconf.h new file mode 100644 index 0000000000..b14bd32f80 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/mcuconf.h @@ -0,0 +1,24 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +#include_next + +#undef STM32_PWM_USE_TIM2 +#define STM32_PWM_USE_TIM2 TRUE + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 FALSE + diff --git a/keyboards/rmi_kb/squishytkl/readme.md b/keyboards/rmi_kb/squishytkl/readme.md new file mode 100644 index 0000000000..b8311ca5a4 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/readme.md @@ -0,0 +1,18 @@ +# SquishyTKL + +![SquishyTKL](https://i.imgur.com/b04ooQ7l.png) + +A stacked acrylic o-ring gasket mounted TKL-sized keyboard with a twist! + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: STM32F103RB + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/squishytkl:via + +Flashing example for this keyboard: + + dfu-util -d 1eaf:0003 -a 2 -D path/to/rmi_kb_squishytkl_via.bin + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/squishytkl/rules.mk b/keyboards/rmi_kb/squishytkl/rules.mk new file mode 100644 index 0000000000..ae292c0a5a --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/rules.mk @@ -0,0 +1,16 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes # Enable rotary encoder fuctionality + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE \ No newline at end of file diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.c b/keyboards/rmi_kb/squishytkl/squishytkl.c new file mode 100644 index 0000000000..9a63c81364 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/squishytkl.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "squishytkl.h" diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.h b/keyboards/rmi_kb/squishytkl/squishytkl.h new file mode 100644 index 0000000000..204d497a57 --- /dev/null +++ b/keyboards/rmi_kb/squishytkl/squishytkl.h @@ -0,0 +1,127 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define ___ KC_NO + +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ + k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k4K, k4L, k4M, \ + k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k9J, k5K, k5L, k5M, \ + kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, \ + kB5, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, k6O, \ + kC5, kC6, kC7, kCD, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \ +) { \ + { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ + { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kB5, ___, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kC5, kC6, kC7, ___, ___, ___, ___, ___, kCD, ___, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ +} + +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ + k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k4K, k4L, k4M, \ + k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k5K, k5L, k5M, \ + kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, k9J, \ + kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, k6O, \ + kC5, kC6, kC7, kCD, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \ +) { \ + { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ + { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kC5, kC6, kC7, ___, ___, ___, ___, ___, kCD, ___, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ +} + +#define LAYOUT_jis( \ + k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ + k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, k4K, k4L, k4M, \ + k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k5K, k5L, k5M, \ + kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, k9J, \ + kB5, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, kBJ, k6O, \ + kC5, kC6, kC7, kC8, kC9, kCD, kCE, kCF, kCG, kCI, kCJ, k7N, k7O, k7P \ +) { \ + { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ + { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kB5, ___, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, kBJ, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kC5, kC6, kC7, kC8, kC9, ___, ___, ___, kCD, kCE, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ +} + +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k10, k11, k12, k13, k20, k21, k22, k23, k24, k3K, k3L, k3M, \ + k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, k4K, k4L, k4M, \ + k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, k9J, k5K, k5L, k5M, \ + kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, kAI, \ + kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, kBI, kBJ, k6O, \ + kC5, kC6, kC7, kC8, kC9, kCD, kCE, kCF, kCG, kCI, kCJ, k7N, k7O, k7P, \ + kD0, kD1 \ +) { \ + { k00, k01, k02, k03, k04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k10, k11, k12, k13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { k20, k21, k22, k23, k24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k3K, k3L, k3M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4K, k4L, k4M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5K, k5L, k5M, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6O, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7N, k7O, k7P }, \ + { ___, ___, ___, ___, ___, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, k8F, k8G, k8H, k8I, k8J, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, k9F, k9G, k9H, ___, k9J, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, kAF, kAG, ___, kAI, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, kBF, kBG, ___, kBI, kBJ, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, kC5, kC6, kC7, kC8, kC9, ___, ___, ___, kCD, kCE, kCF, kCG, ___, kCI, kCJ, ___, ___, ___, ___, ___, ___ }, \ + { kD0, kD1, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ +} diff --git a/keyboards/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h new file mode 100644 index 0000000000..4dd0322d70 --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/config.h @@ -0,0 +1,82 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 17 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 } +#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +//#define RGB_DI_PIN E2 +//#ifdef RGB_DI_PIN +//# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +//#endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/rmi_kb/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json new file mode 100644 index 0000000000..5f263352ac --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/info.json @@ -0,0 +1,317 @@ +{ + "keyboard_name": "TKL FF", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi", + "LAYOUT_iso": "LAYOUT_tkl_f13_iso" + }, + "community_layouts": [ + "tkl_f13_ansi", + "tkl_f13_iso" + ], + "layouts": { + "LAYOUT_tkl_f13_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25, "w":2}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":0, "y":4.25, "w":2.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":2.75}, + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.25}, + {"x":1.25, "y":5.25, "w":1.25}, + {"x":2.5, "y":5.25, "w":1.25}, + {"x":3.75, "y":5.25, "w":6.25}, + {"x":10, "y":5.25, "w":1.25}, + {"x":11.25, "y":5.25, "w":1.25}, + {"x":12.5, "y":5.25, "w":1.25}, + {"x":13.75, "y":5.25, "w":1.25}, + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + }, + "LAYOUT_tkl_f13_iso": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25, "w":2}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25}, + {"x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":2.75}, + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.25}, + {"x":1.25, "y":5.25, "w":1.25}, + {"x":2.5, "y":5.25, "w":1.25}, + {"x":3.75, "y":5.25, "w":6.25}, + {"x":10, "y":5.25, "w":1.25}, + {"x":11.25, "y":5.25, "w":1.25}, + {"x":12.5, "y":5.25, "w":1.25}, + {"x":13.75, "y":5.25, "w":1.25}, + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.75}, + {"x":14, "y":4.25}, + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.25}, + {"x":1.25, "y":5.25, "w":1.25}, + {"x":2.5, "y":5.25, "w":1.25}, + {"x":3.75, "y":5.25, "w":6.25}, + {"x":10, "y":5.25, "w":1.25}, + {"x":11.25, "y":5.25, "w":1.25}, + {"x":12.5, "y":5.25, "w":1.25}, + {"x":13.75, "y":5.25, "w":1.25}, + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c b/keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c new file mode 100644 index 0000000000..d49d9d0b77 --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c @@ -0,0 +1,66 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_f13_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; + +#ifdef RGBLIGHT_ENABLE +const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_OFF}, + {1, 1, HSV_OFF} +); + +const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 1, HSV_OFF} +); + +const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_OFF} +); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl); + +void keyboard_post_init_kb(void) { + rgblight_layers = rgb_layers; + + keyboard_post_init_user(); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock; + for (uint8_t i=0; i<3; i++) { + rgblight_set_layer_state(i, false); + } + if (lock_bits < 3) { + rgblight_set_layer_state(lock_bits, true); + } + } + + return res; +} +#endif diff --git a/keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c b/keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c new file mode 100644 index 0000000000..90319d52e6 --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c @@ -0,0 +1,66 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_f13_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; + +#ifdef RGBLIGHT_ENABLE +const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_OFF}, + {1, 1, HSV_OFF} +); + +const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 1, HSV_OFF} +); + +const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_OFF} +); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl); + +void keyboard_post_init_kb(void) { + rgblight_layers = rgb_layers; + + keyboard_post_init_user(); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock; + for (uint8_t i=0; i<3; i++) { + rgblight_set_layer_state(i, false); + } + if (lock_bits < 3) { + rgblight_set_layer_state(lock_bits, true); + } + } + + return res; +} +#endif diff --git a/keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c b/keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c new file mode 100644 index 0000000000..c7e5cd786a --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c @@ -0,0 +1,90 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef RGBLIGHT_ENABLE +const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_OFF}, + {1, 1, HSV_OFF} +); + +const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 1, HSV_OFF} +); + +const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_OFF} +); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(ll_none, ll_cl, ll_sl); + +void keyboard_post_init_kb(void) { + rgblight_layers = rgb_layers; + + keyboard_post_init_user(); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + uint8_t lock_bits = led_state.scroll_lock << 1 | led_state.caps_lock; + for (uint8_t i=0; i<3; i++) { + rgblight_set_layer_state(i, false); + } + if (lock_bits < 3) { + rgblight_set_layer_state(lock_bits, true); + } + } + + return res; +} +#endif diff --git a/keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk b/keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/tkl_ff/readme.md b/keyboards/rmi_kb/tkl_ff/readme.md new file mode 100644 index 0000000000..3debe619a3 --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/readme.md @@ -0,0 +1,20 @@ +# TKL-FF + +![TKL-FF](https://i.imgur.com/GJCo3F5l.png) + +A TKL PCB made for the Geonworks Frog keyboard that supports both F12 and F13. V2 simply adds RGB indicator LEDs. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/tkl_ff:default + +To get to the bootloader, simply press the reset button located at the back of the PCB. You can then flash new firmware onto it. + +Flashing example for this keyboard: + + make rmi_kb/tkl_ff:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/tkl_ff/rules.mk b/keyboards/rmi_kb/tkl_ff/rules.mk new file mode 100644 index 0000000000..6e2fbcde2e --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/rules.mk @@ -0,0 +1,14 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = rmi_kb/tkl_ff/v1 diff --git a/keyboards/rmi_kb/tkl_ff/tkl_ff.c b/keyboards/rmi_kb/tkl_ff/tkl_ff.c new file mode 100644 index 0000000000..4a4b7c204a --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/tkl_ff.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "tkl_ff.h" diff --git a/keyboards/rmi_kb/tkl_ff/tkl_ff.h b/keyboards/rmi_kb/tkl_ff/tkl_ff.h new file mode 100644 index 0000000000..cdc4ab60cb --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/tkl_ff.h @@ -0,0 +1,93 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define ___ KC_NO + +// ANSI layout +// Full backspace +// Full right shift +// Full left shift +// 6.25u bottom row +#define LAYOUT_tkl_f13_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ + k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4f, \ + k50, k51, k52, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5g \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \ + { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \ + { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \ +} + +// ISO layout +// Full backspace +// Full right shift +// Split left shift +// 6.25u bottom row +#define LAYOUT_tkl_f13_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4f, \ + k50, k51, k52, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5g \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \ + { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \ +} + +// Layout for VIA +// Split backspace +// Split left shift +// Split right shift +// 6.25u bottom row +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4f, \ + k50, k51, k52, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5g \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \ + { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g } \ +} diff --git a/keyboards/rmi_kb/tkl_ff/v1/info.json b/keyboards/rmi_kb/tkl_ff/v1/info.json new file mode 100644 index 0000000000..3370446f2d --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x00FF" + } +} diff --git a/keyboards/rmi_kb/tkl_ff/v1/rules.mk b/keyboards/rmi_kb/tkl_ff/v1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h new file mode 100644 index 0000000000..eb60e5c311 --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/v2/config.h @@ -0,0 +1,45 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#pragma once + + +#define RGBLIGHT_LAYERS +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF + +#define RGB_DI_PIN E2 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 26 +# define RGBLIGHT_HUE_STEP 32 +# define RGBLIGHT_SAT_STEP 32 +# define RGBLIGHT_VAL_STEP 32 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//# define RGBLIGHT_EFFECT_SNAKE +//# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json new file mode 100644 index 0000000000..ed70ec408c --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x10FF" + } +} diff --git a/keyboards/rmi_kb/tkl_ff/v2/rules.mk b/keyboards/rmi_kb/tkl_ff/v2/rules.mk new file mode 100644 index 0000000000..84ef473c02 --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/v2/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/rmi_kb/tkl_ff/v2/v2.c b/keyboards/rmi_kb/tkl_ff/v2/v2.c new file mode 100644 index 0000000000..de5f32e3ca --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/v2/v2.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v2.h" diff --git a/keyboards/rmi_kb/tkl_ff/v2/v2.h b/keyboards/rmi_kb/tkl_ff/v2/v2.h new file mode 100644 index 0000000000..7c4566defb --- /dev/null +++ b/keyboards/rmi_kb/tkl_ff/v2/v2.h @@ -0,0 +1,18 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#pragma once + +#include "quantum.h" diff --git a/keyboards/rmi_kb/wete/readme.md b/keyboards/rmi_kb/wete/readme.md new file mode 100644 index 0000000000..5a117c4875 --- /dev/null +++ b/keyboards/rmi_kb/wete/readme.md @@ -0,0 +1,14 @@ +# Wete and Wete R2 + +Southpaw numpad 75% boards. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: STM32F072 (R1) and ATmega32u4 (R2) + +Make example for these keyboards (after setting up your build environment): + + make rmi_kb/wete/v1:default + + make rmi_kb/wete/v2:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/wete/rules.mk b/keyboards/rmi_kb/wete/rules.mk new file mode 100644 index 0000000000..cda6fbfbe4 --- /dev/null +++ b/keyboards/rmi_kb/wete/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = rmi_kb/wete/v2 diff --git a/keyboards/rmi_kb/wete/v1/chconf.h b/keyboards/rmi_kb/wete/v1/chconf.h new file mode 100644 index 0000000000..18befdb8e1 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/chconf.h @@ -0,0 +1,31 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_FREQUENCY 10000 + +#define CH_CFG_OPTIMIZE_SPEED FALSE + +#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + +#include_next + diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h new file mode 100644 index 0000000000..732848465e --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/config.h @@ -0,0 +1,72 @@ +/* +Copyright 2015 Jun Wako + +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 2 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 . +*/ + +#pragma once + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 20 + +#define MATRIX_COL_PINS { B13, B14, B15, A8, B0, A7, A5, A4, A3, B9, C13, C14, C15, F0, F1, A0, A1, A2, B8, B7 } +#define MATRIX_ROW_PINS { A9, B12, B11, B10, B2, B1 } +#define DIODE_DIRECTION COL2ROW + +//LEDS A6 +#define BACKLIGHT_PIN A6 +#define BACKLIGHT_PWM_DRIVER PWMD3 +#define BACKLIGHT_PWM_CHANNEL 1 +#define BACKLIGHT_PAL_MODE 1 +#define BACKLIGHT_LEVELS 24 +#define BACKLIGHT_BREATHING +#define BREATHING_PERIOD 6 + +// RGB B4 +#define RGB_DI_PIN B4 +#define RGBLED_NUM 24 +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE + +#define SLEEP_LED_GPT_DRIVER GPTD1 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/rmi_kb/wete/v1/halconf.h b/keyboards/rmi_kb/wete/v1/halconf.h new file mode 100644 index 0000000000..b3de873be1 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/halconf.h @@ -0,0 +1,29 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#define HAL_USE_GPT TRUE + +#include_next + diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json new file mode 100644 index 0000000000..f36f7cefa7 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/info.json @@ -0,0 +1,45 @@ +{ + "keyboard_name": "Wete", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x00B5", + "device_version": "0.1.2" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_ansi_rhnp": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_ansi_lhnp": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25, "h":2}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25, "h":2}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25, "w":2}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_ansi_macro": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_iso_rhnp": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_iso_lhnp": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25, "h":2}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25, "h":2}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25, "w":2}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_iso_macro": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_jis_rhnp": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25, "w":1.75}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_jis_lhnp": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25, "h":2}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25, "h":2}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25, "w":1.75}, {"x":19.25, "y":4.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25, "w":2}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_jis_macro": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":18, "y":2.25, "w":1.25, "h":2}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25, "w":1.75}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + }, + "LAYOUT_all": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":18.25, "y":1.25}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":4.25, "y":4.25, "w":1.25}, {"x":5.5, "y":4.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4.25, "y":5.25, "w":1.5}, {"x":5.75, "y":5.25}, {"x":6.75, "y":5.25, "w":1.5}, {"x":8.25, "y":5.25}, {"x":9.25, "y":5.25, "w":3}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}] + } + } +} diff --git a/keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c new file mode 100644 index 0000000000..73f3811e76 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi_rhnp( + KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_PGUP, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT_ansi_rhnp( + KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_UP, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_ON + ) +}; diff --git a/keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c new file mode 100644 index 0000000000..afaf6bfe9e --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c @@ -0,0 +1,37 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso_rhnp( + KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENTER, KC_END, + KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_PGUP, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT_iso_rhnp( + KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_UP, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_ON + ) +}; diff --git a/keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c new file mode 100644 index 0000000000..11db8e7da9 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c @@ -0,0 +1,39 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_jis_rhnp( + KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_HOME, + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_ENTER, KC_END, + KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_PGUP, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_PGDN, + KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ), + [1] = LAYOUT_jis_rhnp( + KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_UP, BL_ON + ) +}; diff --git a/keyboards/rmi_kb/wete/v1/keymaps/via/config.h b/keyboards/rmi_kb/wete/v1/keymaps/via/config.h new file mode 100644 index 0000000000..c74a6d2923 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/keymaps/via/config.h @@ -0,0 +1,18 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ +#pragma once + +#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 diff --git a/keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c new file mode 100644 index 0000000000..b9acb6cace --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +/* +Copyright 2012,2013 Jun Wako + +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 2 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi_rhnp( + KC_INSERT, KC_PSCR, KC_PAUSE, KC_SCRL, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_KP_4, KC_KP_5, KC_KP_6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_PGUP, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_KP_0, KC_KP_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT_ansi_rhnp( + KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_UP, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, BL_OFF, BL_DOWN,BL_ON + ), + [2] = LAYOUT_ansi_rhnp( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO + ), + [3] = LAYOUT_ansi_rhnp( + KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO + ) +}; diff --git a/keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk b/keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk new file mode 100644 index 0000000000..666e72557b --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite diff --git a/keyboards/rmi_kb/wete/v1/mcuconf.h b/keyboards/rmi_kb/wete/v1/mcuconf.h new file mode 100644 index 0000000000..7a2e877763 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/mcuconf.h @@ -0,0 +1,39 @@ +/* Copyright 2020 QMK + * + * 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 2 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_RTCSEL +#define STM32_RTCSEL STM32_RTCSEL_NOCLOCK + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE + +#undef STM32_GPT_USE_TIM1 +#define STM32_GPT_USE_TIM1 TRUE diff --git a/keyboards/rmi_kb/wete/v1/readme.md b/keyboards/rmi_kb/wete/v1/readme.md new file mode 100644 index 0000000000..f1835894ac --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/readme.md @@ -0,0 +1,14 @@ +# Wete + +![Wete Keyboard](https://i.imgur.com/dZ4FRar.jpg) + +A southpaw full-sized keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: STM32F072CBT6 + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/wete/v1:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/rmi_kb/wete/v1/rules.mk b/keyboards/rmi_kb/wete/v1/rules.mk new file mode 100644 index 0000000000..e81a5dd98e --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/rules.mk @@ -0,0 +1,16 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +SLEEP_LED_ENABLE = yes + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/rmi_kb/wete/v1/v1.c b/keyboards/rmi_kb/wete/v1/v1.c new file mode 100644 index 0000000000..71002461a1 --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/v1.c @@ -0,0 +1,35 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v1.h" + +void keyboard_pre_init_user(void) { + // Initialize indicator LED pins + setPinOutput(A14); // Num Lock + setPinOutput(A15); // Scroll Lock + setPinOutput(B3); // Caps Lock +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + writePin(A14, !led_state.num_lock); + writePin(A15, !led_state.scroll_lock); + writePin(B3, !led_state.caps_lock); + } + + return res; +} diff --git a/keyboards/rmi_kb/wete/v1/v1.h b/keyboards/rmi_kb/wete/v1/v1.h new file mode 100644 index 0000000000..55bb035b8b --- /dev/null +++ b/keyboards/rmi_kb/wete/v1/v1.h @@ -0,0 +1,238 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +//////////////////////////////// ANSI //////////////////////////////// +// ANSI layout +// 2u backspace +// Right handed numpad +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 2 keys to the right of space +#define LAYOUT_ansi_rhnp( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, XXX, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ +} + +// ANSI layout +// 2u backspace +// Left handed numpad +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 2 keys to the right of space +#define LAYOUT_ansi_lhnp( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k51, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { XXX, k51, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ +} + +// ANSI layout +// 2u backspace +// Numpad area is all 1u keys +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 2 keys to the right of space +#define LAYOUT_ansi_macro( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k51, k52, k53, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, k51, k52, k53, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ +} + + +//////////////////////////////// ISO //////////////////////////////// +// ISO layout +// Extra 1u next to Left Shift +// 2u Backspace +// Right handed numpad +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 2 keys to the right of space +#define LAYOUT_iso_rhnp( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, XXX, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ +} + +// ISO layout +// Extra 1u next to Left Shift +// 2u backspace +// Left handed numpad +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 2 keys to the right of space +#define LAYOUT_iso_lhnp( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k51, k52, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { XXX, k51, k52, XXX, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ +} + +// ISO layout +// Extra 1u next to Left Shift +// 2u backspace +// Numpad area is all 1u keys +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 2 keys to the right of space +#define LAYOUT_iso_macro( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k51, k52, k53, k54, k55, k56, k5a, k5d, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, k51, k52, k53, k54, k55, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, XXX, k5f, XXX, k5h, k5i, k5j } \ +} + +//////////////////////////////// JIS //////////////////////////////// +// JIS layout +// Split backspace +// Right handed numpad +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 3 keys to the right of space +#define LAYOUT_jis_rhnp( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k52, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, XXX, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ +} + +// JIS layout +// Split backspace +// Left handed numpad +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 3 keys to the right of space +#define LAYOUT_jis_lhnp( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k51, k52, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { XXX, k51, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ +} + +// JIS layout +// Split backspace +// Numpad area is all 1u keys +// 1.25-1.25-1.25 or 1.5-1-1.5 bottom row +// 3 keys to the right of space +#define LAYOUT_jis_macro( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k51, k52, k53, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ +} + +//////////////////////////////// EXPOSED //////////////////////////////// +// All keys are exposed +// Numpad area is 1u keys +// Extra 1u next to Left Shift +// JIS-style bottom row +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k0a, k0b, k0c, k0d, k0f, k0g, k0h, k0i, k0j, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2i, k2j, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3i, k3j, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, k4h, k4i, k4j, \ + k50, k51, k52, k53, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \ +} diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h new file mode 100644 index 0000000000..e719e4f835 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/config.h @@ -0,0 +1,102 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + + +/* key matrix size */ +#define MATRIX_ROWS 13 +#define MATRIX_COLS 10 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B3, B2, B6, C6, C7, E6, F7, F6, F5, F4, F1, F0, NO_PIN } +#define MATRIX_COL_PINS { B1, B0, B7, B5, B4, D7, D6, D4, D5, D3 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Encoder pins */ +#define ENCODERS_PAD_A { D2 } +#define ENCODERS_PAD_B { D1 } + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +#define RGBLIGHT_LAYERS +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF + +#define RGB_DI_PIN D0 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 18 +# define RGBLIGHT_HUE_STEP 32 +# define RGBLIGHT_SAT_STEP 32 +# define RGBLIGHT_VAL_STEP 32 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//# define RGBLIGHT_EFFECT_SNAKE +//# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +// QoL improvements +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json new file mode 100644 index 0000000000..d1aa783336 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/info.json @@ -0,0 +1,358 @@ +{ + "keyboard_name": "Wete R2", + "manufacturer": "RMI-KB", + "url": "", + "maintainer": "ramonimbao", + "usb": { + "vid": "0xB16B", + "pid": "0x00B3", + "device_version": "35.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4.25, "y":0}, + {"x":5.75, "y":0}, + {"x":6.75, "y":0}, + {"x":7.75, "y":0}, + {"x":8.75, "y":0}, + {"x":10.25, "y":0}, + {"x":11.25, "y":0}, + {"x":12.25, "y":0}, + {"x":13.25, "y":0}, + {"x":14.75, "y":0}, + {"x":15.75, "y":0}, + {"x":16.75, "y":0}, + {"x":17.75, "y":0}, + {"x":19.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4.25, "y":1.25}, + {"x":5.25, "y":1.25}, + {"x":6.25, "y":1.25}, + {"x":7.25, "y":1.25}, + {"x":8.25, "y":1.25}, + {"x":9.25, "y":1.25}, + {"x":10.25, "y":1.25}, + {"x":11.25, "y":1.25}, + {"x":12.25, "y":1.25}, + {"x":13.25, "y":1.25}, + {"x":14.25, "y":1.25}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25, "w":2}, + {"x":19.25, "y":1.25}, + + {"x":0, "y":2.25}, + {"x":1, "y":2.25}, + {"x":2, "y":2.25}, + {"x":3, "y":2.25, "h":2}, + {"x":4.25, "y":2.25, "w":1.5}, + {"x":5.75, "y":2.25}, + {"x":6.75, "y":2.25}, + {"x":7.75, "y":2.25}, + {"x":8.75, "y":2.25}, + {"x":9.75, "y":2.25}, + {"x":10.75, "y":2.25}, + {"x":11.75, "y":2.25}, + {"x":12.75, "y":2.25}, + {"x":13.75, "y":2.25}, + {"x":14.75, "y":2.25}, + {"x":15.75, "y":2.25}, + {"x":16.75, "y":2.25}, + {"x":17.75, "y":2.25, "w":1.5}, + {"x":19.25, "y":2.25}, + + {"x":0, "y":3.25}, + {"x":1, "y":3.25}, + {"x":2, "y":3.25}, + {"x":4.25, "y":3.25, "w":1.75}, + {"x":6, "y":3.25}, + {"x":7, "y":3.25}, + {"x":8, "y":3.25}, + {"x":9, "y":3.25}, + {"x":10, "y":3.25}, + {"x":11, "y":3.25}, + {"x":12, "y":3.25}, + {"x":13, "y":3.25}, + {"x":14, "y":3.25}, + {"x":15, "y":3.25}, + {"x":16, "y":3.25}, + {"x":17, "y":3.25, "w":2.25}, + {"x":19.25, "y":3.25}, + + {"x":0, "y":4.25}, + {"x":1, "y":4.25}, + {"x":2, "y":4.25}, + {"x":3, "y":4.25, "h":2}, + {"x":4.25, "y":4.25, "w":2.25}, + {"x":6.5, "y":4.25}, + {"x":7.5, "y":4.25}, + {"x":8.5, "y":4.25}, + {"x":9.5, "y":4.25}, + {"x":10.5, "y":4.25}, + {"x":11.5, "y":4.25}, + {"x":12.5, "y":4.25}, + {"x":13.5, "y":4.25}, + {"x":14.5, "y":4.25}, + {"x":15.5, "y":4.25}, + {"x":16.5, "y":4.25, "w":1.75}, + {"x":18.25, "y":4.25}, + {"x":19.25, "y":4.25}, + + {"x":0, "y":5.25, "w":2}, + {"x":2, "y":5.25}, + {"x":4.25, "y":5.25, "w":1.25}, + {"x":5.5, "y":5.25, "w":1.25}, + {"x":6.75, "y":5.25, "w":1.25}, + {"x":8, "y":5.25, "w":6.25}, + {"x":14.25, "y":5.25, "w":1.25}, + {"x":15.5, "y":5.25, "w":1.25}, + {"x":17.25, "y":5.25}, + {"x":18.25, "y":5.25}, + {"x":19.25, "y":5.25} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4.25, "y":0}, + {"x":5.75, "y":0}, + {"x":6.75, "y":0}, + {"x":7.75, "y":0}, + {"x":8.75, "y":0}, + {"x":10.25, "y":0}, + {"x":11.25, "y":0}, + {"x":12.25, "y":0}, + {"x":13.25, "y":0}, + {"x":14.75, "y":0}, + {"x":15.75, "y":0}, + {"x":16.75, "y":0}, + {"x":17.75, "y":0}, + {"x":19.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4.25, "y":1.25}, + {"x":5.25, "y":1.25}, + {"x":6.25, "y":1.25}, + {"x":7.25, "y":1.25}, + {"x":8.25, "y":1.25}, + {"x":9.25, "y":1.25}, + {"x":10.25, "y":1.25}, + {"x":11.25, "y":1.25}, + {"x":12.25, "y":1.25}, + {"x":13.25, "y":1.25}, + {"x":14.25, "y":1.25}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25, "w":2}, + {"x":19.25, "y":1.25}, + + {"x":0, "y":2.25}, + {"x":1, "y":2.25}, + {"x":2, "y":2.25}, + {"x":3, "y":2.25, "h":2}, + {"x":4.25, "y":2.25, "w":1.5}, + {"x":5.75, "y":2.25}, + {"x":6.75, "y":2.25}, + {"x":7.75, "y":2.25}, + {"x":8.75, "y":2.25}, + {"x":9.75, "y":2.25}, + {"x":10.75, "y":2.25}, + {"x":11.75, "y":2.25}, + {"x":12.75, "y":2.25}, + {"x":13.75, "y":2.25}, + {"x":14.75, "y":2.25}, + {"x":15.75, "y":2.25}, + {"x":16.75, "y":2.25}, + {"x":19.25, "y":2.25}, + + {"x":0, "y":3.25}, + {"x":1, "y":3.25}, + {"x":2, "y":3.25}, + {"x":4.25, "y":3.25, "w":1.75}, + {"x":6, "y":3.25}, + {"x":7, "y":3.25}, + {"x":8, "y":3.25}, + {"x":9, "y":3.25}, + {"x":10, "y":3.25}, + {"x":11, "y":3.25}, + {"x":12, "y":3.25}, + {"x":13, "y":3.25}, + {"x":14, "y":3.25}, + {"x":15, "y":3.25}, + {"x":16, "y":3.25}, + {"x":17, "y":3.25}, + {"x":18, "y":2.25, "w":1.25, "h":2}, + {"x":19.25, "y":3.25}, + + {"x":0, "y":4.25}, + {"x":1, "y":4.25}, + {"x":2, "y":4.25}, + {"x":3, "y":4.25, "h":2}, + {"x":4.25, "y":4.25, "w":1.25}, + {"x":5.5, "y":4.25}, + {"x":6.5, "y":4.25}, + {"x":7.5, "y":4.25}, + {"x":8.5, "y":4.25}, + {"x":9.5, "y":4.25}, + {"x":10.5, "y":4.25}, + {"x":11.5, "y":4.25}, + {"x":12.5, "y":4.25}, + {"x":13.5, "y":4.25}, + {"x":14.5, "y":4.25}, + {"x":15.5, "y":4.25}, + {"x":16.5, "y":4.25, "w":1.75}, + {"x":18.25, "y":4.25}, + {"x":19.25, "y":4.25}, + + {"x":0, "y":5.25, "w":2}, + {"x":2, "y":5.25}, + {"x":4.25, "y":5.25, "w":1.25}, + {"x":5.5, "y":5.25, "w":1.25}, + {"x":6.75, "y":5.25, "w":1.25}, + {"x":8, "y":5.25, "w":6.25}, + {"x":14.25, "y":5.25, "w":1.25}, + {"x":15.5, "y":5.25, "w":1.25}, + {"x":17.25, "y":5.25}, + {"x":18.25, "y":5.25}, + {"x":19.25, "y":5.25} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4.25, "y":0}, + {"x":5.75, "y":0}, + {"x":6.75, "y":0}, + {"x":7.75, "y":0}, + {"x":8.75, "y":0}, + {"x":10.25, "y":0}, + {"x":11.25, "y":0}, + {"x":12.25, "y":0}, + {"x":13.25, "y":0}, + {"x":14.75, "y":0}, + {"x":15.75, "y":0}, + {"x":16.75, "y":0}, + {"x":17.75, "y":0}, + {"x":19.5, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4.25, "y":1.25}, + {"x":5.25, "y":1.25}, + {"x":6.25, "y":1.25}, + {"x":7.25, "y":1.25}, + {"x":8.25, "y":1.25}, + {"x":9.25, "y":1.25}, + {"x":10.25, "y":1.25}, + {"x":11.25, "y":1.25}, + {"x":12.25, "y":1.25}, + {"x":13.25, "y":1.25}, + {"x":14.25, "y":1.25}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + {"x":18.25, "y":1.25}, + {"x":19.25, "y":1.25}, + + {"x":0, "y":2.25}, + {"x":1, "y":2.25}, + {"x":2, "y":2.25}, + {"x":3, "y":2.25}, + {"x":4.25, "y":2.25, "w":1.5}, + {"x":5.75, "y":2.25}, + {"x":6.75, "y":2.25}, + {"x":7.75, "y":2.25}, + {"x":8.75, "y":2.25}, + {"x":9.75, "y":2.25}, + {"x":10.75, "y":2.25}, + {"x":11.75, "y":2.25}, + {"x":12.75, "y":2.25}, + {"x":13.75, "y":2.25}, + {"x":14.75, "y":2.25}, + {"x":15.75, "y":2.25}, + {"x":16.75, "y":2.25}, + {"x":17.75, "y":2.25, "w":1.5}, + {"x":19.25, "y":2.25}, + + {"x":0, "y":3.25}, + {"x":1, "y":3.25}, + {"x":2, "y":3.25}, + {"x":3, "y":3.25}, + {"x":4.25, "y":3.25, "w":1.75}, + {"x":6, "y":3.25}, + {"x":7, "y":3.25}, + {"x":8, "y":3.25}, + {"x":9, "y":3.25}, + {"x":10, "y":3.25}, + {"x":11, "y":3.25}, + {"x":12, "y":3.25}, + {"x":13, "y":3.25}, + {"x":14, "y":3.25}, + {"x":15, "y":3.25}, + {"x":16, "y":3.25}, + {"x":17, "y":3.25, "w":2.25}, + {"x":19.25, "y":3.25}, + + {"x":0, "y":4.25}, + {"x":1, "y":4.25}, + {"x":2, "y":4.25}, + {"x":3, "y":4.25}, + {"x":4.25, "y":4.25, "w":1.25}, + {"x":5.5, "y":4.25}, + {"x":6.5, "y":4.25}, + {"x":7.5, "y":4.25}, + {"x":8.5, "y":4.25}, + {"x":9.5, "y":4.25}, + {"x":10.5, "y":4.25}, + {"x":11.5, "y":4.25}, + {"x":12.5, "y":4.25}, + {"x":13.5, "y":4.25}, + {"x":14.5, "y":4.25}, + {"x":15.5, "y":4.25}, + {"x":16.5, "y":4.25, "w":1.75}, + {"x":18.25, "y":4.25}, + {"x":19.25, "y":4.25}, + + {"x":0, "y":5.25}, + {"x":1, "y":5.25}, + {"x":2, "y":5.25}, + {"x":3, "y":5.25}, + {"x":4.25, "y":5.25, "w":1.25}, + {"x":5.5, "y":5.25, "w":1.25}, + {"x":6.75, "y":5.25, "w":1.25}, + {"x":8, "y":5.25, "w":6.25}, + {"x":14.25, "y":5.25}, + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25}, + {"x":18.25, "y":5.25}, + {"x":19.25, "y":5.25}, + + {"x":19, "y":0, "w":0.5}, + {"x":20.5, "y":0, "w":0.5} + ] + } + } +} diff --git a/keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c new file mode 100644 index 0000000000..3916d18366 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c @@ -0,0 +1,97 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} + +#ifdef RGBLIGHT_ENABLE +// Can probably still be optimized, but I like it as is for clarity +const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( + {0,1, HSV_OFF}, + {1,1, HSV_OFF}, + {2,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_nl[] = RGBLIGHT_LAYER_SEGMENTS( + {1,1, HSV_OFF}, + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF}, + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_clnl[] = RGBLIGHT_LAYER_SEGMENTS( + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF}, + {1,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_slnl[] = RGBLIGHT_LAYER_SEGMENTS( + {1,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_slcl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF} +); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST( + ll_none, + ll_nl, + ll_cl, + ll_clnl, + ll_sl, + ll_slnl, + ll_slcl +); + +void keyboard_post_init_kb(void) { + rgblight_layers = rgb_layers; + + keyboard_post_init_user(); +} + +bool led_update_kb (led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + uint8_t lock_bits = led_state.scroll_lock << 2 | led_state.caps_lock << 1 | led_state.num_lock; + for (uint8_t i=0; i<7; i++) { + rgblight_set_layer_state(i, false); + } + if (lock_bits < 7) { + rgblight_set_layer_state(lock_bits, true); + } + } + + return res; +} +#endif diff --git a/keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c new file mode 100644 index 0000000000..12933c4b57 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c @@ -0,0 +1,97 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_iso( + KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_END, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT, KC_PGUP, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} + +#ifdef RGBLIGHT_ENABLE +// Can probably still be optimized, but I like it as is for clarity +const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( + {0,1, HSV_OFF}, + {1,1, HSV_OFF}, + {2,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_nl[] = RGBLIGHT_LAYER_SEGMENTS( + {1,1, HSV_OFF}, + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF}, + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_clnl[] = RGBLIGHT_LAYER_SEGMENTS( + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF}, + {1,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_slnl[] = RGBLIGHT_LAYER_SEGMENTS( + {1,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_slcl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF} +); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST( + ll_none, + ll_nl, + ll_cl, + ll_clnl, + ll_sl, + ll_slnl, + ll_slcl +); + +void keyboard_post_init_kb(void) { + rgblight_layers = rgb_layers; + + keyboard_post_init_user(); +} + +bool led_update_kb (led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + uint8_t lock_bits = led_state.scroll_lock << 2 | led_state.caps_lock << 1 | led_state.num_lock; + for (uint8_t i=0; i<7; i++) { + rgblight_set_layer_state(i, false); + } + if (lock_bits < 7) { + rgblight_set_layer_state(lock_bits, true); + } + } + + return res; +} +#endif diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/config.h b/keyboards/rmi_kb/wete/v2/keymaps/via/config.h new file mode 100644 index 0000000000..c7cec8a9d7 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/keymaps/via/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2021 Ramon Imbao + +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 2 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 . +*/ + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c new file mode 100644 index 0000000000..8afc6f9c25 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c @@ -0,0 +1,135 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ +#include QMK_KEYBOARD_H +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_HOME, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_P4, KC_P5, KC_P6, KC_NO, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_P1, KC_P2, KC_P3, KC_PENT, KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_P0, KC_NO, KC_PDOT, KC_NO, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, + KC_VOLD, KC_VOLU + ), + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______ + ), +}; + +keyevent_t encoder_ccw = { + .key = (keypos_t){.row = 12, .col = 0}, + .pressed = false +}; + +keyevent_t encoder_cw = { + .key = (keypos_t){.row = 12, .col = 1}, + .pressed = false +}; + +void matrix_scan_user(void) { + if (IS_PRESSED(encoder_ccw)) { + encoder_ccw.pressed = false; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + + if (IS_PRESSED(encoder_cw)) { + encoder_cw.pressed = false; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + encoder_cw.pressed = true; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } else { + encoder_ccw.pressed = true; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + return true; +} + +#ifdef RGBLIGHT_ENABLE +// Can probably still be optimized, but I like it as is for clarity +const rgblight_segment_t PROGMEM ll_none[] = RGBLIGHT_LAYER_SEGMENTS( + {0,1, HSV_OFF}, + {1,1, HSV_OFF}, + {2,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_nl[] = RGBLIGHT_LAYER_SEGMENTS( + {1,1, HSV_OFF}, + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_cl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF}, + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_clnl[] = RGBLIGHT_LAYER_SEGMENTS( + {0,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_sl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF}, + {1,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_slnl[] = RGBLIGHT_LAYER_SEGMENTS( + {1,1, HSV_OFF} +); +const rgblight_segment_t PROGMEM ll_slcl[] = RGBLIGHT_LAYER_SEGMENTS( + {2,1, HSV_OFF} +); + +const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST( + ll_none, + ll_nl, + ll_cl, + ll_clnl, + ll_sl, + ll_slnl, + ll_slcl +); + +void keyboard_post_init_kb(void) { + rgblight_layers = rgb_layers; + + keyboard_post_init_user(); +} + +bool led_update_kb (led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + uint8_t lock_bits = led_state.scroll_lock << 2 | led_state.caps_lock << 1 | led_state.num_lock; + for (uint8_t i=0; i<7; i++) { + rgblight_set_layer_state(i, false); + } + if (lock_bits < 7) { + rgblight_set_layer_state(lock_bits, true); + } + } + + return res; +} +#endif diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/wete/v2/readme.md b/keyboards/rmi_kb/wete/v2/readme.md new file mode 100644 index 0000000000..5867c5ea7e --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/readme.md @@ -0,0 +1,26 @@ +# Wete R2 + +![Wete R2](https://i.imgur.com/WKFe7T8l.png) + +Round two of the Wete keyboard. Now uses the ATmega32u4, adds an encoder, and switches the indicator LEDs to RGB. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/wete/v2:default + +Flashing example for this keyboard: + + make rmi_kb/wete/v2:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the upper left key and plug in the keyboard +* **Physical reset button**: Briefly press the reset button on the back of the PCB. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/rmi_kb/wete/v2/rules.mk b/keyboards/rmi_kb/wete/v2/rules.mk new file mode 100644 index 0000000000..7386bf6999 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/rules.mk @@ -0,0 +1,13 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes # Rotary encoder diff --git a/keyboards/rmi_kb/wete/v2/v2.c b/keyboards/rmi_kb/wete/v2/v2.c new file mode 100644 index 0000000000..de5f32e3ca --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/v2.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#include "v2.h" diff --git a/keyboards/rmi_kb/wete/v2/v2.h b/keyboards/rmi_kb/wete/v2/v2.h new file mode 100644 index 0000000000..75c9430c02 --- /dev/null +++ b/keyboards/rmi_kb/wete/v2/v2.h @@ -0,0 +1,110 @@ +/* Copyright 2021 Ramon Imbao + * + * 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 2 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 . + */ + +#pragma once + +#include "quantum.h" + +void adjust_leds(void); + +#define ___ KC_NO + + +// Regular numpad layout +// Full sized backspace +// Full left shift +// ANSI enter +// 1.25 | 1.25 | 1.25 | 6.25 | 1.25 | 1.25 bottom row +#define LAYOUT_ansi( \ + k00, k10, k01, k11, k02, k12, k03, k13, k04, k05, k15, k06, k16, k17, k08, k18, k09, k19, \ + k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, k39, \ + k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k49, k59, \ + k60, k70, k61, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k78, k79, \ + k80, k90, k81, k91, k82, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k98, k89, k99, \ + ka0, ka1, ka2, kb2, ka3, ka5, ka7, kb7, kb8, ka9, kb9 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \ + { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \ + { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, ___, ___ }, \ + { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \ + { k90, k91, ___, k93, k94, k95, k96, k97, k98, k99 }, \ + { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \ + { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ +} + +// Regular numpad layout +// Full sized backspace +// Split left shift +// ISO enter +// 1.25 | 1.25 | 1.25 | 6.25 | 1.25 | 1.25 bottom row +#define LAYOUT_iso( \ + k00, k10, k01, k11, k02, k12, k03, k13, k04, k05, k15, k06, k16, k17, k08, k18, k09, k19, \ + k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, k39, \ + k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k59, \ + k60, k70, k61, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k78, k49, k79, \ + k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k98, k89, k99, \ + ka0, ka1, ka2, kb2, ka3, ka5, ka7, kb7, kb8, ka9, kb9 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \ + { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \ + { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, ___, ___ }, \ + { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \ + { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \ + { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ +} + +// Macro numpad layout +// Split backspace +// Split left shift +// ANSI enter +// 1.25 | 1.25 | 1.25 | 6.25 | 1 | 1 | 1 bottom row +// Encoder keymap exposed for VIA +#define LAYOUT_all( \ + k00, k10, k01, k11, k02, k12, k03, k13, k04, k05, k15, k06, k16, k17, k08, k18, k09, k19, \ + k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38,k29, k39, \ + k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k49, k59, \ + k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k78, k79, \ + k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k98, k89, k99, \ + ka0, kb0, ka1, kb1, ka2, kb2, ka3, ka5, ka7, kb7, ka8, kb8, ka9, kb9, \ + re0, re1 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \ + { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \ + { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, ___, ___ }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \ + { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ka8, ka9 }, \ + { kb0, kb1, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \ + { re0, re1, ___, ___, ___, ___, ___, ___, ___, ___ }, \ +} -- cgit v1.3.1 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 +++ data/schemas/keyboard.jsonschema | 2 +- docs/feature_converters.md | 5 ++- docs/squeezing_avr.md | 1 + .../converters/promicro_to_michi/_pin_defs.h | 36 ++++++++++++++++++++++ .../converters/promicro_to_michi/converter.mk | 9 ++++++ 6 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 platforms/chibios/converters/promicro_to_michi/_pin_defs.h create mode 100644 platforms/chibios/converters/promicro_to_michi/converter.mk (limited to 'data') 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", diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index f1a1bb87c0..1f89bfeaa7 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -34,7 +34,7 @@ }, "development_board": { "type": "string", - "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"] + "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"] }, "pin_compatible": { "type": "string", diff --git a/docs/feature_converters.md b/docs/feature_converters.md index 0fa677f873..df42acac59 100644 --- a/docs/feature_converters.md +++ b/docs/feature_converters.md @@ -18,6 +18,7 @@ Currently the following converters are available: | `promicro` | `stemcell` | | `promicro` | `bonsai_c4` | | `promicro` | `elite_pi` | +| `promicro` | `michi` | | `elite_c` | `stemcell` | | `elite_c` | `elite_pi` | @@ -81,6 +82,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co | [STeMCell](https://github.com/megamind4089/STeMCell) | `stemcell` | | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4` | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | +| [Michi](https://github.com/ci-bus/michi-promicro-rp2040) | `michi` | Converter summary: @@ -94,6 +96,7 @@ Converter summary: | `stemcell` | `-e CONVERT_TO=stemcell` | `CONVERT_TO=stemcell` | `#ifdef CONVERT_TO_STEMCELL` | | `bonsai_c4` | `-e CONVERT_TO=bonsai_c4` | `CONVERT_TO=bonsai_c4` | `#ifdef CONVERT_TO_BONSAI_C4` | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | +| `michi` | `-e CONVERT_TO=michi` | `CONVERT_TO=michi` | `#ifdef CONVERT_TO_MICHI` | ### Proton C :id=proton_c @@ -124,7 +127,7 @@ The following defaults are based on what has been implemented for [RP2040](platf | USB Host (e.g. USB-USB converter) | Not supported (USB host code is AVR specific and is not currently supported on ARM) | | [Split keyboards](feature_split_keyboard.md) | Partial via `PIO` vendor driver - heavily dependent on enabled features | -### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO, and Elite-Pi :id=promicro_rp2040 +### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO, Elite-Pi and Michi :id=promicro_rp2040 Currently identical to [Adafruit KB2040](#kb2040). diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md index caf18002c0..60cda69c18 100644 --- a/docs/squeezing_avr.md +++ b/docs/squeezing_avr.md @@ -193,6 +193,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers: * [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) +* [Michi](https://github.com/ci-bus/michi-promicro-rp2040) There are other, non-Pro Micro compatible boards out there. The most popular being: * [WeAct Blackpill F411](https://www.aliexpress.com/item/1005001456186625.html) (~$6 USD) diff --git a/platforms/chibios/converters/promicro_to_michi/_pin_defs.h b/platforms/chibios/converters/promicro_to_michi/_pin_defs.h new file mode 100644 index 0000000000..ce331b0340 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_michi/_pin_defs.h @@ -0,0 +1,36 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// Left side (front) +#define D3 0U +#define D2 1U +// GND +// GND +#define D1 2U +#define D0 3U +#define D4 13U +#define C6 4U +#define D7 9U +#define E6 10U +#define B4 11U +#define B5 12U + +// Right side (front) +// RAW +// GND +// RESET +// VCC +#define F4 29U +#define F5 28U +#define F6 27U +#define F7 26U +#define B1 20U +#define B3 19U +#define B2 18U +#define B6 17U + +// LEDs (Mapped to unused pins to avoid collisions) +#define D5 14U +#define B0 15U diff --git a/platforms/chibios/converters/promicro_to_michi/converter.mk b/platforms/chibios/converters/promicro_to_michi/converter.mk new file mode 100644 index 0000000000..4d7178e2f7 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_michi/converter.mk @@ -0,0 +1,9 @@ +# Michi MCU settings for converting AVR projects +MCU := RP2040 +BOARD := QMK_PM2040 +BOOTLOADER := rp2040 + +# These are defaults based on what has been implemented for RP2040 boards +SERIAL_DRIVER ?= vendor +WS2812_DRIVER ?= vendor +BACKLIGHT_DRIVER ?= software -- cgit v1.3.1 From 2ffdec5dc2a5cb350998168e76d7916e2d9728fc Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 10 Feb 2023 21:08:54 +0000 Subject: Move more unicode ranges to DD (#19755) --- data/constants/keycodes/keycodes_0.0.2.hjson | 11 ++++++++++- quantum/keycodes.h | 6 ++++++ quantum/quantum_keycodes.h | 4 ---- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2.hjson b/data/constants/keycodes/keycodes_0.0.2.hjson index 0967ef424b..650235e647 100644 --- a/data/constants/keycodes/keycodes_0.0.2.hjson +++ b/data/constants/keycodes/keycodes_0.0.2.hjson @@ -1 +1,10 @@ -{} +{ + "ranges": { + "0x8000/0X3FFF": { + "define": "QK_UNICODEMAP" + }, + "0xC000/0X3FFF": { + "define": "QK_UNICODEMAP_PAIR" + } + } +} diff --git a/quantum/keycodes.h b/quantum/keycodes.h index eafa9eb1b6..96f352a2c1 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -82,6 +82,10 @@ enum qk_keycode_ranges { QK_USER_MAX = 0x7FFF, QK_UNICODE = 0x8000, QK_UNICODE_MAX = 0xFFFF, + QK_UNICODEMAP = 0x8000, + QK_UNICODEMAP_MAX = 0xBFFF, + QK_UNICODEMAP_PAIR = 0xC000, + QK_UNICODEMAP_PAIR_MAX = 0xFFFF, }; enum qk_keycode_defines { @@ -1308,6 +1312,8 @@ enum qk_keycode_defines { #define IS_QK_KB(code) ((code) >= QK_KB && (code) <= QK_KB_MAX) #define IS_QK_USER(code) ((code) >= QK_USER && (code) <= QK_USER_MAX) #define IS_QK_UNICODE(code) ((code) >= QK_UNICODE && (code) <= QK_UNICODE_MAX) +#define IS_QK_UNICODEMAP(code) ((code) >= QK_UNICODEMAP && (code) <= QK_UNICODEMAP_MAX) +#define IS_QK_UNICODEMAP_PAIR(code) ((code) >= QK_UNICODEMAP_PAIR && (code) <= QK_UNICODEMAP_PAIR_MAX) // Group Helpers #define IS_INTERNAL_KEYCODE(code) ((code) >= KC_NO && (code) <= KC_TRANSPARENT) diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 688fb892eb..9933d5c989 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -33,10 +33,6 @@ #define QK_RSFT 0x1200 #define QK_RALT 0x1400 #define QK_RGUI 0x1800 -#define QK_UNICODEMAP 0x8000 -#define QK_UNICODEMAP_MAX 0xBFFF -#define QK_UNICODEMAP_PAIR 0xC000 -#define QK_UNICODEMAP_PAIR_MAX 0xFFFF // clang-format on // Generic decoding for the whole QK_MODS range -- cgit v1.3.1 From 99918945149f98cf73f9365b0ad49a2fc07d1152 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 11 Feb 2023 13:45:51 +1100 Subject: Generate encodermap output from keymap.json. (#18915) Co-authored-by: Joel Challis --- data/schemas/keymap.jsonschema | 14 ++++ lib/python/qmk/keymap.py | 181 ++++++++++++++++++++++++----------------- 2 files changed, 121 insertions(+), 74 deletions(-) (limited to 'data') diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema index 2fcd5f8a51..73aa7c5c22 100644 --- a/data/schemas/keymap.jsonschema +++ b/data/schemas/keymap.jsonschema @@ -21,6 +21,20 @@ "items": {"type": "string"} } }, + "encoders": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "object", + "required": ["ccw", "cw"], + "properties": { + "ccw": {"type": "string"}, + "cw": {"type": "string"} + } + } + } + }, "macros": { "type": "array", "items": { diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py index ce518e379d..dddf6449a7 100644 --- a/lib/python/qmk/keymap.py +++ b/lib/python/qmk/keymap.py @@ -30,9 +30,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { __KEYMAP_GOES_HERE__ }; +#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +__ENCODER_MAP_GOES_HERE__ +}; +#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) + +__MACRO_OUTPUT_GOES_HERE__ + """ +def _generate_keymap_table(keymap_json): + lines = [] + for layer_num, layer in enumerate(keymap_json['layers']): + if layer_num != 0: + lines[-1] = lines[-1] + ',' + layer = map(_strip_any, layer) + layer_keys = ', '.join(layer) + lines.append('\t[%s] = %s(%s)' % (layer_num, keymap_json['layout'], layer_keys)) + return lines + + +def _generate_encodermap_table(keymap_json): + lines = [] + for layer_num, layer in enumerate(keymap_json['encoders']): + if layer_num != 0: + lines[-1] = lines[-1] + ',' + encoder_keycode_txt = ', '.join([f'ENCODER_CCW_CW({_strip_any(e["ccw"])}, {_strip_any(e["cw"])})' for e in layer]) + lines.append('\t[%s] = {%s}' % (layer_num, encoder_keycode_txt)) + return lines + + +def _generate_macros_function(keymap_json): + macro_txt = [ + 'bool process_record_user(uint16_t keycode, keyrecord_t *record) {', + ' if (record->event.pressed) {', + ' switch (keycode) {', + ] + + for i, macro_array in enumerate(keymap_json['macros']): + macro = [] + + for macro_fragment in macro_array: + if isinstance(macro_fragment, str): + macro_fragment = macro_fragment.replace('\\', '\\\\') + macro_fragment = macro_fragment.replace('\r\n', r'\n') + macro_fragment = macro_fragment.replace('\n', r'\n') + macro_fragment = macro_fragment.replace('\r', r'\n') + macro_fragment = macro_fragment.replace('\t', r'\t') + macro_fragment = macro_fragment.replace('"', r'\"') + + macro.append(f'"{macro_fragment}"') + + elif isinstance(macro_fragment, dict): + newstring = [] + + if macro_fragment['action'] == 'delay': + newstring.append(f"SS_DELAY({macro_fragment['duration']})") + + elif macro_fragment['action'] == 'beep': + newstring.append(r'"\a"') + + elif macro_fragment['action'] == 'tap' and len(macro_fragment['keycodes']) > 1: + last_keycode = macro_fragment['keycodes'].pop() + + for keycode in macro_fragment['keycodes']: + newstring.append(f'SS_DOWN(X_{keycode})') + + newstring.append(f'SS_TAP(X_{last_keycode})') + + for keycode in reversed(macro_fragment['keycodes']): + newstring.append(f'SS_UP(X_{keycode})') + + else: + for keycode in macro_fragment['keycodes']: + newstring.append(f"SS_{macro_fragment['action'].upper()}(X_{keycode})") + + macro.append(''.join(newstring)) + + new_macro = "".join(macro) + new_macro = new_macro.replace('""', '') + macro_txt.append(f' case QK_MACRO_{i}:') + macro_txt.append(f' SEND_STRING({new_macro});') + macro_txt.append(' return false;') + + macro_txt.append(' }') + macro_txt.append(' }') + macro_txt.append('\n return true;') + macro_txt.append('};') + macro_txt.append('') + return macro_txt + + def template_json(keyboard): """Returns a `keymap.json` template for a keyboard. @@ -206,83 +296,26 @@ def generate_c(keymap_json): A sequence of strings containing macros to implement for this keyboard. """ new_keymap = template_c(keymap_json['keyboard']) - layer_txt = [] - - for layer_num, layer in enumerate(keymap_json['layers']): - if layer_num != 0: - layer_txt[-1] = layer_txt[-1] + ',' - layer = map(_strip_any, layer) - layer_keys = ', '.join(layer) - layer_txt.append('\t[%s] = %s(%s)' % (layer_num, keymap_json['layout'], layer_keys)) - + layer_txt = _generate_keymap_table(keymap_json) keymap = '\n'.join(layer_txt) new_keymap = new_keymap.replace('__KEYMAP_GOES_HERE__', keymap) - if keymap_json.get('macros'): - macro_txt = [ - 'bool process_record_user(uint16_t keycode, keyrecord_t *record) {', - ' if (record->event.pressed) {', - ' switch (keycode) {', - ] - - for i, macro_array in enumerate(keymap_json['macros']): - macro = [] - - for macro_fragment in macro_array: - if isinstance(macro_fragment, str): - macro_fragment = macro_fragment.replace('\\', '\\\\') - macro_fragment = macro_fragment.replace('\r\n', r'\n') - macro_fragment = macro_fragment.replace('\n', r'\n') - macro_fragment = macro_fragment.replace('\r', r'\n') - macro_fragment = macro_fragment.replace('\t', r'\t') - macro_fragment = macro_fragment.replace('"', r'\"') - - macro.append(f'"{macro_fragment}"') - - elif isinstance(macro_fragment, dict): - newstring = [] - - if macro_fragment['action'] == 'delay': - newstring.append(f"SS_DELAY({macro_fragment['duration']})") - - elif macro_fragment['action'] == 'beep': - newstring.append(r'"\a"') - - elif macro_fragment['action'] == 'tap' and len(macro_fragment['keycodes']) > 1: - last_keycode = macro_fragment['keycodes'].pop() - - for keycode in macro_fragment['keycodes']: - newstring.append(f'SS_DOWN(X_{keycode})') - - newstring.append(f'SS_TAP(X_{last_keycode})') - - for keycode in reversed(macro_fragment['keycodes']): - newstring.append(f'SS_UP(X_{keycode})') - - else: - for keycode in macro_fragment['keycodes']: - newstring.append(f"SS_{macro_fragment['action'].upper()}(X_{keycode})") - - macro.append(''.join(newstring)) - - new_macro = "".join(macro) - new_macro = new_macro.replace('""', '') - macro_txt.append(f' case QK_MACRO_{i}:') - macro_txt.append(f' SEND_STRING({new_macro});') - macro_txt.append(' return false;') - - macro_txt.append(' }') - macro_txt.append(' }') - macro_txt.append('\n return true;') - macro_txt.append('};') - macro_txt.append('') - - new_keymap = '\n'.join((new_keymap, *macro_txt)) - - if keymap_json.get('host_language'): - new_keymap = new_keymap.replace('__INCLUDES__', f'#include "keymap_{keymap_json["host_language"]}.h"\n#include "sendstring_{keymap_json["host_language"]}.h"\n') - else: - new_keymap = new_keymap.replace('__INCLUDES__', '') + encodermap = '' + if 'encoders' in keymap_json and keymap_json['encoders'] is not None: + encoder_txt = _generate_encodermap_table(keymap_json) + encodermap = '\n'.join(encoder_txt) + new_keymap = new_keymap.replace('__ENCODER_MAP_GOES_HERE__', encodermap) + + macros = '' + if 'macros' in keymap_json and keymap_json['macros'] is not None: + macro_txt = _generate_macros_function(keymap_json) + macros = '\n'.join(macro_txt) + new_keymap = new_keymap.replace('__MACRO_OUTPUT_GOES_HERE__', macros) + + hostlang = '' + if 'host_language' in keymap_json and keymap_json['host_language'] is not None: + hostlang = f'#include "keymap_{keymap_json["host_language"]}.h"\n#include "sendstring_{keymap_json["host_language"]}.h"\n' + new_keymap = new_keymap.replace('__INCLUDES__', hostlang) return new_keymap -- cgit v1.3.1 From fe02abc47921428fe6eb59ca817bfd082f0de4bf Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 11 Feb 2023 15:23:07 -0800 Subject: [Core] Tri Layer Keys (#19795) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: wilba Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> Co-authored-by: Joel Challis Co-authored-by: Nick Brassel --- builddefs/common_features.mk | 1 + builddefs/generic_features.mk | 1 + builddefs/show_options.mk | 3 +- .../keycodes/keycodes_0.0.2_quantum.hjson | 18 ++++ docs/_summary.md | 1 + docs/feature_tri_layer.md | 48 ++++++++++ quantum/action_layer.c | 10 ++ quantum/action_layer.h | 21 +++++ quantum/keycodes.h | 6 +- quantum/process_keycode/process_tri_layer.c | 30 ++++++ quantum/process_keycode/process_tri_layer.h | 16 ++++ quantum/quantum.c | 13 +-- quantum/quantum.h | 7 +- quantum/tri_layer.c | 39 ++++++++ quantum/tri_layer.h | 59 ++++++++++++ tests/test_common/keycode_table.cpp | 2 + tests/tri_layer/config.h | 6 ++ tests/tri_layer/test.mk | 8 ++ tests/tri_layer/test_tri_layer.cpp | 103 +++++++++++++++++++++ 19 files changed, 377 insertions(+), 15 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2_quantum.hjson create mode 100644 docs/feature_tri_layer.md create mode 100644 quantum/process_keycode/process_tri_layer.c create mode 100644 quantum/process_keycode/process_tri_layer.h create mode 100644 quantum/tri_layer.c create mode 100644 quantum/tri_layer.h create mode 100644 tests/tri_layer/config.h create mode 100644 tests/tri_layer/test.mk create mode 100644 tests/tri_layer/test_tri_layer.cpp (limited to 'data') diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 4e032f9dcf..0880934e95 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -620,6 +620,7 @@ ifeq ($(strip $(VIA_ENABLE)), yes) DYNAMIC_KEYMAP_ENABLE := yes RAW_ENABLE := yes BOOTMAGIC_ENABLE := yes + TRI_LAYER_ENABLE := yes SRC += $(QUANTUM_DIR)/via.c OPT_DEFS += -DVIA_ENABLE endif diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk index 0d897bc1c8..5a1ef5c6f0 100644 --- a/builddefs/generic_features.mk +++ b/builddefs/generic_features.mk @@ -39,6 +39,7 @@ GENERIC_FEATURES = \ VELOCIKEY \ WPM \ DYNAMIC_TAPPING_TERM \ + TRI_LAYER define HANDLE_GENERIC_FEATURE # $$(info "Processing: $1_ENABLE $2.c") diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk index e9f7e7d047..9723b45438 100644 --- a/builddefs/show_options.mk +++ b/builddefs/show_options.mk @@ -84,7 +84,8 @@ OTHER_OPTION_NAMES = \ PROGRAMMABLE_BUTTON_ENABLE \ SECURE_ENABLE \ CAPS_WORD_ENABLE \ - AUTOCORRECT_ENABLE + AUTOCORRECT_ENABLE \ + TRI_LAYER_ENABLE define NAME_ECHO @printf " %-30s = %-16s # %s\\n" "$1" "$($1)" "$(origin $1)" diff --git a/data/constants/keycodes/keycodes_0.0.2_quantum.hjson b/data/constants/keycodes/keycodes_0.0.2_quantum.hjson new file mode 100644 index 0000000000..960afa4e51 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_quantum.hjson @@ -0,0 +1,18 @@ +{ + "keycodes": { + "0x7C77": { + "group": "quantum", + "key": "QK_TRI_LAYER_LOWER", + "aliases": [ + "TL_LOWR" + ] + }, + "0x7C78": { + "group": "quantum", + "key": "QK_TRI_LAYER_UPPER", + "aliases": [ + "TL_UPPR" + ] + } + } +} diff --git a/docs/_summary.md b/docs/_summary.md index d2d4bb9b32..b038f08a4d 100644 --- a/docs/_summary.md +++ b/docs/_summary.md @@ -93,6 +93,7 @@ * [Swap Hands](feature_swap_hands.md) * [Tap Dance](feature_tap_dance.md) * [Tap-Hold Configuration](tap_hold.md) + * [Tri Layer](feature_tri_layer.md) * [Unicode](feature_unicode.md) * [Userspace](feature_userspace.md) * [WPM Calculation](feature_wpm.md) diff --git a/docs/feature_tri_layer.md b/docs/feature_tri_layer.md new file mode 100644 index 0000000000..aa6c87719c --- /dev/null +++ b/docs/feature_tri_layer.md @@ -0,0 +1,48 @@ +# Tri Layers :id=tri-layers + +This enables support for the OLKB style "Tri Layer" keycodes. These function similar to the `MO` (momentary) function key, but if both the "Lower" and "Upper" keys are pressed, it activates a third "Adjust" layer. To enable this functionality, add this line to your `rules.mk`: + +```make +TRI_LAYER_ENABLE = yes +``` + +Note that the "upper", "lower" and "adjust" names don't have a particular significance, they are just used to identify and clarify the behavior. Layers are processed from highest numeric value to lowest, however the values are not required to be consecutive. + +For a detailed explanation of how the layer stack works, check out [Keymap Overview](keymap.md#keymap-and-layers). + +## Keycodes :id=keycodes + +| Keycode | Alias | Description | +|----------------------|-----------|---------------------------------------------------------------------------------------------------------| +| `QK_TRI_LAYER_LOWER` | `TL_LOWR` | Momentarily enables the "lower" layer. Enables the "adjust" layer if the "upper" layer is also enabled" | +| `QK_TRI_LAYER_UPPER` | `TL_UPPR` | Momentarily enables the "upper" layer. Enables the "adjust" layer if the "lower" layer is also enabled" | + +## Configuration + +To change the default values for the layers, you can change these defines, in your `config.h` + +| Config name | Default | Description | +|--------------------------|---------|------------------------------------------| +| `TRI_LAYER_LOWER_LAYER` | `1` | Sets the default for the "lower" layer. | +| `TRI_LAYER_UPPER_LAYER` | `2` | Sets the default for the "upper" layer. | +| `TRI_LAYER_ADJUST_LAYER` | `3` | Sets the default for the "adjust" layer. | + +Eg, if you wanted to set the "Adjust" layer to be layer 5, you'd add this to your `config.h`: + +```c +#define TRI_LAYER_ADJUST_LAYER 5 +``` + +## Functions + +| Function name | Description | +|----------------------------------------------|-------------------------------------------------| +| `set_tri_layer_lower_layer(layer)` | Changes the "lower" layer*. | +| `set_tri_layer_upper_layer(layer)` | Changes the "upper" layer*. | +| `set_tri_layer_adjust_layer(layer)` | Changes the "adjust" layer*. | +| `set_tri_layer_layers(lower, upper, adjust)` | Stes the "lower", "upper" and "adjust" layers*. | +| `get_tri_layer_lower_layer()` | Gets the current "lower" layer. | +| `get_tri_layer_upper_layer()` | Gets the current "upper" layer. | +| `get_tri_layer_adjust_layer()` | Gets the current "adjust" layer. | + +!> Note: these settings are not persisent, and will be reset to the default on power loss or power cycling of the controller. diff --git a/quantum/action_layer.c b/quantum/action_layer.c index 74e8137920..35f494df8f 100644 --- a/quantum/action_layer.c +++ b/quantum/action_layer.c @@ -349,3 +349,13 @@ uint8_t layer_switch_get_layer(keypos_t key) { action_t layer_switch_get_action(keypos_t key) { return action_for_key(layer_switch_get_layer(key), key); } + +layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3) { + layer_state_t mask12 = ((layer_state_t)1 << layer1) | ((layer_state_t)1 << layer2); + layer_state_t mask3 = (layer_state_t)1 << layer3; + return (state & mask12) == mask12 ? (state | mask3) : (state & ~mask3); +} + +void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { + layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); +} diff --git a/quantum/action_layer.h b/quantum/action_layer.h index 3fe2726529..ff783bb3e7 100644 --- a/quantum/action_layer.h +++ b/quantum/action_layer.h @@ -113,6 +113,25 @@ void layer_and(layer_state_t state); void layer_xor(layer_state_t state); layer_state_t layer_state_set_user(layer_state_t state); layer_state_t layer_state_set_kb(layer_state_t state); + +/** + * @brief Applies the tri layer to global layer state. Not be used in layer_state_set_(kb|user) functions. + * + * @param layer1 First layer to check for tri layer + * @param layer2 Second layer to check for tri layer + * @param layer3 Layer to activate if both other layers are enabled + */ +void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3); +/** + * @brief Applies the tri layer behavior to supplied layer bitmask, without using layer functions. + * + * @param state Original layer bitmask to check and modify + * @param layer1 First layer to check for tri layer + * @param layer2 Second layer to check for tri layer + * @param layer3 Layer to activate if both other layers are enabled + * @return layer_state_t returns a modified layer bitmask with tri layer modifications applied + */ +layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3); #else # define layer_state 0 @@ -131,6 +150,8 @@ layer_state_t layer_state_set_kb(layer_state_t state); # define layer_xor(state) (void)state # define layer_state_set_kb(state) (void)state # define layer_state_set_user(state) (void)state +# define update_tri_layer(layer1, layer2, layer3) +# define update_tri_layer_state(state, layer1, layer2, layer3) (void)state #endif /* pressed actions cache */ diff --git a/quantum/keycodes.h b/quantum/keycodes.h index f24ccf01b8..4fa4306ed6 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -717,6 +717,8 @@ enum qk_keycode_defines { QK_AUTOCORRECT_ON = 0x7C74, QK_AUTOCORRECT_OFF = 0x7C75, QK_AUTOCORRECT_TOGGLE = 0x7C76, + QK_TRI_LAYER_LOWER = 0x7C77, + QK_TRI_LAYER_UPPER = 0x7C78, SAFE_RANGE = 0x7E00, // Alias @@ -1282,6 +1284,8 @@ enum qk_keycode_defines { AC_ON = QK_AUTOCORRECT_ON, AC_OFF = QK_AUTOCORRECT_OFF, AC_TOGG = QK_AUTOCORRECT_TOGGLE, + TL_LOWR = QK_TRI_LAYER_LOWER, + TL_UPPR = QK_TRI_LAYER_UPPER, }; // Range Helpers @@ -1333,4 +1337,4 @@ enum qk_keycode_defines { #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31) #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) -#define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE) +#define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_TRI_LAYER_UPPER) diff --git a/quantum/process_keycode/process_tri_layer.c b/quantum/process_keycode/process_tri_layer.c new file mode 100644 index 0000000000..1e681b9a1c --- /dev/null +++ b/quantum/process_keycode/process_tri_layer.c @@ -0,0 +1,30 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "process_tri_layer.h" +#include "tri_layer.h" +#include "action_layer.h" + +bool process_tri_layer(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QK_TRI_LAYER_LOWER: + if (record->event.pressed) { + layer_on(get_tri_layer_lower_layer()); + update_tri_layer(get_tri_layer_lower_layer(), get_tri_layer_upper_layer(), get_tri_layer_adjust_layer()); + } else { + layer_off(get_tri_layer_lower_layer()); + update_tri_layer(get_tri_layer_lower_layer(), get_tri_layer_upper_layer(), get_tri_layer_adjust_layer()); + } + return false; + case QK_TRI_LAYER_UPPER: + if (record->event.pressed) { + layer_on(get_tri_layer_upper_layer()); + update_tri_layer(get_tri_layer_lower_layer(), get_tri_layer_upper_layer(), get_tri_layer_adjust_layer()); + } else { + layer_off(get_tri_layer_upper_layer()); + update_tri_layer(get_tri_layer_lower_layer(), get_tri_layer_upper_layer(), get_tri_layer_adjust_layer()); + } + return false; + } + return true; +} diff --git a/quantum/process_keycode/process_tri_layer.h b/quantum/process_keycode/process_tri_layer.h new file mode 100644 index 0000000000..9c4e3df1c2 --- /dev/null +++ b/quantum/process_keycode/process_tri_layer.h @@ -0,0 +1,16 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "action.h" + +/** + * @brief Handles tri layer behavior + * + * @param keycode the keycode + * @param record the key record structure + * @return true continue handling keycodes + * @return false stop handling keycodes + */ +bool process_tri_layer(uint16_t keycode, keyrecord_t *record); diff --git a/quantum/quantum.c b/quantum/quantum.c index 5554ecab32..0587f215fe 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -342,6 +342,9 @@ bool process_record_quantum(keyrecord_t *record) { #endif #ifdef AUTOCORRECT_ENABLE process_autocorrect(keycode, record) && +#endif +#ifdef TRI_LAYER_ENABLE + process_tri_layer(keycode, record) && #endif true)) { return false; @@ -443,16 +446,6 @@ void set_single_persistent_default_layer(uint8_t default_layer) { default_layer_set((layer_state_t)1 << default_layer); } -layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3) { - layer_state_t mask12 = ((layer_state_t)1 << layer1) | ((layer_state_t)1 << layer2); - layer_state_t mask3 = (layer_state_t)1 << layer3; - return (state & mask12) == mask12 ? (state | mask3) : (state & ~mask3); -} - -void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { - layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); -} - //------------------------------------------------------------------------------ // Override these functions in your keymap file to play different tunes on // different events such as startup and bootloader jump diff --git a/quantum/quantum.h b/quantum/quantum.h index 615ec2382c..708d325a32 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -240,9 +240,10 @@ extern layer_state_t layer_state; # include "process_autocorrect.h" #endif -// For tri-layer -void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3); -layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3); +#ifdef TRI_LAYER_ENABLE +# include "tri_layer.h" +# include "process_tri_layer.h" +#endif void set_single_persistent_default_layer(uint8_t default_layer); diff --git a/quantum/tri_layer.c b/quantum/tri_layer.c new file mode 100644 index 0000000000..a5e3f8cb47 --- /dev/null +++ b/quantum/tri_layer.c @@ -0,0 +1,39 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "tri_layer.h" +#include + +static uint8_t tri_layer_lower_layer = TRI_LAYER_LOWER_LAYER; +static uint8_t tri_layer_upper_layer = TRI_LAYER_UPPER_LAYER; +static uint8_t tri_layer_adjust_layer = TRI_LAYER_ADJUST_LAYER; + +void set_tri_layer_lower_layer(uint8_t layer) { + tri_layer_lower_layer = layer; +} + +void set_tri_layer_upper_layer(uint8_t layer) { + tri_layer_upper_layer = layer; +} + +void set_tri_layer_adjust_layer(uint8_t layer) { + tri_layer_adjust_layer = layer; +} + +void set_tri_layer_layers(uint8_t lower, uint8_t raise, uint8_t adjust) { + tri_layer_lower_layer = lower; + tri_layer_upper_layer = raise; + tri_layer_adjust_layer = adjust; +} + +uint8_t get_tri_layer_lower_layer(void) { + return tri_layer_lower_layer; +} + +uint8_t get_tri_layer_upper_layer(void) { + return tri_layer_upper_layer; +} + +uint8_t get_tri_layer_adjust_layer(void) { + return tri_layer_adjust_layer; +} diff --git a/quantum/tri_layer.h b/quantum/tri_layer.h new file mode 100644 index 0000000000..3341ebffb2 --- /dev/null +++ b/quantum/tri_layer.h @@ -0,0 +1,59 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include + +#ifndef TRI_LAYER_LOWER_LAYER +# define TRI_LAYER_LOWER_LAYER 1 +#endif +#ifndef TRI_LAYER_UPPER_LAYER +# define TRI_LAYER_UPPER_LAYER 2 +#endif +#ifndef TRI_LAYER_ADJUST_LAYER +# define TRI_LAYER_ADJUST_LAYER 3 +#endif + +/** + * @brief Set the tri layer lower layer index + * + * @param layer + */ +void set_tri_layer_lower_layer(uint8_t layer); +/** + * @brief Set the tri layer upper layer index + * + * @param layer + */ +void set_tri_layer_upper_layer(uint8_t layer); +/** + * @brief Set the tri layer adjust layer index + * + * @param layer + */ +void set_tri_layer_adjust_layer(uint8_t layer); +/** + * @brief Set the tri layer indices + * + * @param lower + * @param upper + * @param adjust + */ +void set_tri_layer_layers(uint8_t lower, uint8_t upper, uint8_t adjust); +/** + * @brief Get the tri layer lower layer index + * + * @return uint8_t + */ +uint8_t get_tri_layer_lower_layer(void); +/** + * @brief Get the tri layer upper layer index + * + * @return uint8_t + */ +uint8_t get_tri_layer_upper_layer(void); +/** + * @brief Get the tri layer adjust layer index + * + * @return uint8_t + */ +uint8_t get_tri_layer_adjust_layer(void); diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index ab9c292e95..337bc8fb5f 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -659,5 +659,7 @@ std::map KEYCODE_ID_TABLE = { {QK_AUTOCORRECT_ON, "QK_AUTOCORRECT_ON"}, {QK_AUTOCORRECT_OFF, "QK_AUTOCORRECT_OFF"}, {QK_AUTOCORRECT_TOGGLE, "QK_AUTOCORRECT_TOGGLE"}, + {QK_TRI_LAYER_LOWER, "QK_TRI_LAYER_LOWER"}, + {QK_TRI_LAYER_UPPER, "QK_TRI_LAYER_UPPER"}, {SAFE_RANGE, "SAFE_RANGE"}, }; diff --git a/tests/tri_layer/config.h b/tests/tri_layer/config.h new file mode 100644 index 0000000000..b68bf0c2d5 --- /dev/null +++ b/tests/tri_layer/config.h @@ -0,0 +1,6 @@ +// Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "test_common.h" diff --git a/tests/tri_layer/test.mk b/tests/tri_layer/test.mk new file mode 100644 index 0000000000..50548c3e1c --- /dev/null +++ b/tests/tri_layer/test.mk @@ -0,0 +1,8 @@ +# Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) +# SPDX-License-Identifier: GPL-2.0-or-later + +# -------------------------------------------------------------------------------- +# Keep this file, even if it is empty, as a marker that this folder contains tests +# -------------------------------------------------------------------------------- + +TRI_LAYER_ENABLE = yes diff --git a/tests/tri_layer/test_tri_layer.cpp b/tests/tri_layer/test_tri_layer.cpp new file mode 100644 index 0000000000..fffc124f4c --- /dev/null +++ b/tests/tri_layer/test_tri_layer.cpp @@ -0,0 +1,103 @@ +// Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "test_common.hpp" + +using testing::_; +using testing::InSequence; + +class TriLayer : public TestFixture {}; + +TEST_F(TriLayer, TriLayerLowerTest) { + TestDriver driver; + KeymapKey lower_layer_key = KeymapKey{0, 0, 0, QK_TRI_LAYER_LOWER}; + + set_keymap({lower_layer_key, KeymapKey{1, 0, 0, KC_TRNS}}); + + /* Press Lower. */ + EXPECT_NO_REPORT(driver); + lower_layer_key.press(); + run_one_scan_loop(); + EXPECT_TRUE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + VERIFY_AND_CLEAR(driver); + + /* Release Lower. */ + EXPECT_NO_REPORT(driver); + lower_layer_key.release(); + run_one_scan_loop(); + EXPECT_FALSE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + VERIFY_AND_CLEAR(driver); +} + +TEST_F(TriLayer, TriLayerUpperTest) { + TestDriver driver; + KeymapKey upper_layer_key = KeymapKey{0, 0, 0, QK_TRI_LAYER_UPPER}; + + set_keymap({upper_layer_key, KeymapKey{2, 0, 0, KC_TRNS}}); + + /* Press Raise. */ + EXPECT_NO_REPORT(driver); + upper_layer_key.press(); + run_one_scan_loop(); + EXPECT_FALSE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_TRUE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + VERIFY_AND_CLEAR(driver); + + /* Release Raise. */ + EXPECT_NO_REPORT(driver); + upper_layer_key.release(); + run_one_scan_loop(); + EXPECT_FALSE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + VERIFY_AND_CLEAR(driver); +} + +TEST_F(TriLayer, TriLayerAdjustTest) { + TestDriver driver; + KeymapKey lower_layer_key = KeymapKey{0, 0, 0, QK_TRI_LAYER_LOWER}; + KeymapKey upper_layer_key = KeymapKey{0, 1, 0, QK_TRI_LAYER_UPPER}; + + set_keymap({ + upper_layer_key, + lower_layer_key, + KeymapKey{1, 0, 0, KC_TRNS}, + KeymapKey{1, 1, 0, KC_TRNS}, + KeymapKey{2, 0, 0, KC_TRNS}, + KeymapKey{2, 1, 0, KC_TRNS}, + KeymapKey{3, 0, 0, KC_TRNS}, + KeymapKey{3, 1, 0, KC_TRNS}, + }); + + /* Press Lower, then upper, and release upper and then lower. */ + EXPECT_NO_REPORT(driver); + lower_layer_key.press(); + run_one_scan_loop(); + EXPECT_TRUE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + + upper_layer_key.press(); + run_one_scan_loop(); + EXPECT_TRUE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_TRUE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_TRUE(layer_state_is(get_tri_layer_adjust_layer())); + + lower_layer_key.release(); + run_one_scan_loop(); + EXPECT_FALSE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_TRUE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + + upper_layer_key.release(); + run_one_scan_loop(); + EXPECT_FALSE(layer_state_is(get_tri_layer_lower_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_upper_layer())); + EXPECT_FALSE(layer_state_is(get_tri_layer_adjust_layer())); + VERIFY_AND_CLEAR(driver); +} -- cgit v1.3.1 From d10350cd2ceb2b9d80522cdec3ea908118f7fd35 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 12 Feb 2023 15:55:51 +0000 Subject: Restore packing of midi note keycodes (#19468) --- data/constants/keycodes/keycodes_0.0.2_midi.hjson | 1044 +++++++++++++++++++++ quantum/keycodes.h | 282 +++--- 2 files changed, 1185 insertions(+), 141 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2_midi.hjson (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2_midi.hjson b/data/constants/keycodes/keycodes_0.0.2_midi.hjson new file mode 100644 index 0000000000..c15c2dd433 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_midi.hjson @@ -0,0 +1,1044 @@ +{ + "keycodes": { + "!reset!":0, + + "0x7100": { + "group": "midi", + "key": "QK_MIDI_ON", + "aliases": [ + "MI_ON" + ] + }, + "0x7101": { + "group": "midi", + "key": "QK_MIDI_OFF", + "aliases": [ + "MI_OFF" + ] + }, + "0x7102": { + "group": "midi", + "key": "QK_MIDI_TOGGLE", + "aliases": [ + "MI_TOGG" + ] + }, + "0x7103": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_0", + "aliases": [ + "MI_C" + ] + }, + "0x7104": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_SHARP_0", + "aliases": [ + "MI_Cs", + "MI_Db" + ] + }, + "0x7105": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_0", + "aliases": [ + "MI_D" + ] + }, + "0x7106": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_SHARP_0", + "aliases": [ + "MI_Ds", + "MI_Eb" + ] + }, + "0x7107": { + "group": "midi", + "key": "QK_MIDI_NOTE_E_0", + "aliases": [ + "MI_E" + ] + }, + "0x7108": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_0", + "aliases": [ + "MI_F" + ] + }, + "0x7109": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_SHARP_0", + "aliases": [ + "MI_Fs", + "MI_Gb" + ] + }, + "0x710A": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_0", + "aliases": [ + "MI_G" + ] + }, + "0x710B": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_SHARP_0", + "aliases": [ + "MI_Gs" + "MI_Ab" + ] + }, + "0x710C": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_0", + "aliases": [ + "MI_A" + ] + }, + "0x710D": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_SHARP_0", + "aliases": [ + "MI_As" + "MI_Bb" + ] + }, + "0x710E": { + "group": "midi", + "key": "QK_MIDI_NOTE_B_0", + "aliases": [ + "MI_B" + ] + }, + "0x710F": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_1", + "aliases": [ + "MI_C1" + ] + }, + "0x7110": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_SHARP_1", + "aliases": [ + "MI_Cs1", + "MI_Db1" + ] + }, + "0x7111": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_1", + "aliases": [ + "MI_D1" + ] + }, + "0x7112": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_SHARP_1", + "aliases": [ + "MI_Ds1", + "MI_Eb1" + ] + }, + "0x7113": { + "group": "midi", + "key": "QK_MIDI_NOTE_E_1", + "aliases": [ + "MI_E1" + ] + }, + "0x7114": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_1", + "aliases": [ + "MI_F1" + ] + }, + "0x7115": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_SHARP_1", + "aliases": [ + "MI_Fs1", + "MI_Gb1" + ] + }, + "0x7116": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_1", + "aliases": [ + "MI_G1" + ] + }, + "0x7117": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_SHARP_1", + "aliases": [ + "MI_Gs1", + "MI_Ab1" + ] + }, + "0x7118": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_1", + "aliases": [ + "MI_A1" + ] + }, + "0x7119": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_SHARP_1", + "aliases": [ + "MI_As1", + "MI_Bb1" + ] + }, + "0x711A": { + "group": "midi", + "key": "QK_MIDI_NOTE_B_1", + "aliases": [ + "MI_B1" + ] + }, + "0x711B": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_2", + "aliases": [ + "MI_C2" + ] + }, + "0x711C": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_SHARP_2", + "aliases": [ + "MI_Cs2", + "MI_Db2" + ] + }, + "0x711D": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_2", + "aliases": [ + "MI_D2" + ] + }, + "0x711E": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_SHARP_2", + "aliases": [ + "MI_Ds2", + "MI_Eb2" + ] + }, + "0x711F": { + "group": "midi", + "key": "QK_MIDI_NOTE_E_2", + "aliases": [ + "MI_E2" + ] + }, + "0x7120": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_2", + "aliases": [ + "MI_F2" + ] + }, + "0x7121": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_SHARP_2", + "aliases": [ + "MI_Fs2", + "MI_Gb2" + ] + }, + "0x7122": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_2", + "aliases": [ + "MI_G2" + ] + }, + "0x7123": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_SHARP_2", + "aliases": [ + "MI_Gs2", + "MI_Ab2" + ] + }, + "0x7124": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_2", + "aliases": [ + "MI_A2" + ] + }, + "0x7125": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_SHARP_2", + "aliases": [ + "MI_As2", + "MI_Bb2" + ] + }, + "0x7126": { + "group": "midi", + "key": "QK_MIDI_NOTE_B_2", + "aliases": [ + "MI_B2" + ] + }, + "0x7127": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_3", + "aliases": [ + "MI_C3" + ] + }, + "0x7128": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_SHARP_3", + "aliases": [ + "MI_Cs3", + "MI_Db3" + ] + }, + "0x7129": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_3", + "aliases": [ + "MI_D3" + ] + }, + "0x712A": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_SHARP_3", + "aliases": [ + "MI_Ds3", + "MI_Eb3" + ] + }, + "0x712B": { + "group": "midi", + "key": "QK_MIDI_NOTE_E_3", + "aliases": [ + "MI_E3" + ] + }, + "0x712C": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_3", + "aliases": [ + "MI_F3" + ] + }, + "0x712D": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_SHARP_3", + "aliases": [ + "MI_Fs3", + "MI_Gb3" + ] + }, + "0x712E": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_3", + "aliases": [ + "MI_G3" + ] + }, + "0x712F": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_SHARP_3", + "aliases": [ + "MI_Gs3", + "MI_Ab3" + ] + }, + "0x7130": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_3", + "aliases": [ + "MI_A3" + ] + }, + "0x7131": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_SHARP_3", + "aliases": [ + "MI_As3", + "MI_Bb3" + ] + }, + "0x7132": { + "group": "midi", + "key": "QK_MIDI_NOTE_B_3", + "aliases": [ + "MI_B3" + ] + }, + "0x7133": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_4", + "aliases": [ + "MI_C4" + ] + }, + "0x7134": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_SHARP_4", + "aliases": [ + "MI_Cs4", + "MI_Db4" + ] + }, + "0x7135": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_4", + "aliases": [ + "MI_D4" + ] + }, + "0x7136": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_SHARP_4", + "aliases": [ + "MI_Ds4", + "MI_Eb4" + ] + }, + "0x7137": { + "group": "midi", + "key": "QK_MIDI_NOTE_E_4", + "aliases": [ + "MI_E4" + ] + }, + "0x7138": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_4", + "aliases": [ + "MI_F4" + ] + }, + "0x7139": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_SHARP_4", + "aliases": [ + "MI_Fs4", + "MI_Gb4" + ] + }, + "0x713A": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_4", + "aliases": [ + "MI_G4" + ] + }, + "0x713B": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_SHARP_4", + "aliases": [ + "MI_Gs4", + "MI_Ab4" + ] + }, + "0x713C": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_4", + "aliases": [ + "MI_A4" + ] + }, + "0x713D": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_SHARP_4", + "aliases": [ + "MI_As4", + "MI_Bb4" + ] + }, + "0x713E": { + "group": "midi", + "key": "QK_MIDI_NOTE_B_4", + "aliases": [ + "MI_B4" + ] + }, + "0x713F": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_5", + "aliases": [ + "MI_C5" + ] + }, + "0x7140": { + "group": "midi", + "key": "QK_MIDI_NOTE_C_SHARP_5", + "aliases": [ + "MI_Cs5", + "MI_Db5" + ] + }, + "0x7141": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_5", + "aliases": [ + "MI_D5" + ] + }, + "0x7142": { + "group": "midi", + "key": "QK_MIDI_NOTE_D_SHARP_5", + "aliases": [ + "MI_Ds5", + "MI_Eb5" + ] + }, + "0x7143": { + "group": "midi", + "key": "QK_MIDI_NOTE_E_5", + "aliases": [ + "MI_E5" + ] + }, + "0x7144": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_5", + "aliases": [ + "MI_F5" + ] + }, + "0x7145": { + "group": "midi", + "key": "QK_MIDI_NOTE_F_SHARP_5", + "aliases": [ + "MI_Fs5", + "MI_Gb5" + ] + }, + "0x7146": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_5", + "aliases": [ + "MI_G5" + ] + }, + "0x7147": { + "group": "midi", + "key": "QK_MIDI_NOTE_G_SHARP_5", + "aliases": [ + "MI_Gs5", + "MI_Ab5" + ] + }, + "0x7148": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_5", + "aliases": [ + "MI_A5" + ] + }, + "0x7149": { + "group": "midi", + "key": "QK_MIDI_NOTE_A_SHARP_5", + "aliases": [ + "MI_As5", + "MI_Bb5" + ] + }, + "0x714A": { + "group": "midi", + "key": "QK_MIDI_NOTE_B_5", + "aliases": [ + "MI_B5" + ] + }, + "0x714B": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_N2", + "aliases": [ + "MI_OCN2" + ] + }, + "0x714C": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_N1", + "aliases": [ + "MI_OCN1" + ] + }, + "0x714D": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_0", + "aliases": [ + "MI_OC0" + ] + }, + "0x714E": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_1", + "aliases": [ + "MI_OC1" + ] + }, + "0x714F": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_2", + "aliases": [ + "MI_OC2" + ] + }, + "0x7150": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_3", + "aliases": [ + "MI_OC3" + ] + }, + "0x7151": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_4", + "aliases": [ + "MI_OC4" + ] + }, + "0x7152": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_5", + "aliases": [ + "MI_OC5" + ] + }, + "0x7153": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_6", + "aliases": [ + "MI_OC6" + ] + }, + "0x7154": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_7", + "aliases": [ + "MI_OC7" + ] + }, + "0x7155": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_DOWN", + "aliases": [ + "MI_OCTD" + ] + }, + "0x7156": { + "group": "midi", + "key": "QK_MIDI_OCTAVE_UP", + "aliases": [ + "MI_OCTU" + ] + }, + "0x7157": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_N6", + "aliases": [ + "MI_TRN6" + ] + }, + "0x7158": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_N5", + "aliases": [ + "MI_TRN5" + ] + }, + "0x7159": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_N4", + "aliases": [ + "MI_TRN4" + ] + }, + "0x715A": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_N3", + "aliases": [ + "MI_TRN3" + ] + }, + "0x715B": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_N2", + "aliases": [ + "MI_TRN2" + ] + }, + "0x715C": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_N1", + "aliases": [ + "MI_TRN1" + ] + }, + "0x715D": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_0", + "aliases": [ + "MI_TR0" + ] + }, + "0x715E": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_1", + "aliases": [ + "MI_TR1" + ] + }, + "0x715F": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_2", + "aliases": [ + "MI_TR2" + ] + }, + "0x7160": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_3", + "aliases": [ + "MI_TR3" + ] + }, + "0x7161": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_4", + "aliases": [ + "MI_TR4" + ] + }, + "0x7162": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_5", + "aliases": [ + "MI_TR5" + ] + }, + "0x7163": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_6", + "aliases": [ + "MI_TR6" + ] + }, + "0x7164": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_DOWN", + "aliases": [ + "MI_TRSD" + ] + }, + "0x7165": { + "group": "midi", + "key": "QK_MIDI_TRANSPOSE_UP", + "aliases": [ + "MI_TRSU" + ] + }, + "0x7166": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_0", + "aliases": [ + "MI_VL0" + ] + }, + "0x7167": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_1", + "aliases": [ + "MI_VL1" + ] + }, + "0x7168": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_2", + "aliases": [ + "MI_VL2" + ] + }, + "0x7169": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_3", + "aliases": [ + "MI_VL3" + ] + }, + "0x716A": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_4", + "aliases": [ + "MI_VL4" + ] + }, + "0x716B": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_5", + "aliases": [ + "MI_VL5" + ] + }, + "0x716C": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_6", + "aliases": [ + "MI_VL6" + ] + }, + "0x716D": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_7", + "aliases": [ + "MI_VL7" + ] + }, + "0x716E": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_8", + "aliases": [ + "MI_VL8" + ] + }, + "0x716F": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_9", + "aliases": [ + "MI_VL9" + ] + }, + "0x7170": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_10", + "aliases": [ + "MI_VL10" + ] + }, + "0x7171": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_DOWN", + "aliases": [ + "MI_VELD" + ] + }, + "0x7172": { + "group": "midi", + "key": "QK_MIDI_VELOCITY_UP", + "aliases": [ + "MI_VELU" + ] + }, + "0x7173": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_1", + "aliases": [ + "MI_CH1" + ] + }, + "0x7174": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_2", + "aliases": [ + "MI_CH2" + ] + }, + "0x7175": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_3", + "aliases": [ + "MI_CH3" + ] + }, + "0x7176": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_4", + "aliases": [ + "MI_CH4" + ] + }, + "0x7177": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_5", + "aliases": [ + "MI_CH5" + ] + }, + "0x7178": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_6", + "aliases": [ + "MI_CH6" + ] + }, + "0x7179": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_7", + "aliases": [ + "MI_CH7" + ] + }, + "0x717A": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_8", + "aliases": [ + "MI_CH8" + ] + }, + "0x717B": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_9", + "aliases": [ + "MI_CH9" + ] + }, + "0x717C": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_10", + "aliases": [ + "MI_CH10" + ] + }, + "0x717D": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_11", + "aliases": [ + "MI_CH11" + ] + }, + "0x717E": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_12", + "aliases": [ + "MI_CH12" + ] + }, + "0x717F": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_13", + "aliases": [ + "MI_CH13" + ] + }, + "0x7180": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_14", + "aliases": [ + "MI_CH14" + ] + }, + "0x7181": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_15", + "aliases": [ + "MI_CH15" + ] + }, + "0x7182": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_16", + "aliases": [ + "MI_CH16" + ] + }, + "0x7183": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_DOWN", + "aliases": [ + "MI_CHND" + ] + }, + "0x7184": { + "group": "midi", + "key": "QK_MIDI_CHANNEL_UP", + "aliases": [ + "MI_CHNU" + ] + }, + "0x7185": { + "group": "midi", + "key": "QK_MIDI_ALL_NOTES_OFF", + "aliases": [ + "MI_AOFF" + ] + }, + "0x7186": { + "group": "midi", + "key": "QK_MIDI_SUSTAIN", + "aliases": [ + "MI_SUST" + ] + }, + "0x7187": { + "group": "midi", + "key": "QK_MIDI_PORTAMENTO", + "aliases": [ + "MI_PORT" + ] + }, + "0x7188": { + "group": "midi", + "key": "QK_MIDI_SOSTENUTO", + "aliases": [ + "MI_SOST" + ] + }, + "0x7189": { + "group": "midi", + "key": "QK_MIDI_SOFT", + "aliases": [ + "MI_SOFT" + ] + }, + "0x718A": { + "group": "midi", + "key": "QK_MIDI_LEGATO", + "aliases": [ + "MI_LEG" + ] + }, + "0x718B": { + "group": "midi", + "key": "QK_MIDI_MODULATION", + "aliases": [ + "MI_MOD" + ] + }, + "0x718C": { + "group": "midi", + "key": "QK_MIDI_MODULATION_SPEED_DOWN", + "aliases": [ + "MI_MODD" + ] + }, + "0x718D": { + "group": "midi", + "key": "QK_MIDI_MODULATION_SPEED_UP", + "aliases": [ + "MI_MODU" + ] + }, + "0x718E": { + "group": "midi", + "key": "QK_MIDI_PITCH_BEND_DOWN", + "aliases": [ + "MI_BNDD" + ] + }, + "0x718F": { + "group": "midi", + "key": "QK_MIDI_PITCH_BEND_UP", + "aliases": [ + "MI_BNDU" + ] + } + } +} diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 4fa4306ed6..cb1499dede 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -353,147 +353,147 @@ enum qk_keycode_defines { QK_MIDI_ON = 0x7100, QK_MIDI_OFF = 0x7101, QK_MIDI_TOGGLE = 0x7102, - QK_MIDI_NOTE_C_0 = 0x7110, - QK_MIDI_NOTE_C_SHARP_0 = 0x7111, - QK_MIDI_NOTE_D_0 = 0x7112, - QK_MIDI_NOTE_D_SHARP_0 = 0x7113, - QK_MIDI_NOTE_E_0 = 0x7114, - QK_MIDI_NOTE_F_0 = 0x7115, - QK_MIDI_NOTE_F_SHARP_0 = 0x7116, - QK_MIDI_NOTE_G_0 = 0x7117, - QK_MIDI_NOTE_G_SHARP_0 = 0x7118, - QK_MIDI_NOTE_A_0 = 0x7119, - QK_MIDI_NOTE_A_SHARP_0 = 0x711A, - QK_MIDI_NOTE_B_0 = 0x711B, - QK_MIDI_NOTE_C_1 = 0x7120, - QK_MIDI_NOTE_C_SHARP_1 = 0x7121, - QK_MIDI_NOTE_D_1 = 0x7122, - QK_MIDI_NOTE_D_SHARP_1 = 0x7123, - QK_MIDI_NOTE_E_1 = 0x7124, - QK_MIDI_NOTE_F_1 = 0x7125, - QK_MIDI_NOTE_F_SHARP_1 = 0x7126, - QK_MIDI_NOTE_G_1 = 0x7127, - QK_MIDI_NOTE_G_SHARP_1 = 0x7128, - QK_MIDI_NOTE_A_1 = 0x7129, - QK_MIDI_NOTE_A_SHARP_1 = 0x712A, - QK_MIDI_NOTE_B_1 = 0x712B, - QK_MIDI_NOTE_C_2 = 0x7130, - QK_MIDI_NOTE_C_SHARP_2 = 0x7131, - QK_MIDI_NOTE_D_2 = 0x7132, - QK_MIDI_NOTE_D_SHARP_2 = 0x7133, - QK_MIDI_NOTE_E_2 = 0x7134, - QK_MIDI_NOTE_F_2 = 0x7135, - QK_MIDI_NOTE_F_SHARP_2 = 0x7136, - QK_MIDI_NOTE_G_2 = 0x7137, - QK_MIDI_NOTE_G_SHARP_2 = 0x7138, - QK_MIDI_NOTE_A_2 = 0x7139, - QK_MIDI_NOTE_A_SHARP_2 = 0x713A, - QK_MIDI_NOTE_B_2 = 0x713B, - QK_MIDI_NOTE_C_3 = 0x7140, - QK_MIDI_NOTE_C_SHARP_3 = 0x7141, - QK_MIDI_NOTE_D_3 = 0x7142, - QK_MIDI_NOTE_D_SHARP_3 = 0x7143, - QK_MIDI_NOTE_E_3 = 0x7144, - QK_MIDI_NOTE_F_3 = 0x7145, - QK_MIDI_NOTE_F_SHARP_3 = 0x7146, - QK_MIDI_NOTE_G_3 = 0x7147, - QK_MIDI_NOTE_G_SHARP_3 = 0x7148, - QK_MIDI_NOTE_A_3 = 0x7149, - QK_MIDI_NOTE_A_SHARP_3 = 0x714A, - QK_MIDI_NOTE_B_3 = 0x714B, - QK_MIDI_NOTE_C_4 = 0x7150, - QK_MIDI_NOTE_C_SHARP_4 = 0x7151, - QK_MIDI_NOTE_D_4 = 0x7152, - QK_MIDI_NOTE_D_SHARP_4 = 0x7153, - QK_MIDI_NOTE_E_4 = 0x7154, - QK_MIDI_NOTE_F_4 = 0x7155, - QK_MIDI_NOTE_F_SHARP_4 = 0x7156, - QK_MIDI_NOTE_G_4 = 0x7157, - QK_MIDI_NOTE_G_SHARP_4 = 0x7158, - QK_MIDI_NOTE_A_4 = 0x7159, - QK_MIDI_NOTE_A_SHARP_4 = 0x715A, - QK_MIDI_NOTE_B_4 = 0x715B, - QK_MIDI_NOTE_C_5 = 0x7160, - QK_MIDI_NOTE_C_SHARP_5 = 0x7161, - QK_MIDI_NOTE_D_5 = 0x7162, - QK_MIDI_NOTE_D_SHARP_5 = 0x7163, - QK_MIDI_NOTE_E_5 = 0x7164, - QK_MIDI_NOTE_F_5 = 0x7165, - QK_MIDI_NOTE_F_SHARP_5 = 0x7166, - QK_MIDI_NOTE_G_5 = 0x7167, - QK_MIDI_NOTE_G_SHARP_5 = 0x7168, - QK_MIDI_NOTE_A_5 = 0x7169, - QK_MIDI_NOTE_A_SHARP_5 = 0x716A, - QK_MIDI_NOTE_B_5 = 0x716B, - QK_MIDI_OCTAVE_N2 = 0x7170, - QK_MIDI_OCTAVE_N1 = 0x7171, - QK_MIDI_OCTAVE_0 = 0x7172, - QK_MIDI_OCTAVE_1 = 0x7173, - QK_MIDI_OCTAVE_2 = 0x7174, - QK_MIDI_OCTAVE_3 = 0x7175, - QK_MIDI_OCTAVE_4 = 0x7176, - QK_MIDI_OCTAVE_5 = 0x7177, - QK_MIDI_OCTAVE_6 = 0x7178, - QK_MIDI_OCTAVE_7 = 0x7179, - QK_MIDI_OCTAVE_DOWN = 0x717A, - QK_MIDI_OCTAVE_UP = 0x717B, - QK_MIDI_TRANSPOSE_N6 = 0x7180, - QK_MIDI_TRANSPOSE_N5 = 0x7181, - QK_MIDI_TRANSPOSE_N4 = 0x7182, - QK_MIDI_TRANSPOSE_N3 = 0x7183, - QK_MIDI_TRANSPOSE_N2 = 0x7184, - QK_MIDI_TRANSPOSE_N1 = 0x7185, - QK_MIDI_TRANSPOSE_0 = 0x7186, - QK_MIDI_TRANSPOSE_1 = 0x7187, - QK_MIDI_TRANSPOSE_2 = 0x7188, - QK_MIDI_TRANSPOSE_3 = 0x7189, - QK_MIDI_TRANSPOSE_4 = 0x718A, - QK_MIDI_TRANSPOSE_5 = 0x718B, - QK_MIDI_TRANSPOSE_6 = 0x718C, - QK_MIDI_TRANSPOSE_DOWN = 0x718D, - QK_MIDI_TRANSPOSE_UP = 0x718E, - QK_MIDI_VELOCITY_0 = 0x7190, - QK_MIDI_VELOCITY_1 = 0x7191, - QK_MIDI_VELOCITY_2 = 0x7192, - QK_MIDI_VELOCITY_3 = 0x7193, - QK_MIDI_VELOCITY_4 = 0x7194, - QK_MIDI_VELOCITY_5 = 0x7195, - QK_MIDI_VELOCITY_6 = 0x7196, - QK_MIDI_VELOCITY_7 = 0x7197, - QK_MIDI_VELOCITY_8 = 0x7198, - QK_MIDI_VELOCITY_9 = 0x7199, - QK_MIDI_VELOCITY_10 = 0x719A, - QK_MIDI_VELOCITY_DOWN = 0x719B, - QK_MIDI_VELOCITY_UP = 0x719C, - QK_MIDI_CHANNEL_1 = 0x71A0, - QK_MIDI_CHANNEL_2 = 0x71A1, - QK_MIDI_CHANNEL_3 = 0x71A2, - QK_MIDI_CHANNEL_4 = 0x71A3, - QK_MIDI_CHANNEL_5 = 0x71A4, - QK_MIDI_CHANNEL_6 = 0x71A5, - QK_MIDI_CHANNEL_7 = 0x71A6, - QK_MIDI_CHANNEL_8 = 0x71A7, - QK_MIDI_CHANNEL_9 = 0x71A8, - QK_MIDI_CHANNEL_10 = 0x71A9, - QK_MIDI_CHANNEL_11 = 0x71AA, - QK_MIDI_CHANNEL_12 = 0x71AB, - QK_MIDI_CHANNEL_13 = 0x71AC, - QK_MIDI_CHANNEL_14 = 0x71AD, - QK_MIDI_CHANNEL_15 = 0x71AE, - QK_MIDI_CHANNEL_16 = 0x71AF, - QK_MIDI_CHANNEL_DOWN = 0x71B0, - QK_MIDI_CHANNEL_UP = 0x71B1, - QK_MIDI_ALL_NOTES_OFF = 0x71C0, - QK_MIDI_SUSTAIN = 0x71C1, - QK_MIDI_PORTAMENTO = 0x71C2, - QK_MIDI_SOSTENUTO = 0x71C3, - QK_MIDI_SOFT = 0x71C4, - QK_MIDI_LEGATO = 0x71C5, - QK_MIDI_MODULATION = 0x71C6, - QK_MIDI_MODULATION_SPEED_DOWN = 0x71C7, - QK_MIDI_MODULATION_SPEED_UP = 0x71C8, - QK_MIDI_PITCH_BEND_DOWN = 0x71C9, - QK_MIDI_PITCH_BEND_UP = 0x71CA, + QK_MIDI_NOTE_C_0 = 0x7103, + QK_MIDI_NOTE_C_SHARP_0 = 0x7104, + QK_MIDI_NOTE_D_0 = 0x7105, + QK_MIDI_NOTE_D_SHARP_0 = 0x7106, + QK_MIDI_NOTE_E_0 = 0x7107, + QK_MIDI_NOTE_F_0 = 0x7108, + QK_MIDI_NOTE_F_SHARP_0 = 0x7109, + QK_MIDI_NOTE_G_0 = 0x710A, + QK_MIDI_NOTE_G_SHARP_0 = 0x710B, + QK_MIDI_NOTE_A_0 = 0x710C, + QK_MIDI_NOTE_A_SHARP_0 = 0x710D, + QK_MIDI_NOTE_B_0 = 0x710E, + QK_MIDI_NOTE_C_1 = 0x710F, + QK_MIDI_NOTE_C_SHARP_1 = 0x7110, + QK_MIDI_NOTE_D_1 = 0x7111, + QK_MIDI_NOTE_D_SHARP_1 = 0x7112, + QK_MIDI_NOTE_E_1 = 0x7113, + QK_MIDI_NOTE_F_1 = 0x7114, + QK_MIDI_NOTE_F_SHARP_1 = 0x7115, + QK_MIDI_NOTE_G_1 = 0x7116, + QK_MIDI_NOTE_G_SHARP_1 = 0x7117, + QK_MIDI_NOTE_A_1 = 0x7118, + QK_MIDI_NOTE_A_SHARP_1 = 0x7119, + QK_MIDI_NOTE_B_1 = 0x711A, + QK_MIDI_NOTE_C_2 = 0x711B, + QK_MIDI_NOTE_C_SHARP_2 = 0x711C, + QK_MIDI_NOTE_D_2 = 0x711D, + QK_MIDI_NOTE_D_SHARP_2 = 0x711E, + QK_MIDI_NOTE_E_2 = 0x711F, + QK_MIDI_NOTE_F_2 = 0x7120, + QK_MIDI_NOTE_F_SHARP_2 = 0x7121, + QK_MIDI_NOTE_G_2 = 0x7122, + QK_MIDI_NOTE_G_SHARP_2 = 0x7123, + QK_MIDI_NOTE_A_2 = 0x7124, + QK_MIDI_NOTE_A_SHARP_2 = 0x7125, + QK_MIDI_NOTE_B_2 = 0x7126, + QK_MIDI_NOTE_C_3 = 0x7127, + QK_MIDI_NOTE_C_SHARP_3 = 0x7128, + QK_MIDI_NOTE_D_3 = 0x7129, + QK_MIDI_NOTE_D_SHARP_3 = 0x712A, + QK_MIDI_NOTE_E_3 = 0x712B, + QK_MIDI_NOTE_F_3 = 0x712C, + QK_MIDI_NOTE_F_SHARP_3 = 0x712D, + QK_MIDI_NOTE_G_3 = 0x712E, + QK_MIDI_NOTE_G_SHARP_3 = 0x712F, + QK_MIDI_NOTE_A_3 = 0x7130, + QK_MIDI_NOTE_A_SHARP_3 = 0x7131, + QK_MIDI_NOTE_B_3 = 0x7132, + QK_MIDI_NOTE_C_4 = 0x7133, + QK_MIDI_NOTE_C_SHARP_4 = 0x7134, + QK_MIDI_NOTE_D_4 = 0x7135, + QK_MIDI_NOTE_D_SHARP_4 = 0x7136, + QK_MIDI_NOTE_E_4 = 0x7137, + QK_MIDI_NOTE_F_4 = 0x7138, + QK_MIDI_NOTE_F_SHARP_4 = 0x7139, + QK_MIDI_NOTE_G_4 = 0x713A, + QK_MIDI_NOTE_G_SHARP_4 = 0x713B, + QK_MIDI_NOTE_A_4 = 0x713C, + QK_MIDI_NOTE_A_SHARP_4 = 0x713D, + QK_MIDI_NOTE_B_4 = 0x713E, + QK_MIDI_NOTE_C_5 = 0x713F, + QK_MIDI_NOTE_C_SHARP_5 = 0x7140, + QK_MIDI_NOTE_D_5 = 0x7141, + QK_MIDI_NOTE_D_SHARP_5 = 0x7142, + QK_MIDI_NOTE_E_5 = 0x7143, + QK_MIDI_NOTE_F_5 = 0x7144, + QK_MIDI_NOTE_F_SHARP_5 = 0x7145, + QK_MIDI_NOTE_G_5 = 0x7146, + QK_MIDI_NOTE_G_SHARP_5 = 0x7147, + QK_MIDI_NOTE_A_5 = 0x7148, + QK_MIDI_NOTE_A_SHARP_5 = 0x7149, + QK_MIDI_NOTE_B_5 = 0x714A, + QK_MIDI_OCTAVE_N2 = 0x714B, + QK_MIDI_OCTAVE_N1 = 0x714C, + QK_MIDI_OCTAVE_0 = 0x714D, + QK_MIDI_OCTAVE_1 = 0x714E, + QK_MIDI_OCTAVE_2 = 0x714F, + QK_MIDI_OCTAVE_3 = 0x7150, + QK_MIDI_OCTAVE_4 = 0x7151, + QK_MIDI_OCTAVE_5 = 0x7152, + QK_MIDI_OCTAVE_6 = 0x7153, + QK_MIDI_OCTAVE_7 = 0x7154, + QK_MIDI_OCTAVE_DOWN = 0x7155, + QK_MIDI_OCTAVE_UP = 0x7156, + QK_MIDI_TRANSPOSE_N6 = 0x7157, + QK_MIDI_TRANSPOSE_N5 = 0x7158, + QK_MIDI_TRANSPOSE_N4 = 0x7159, + QK_MIDI_TRANSPOSE_N3 = 0x715A, + QK_MIDI_TRANSPOSE_N2 = 0x715B, + QK_MIDI_TRANSPOSE_N1 = 0x715C, + QK_MIDI_TRANSPOSE_0 = 0x715D, + QK_MIDI_TRANSPOSE_1 = 0x715E, + QK_MIDI_TRANSPOSE_2 = 0x715F, + QK_MIDI_TRANSPOSE_3 = 0x7160, + QK_MIDI_TRANSPOSE_4 = 0x7161, + QK_MIDI_TRANSPOSE_5 = 0x7162, + QK_MIDI_TRANSPOSE_6 = 0x7163, + QK_MIDI_TRANSPOSE_DOWN = 0x7164, + QK_MIDI_TRANSPOSE_UP = 0x7165, + QK_MIDI_VELOCITY_0 = 0x7166, + QK_MIDI_VELOCITY_1 = 0x7167, + QK_MIDI_VELOCITY_2 = 0x7168, + QK_MIDI_VELOCITY_3 = 0x7169, + QK_MIDI_VELOCITY_4 = 0x716A, + QK_MIDI_VELOCITY_5 = 0x716B, + QK_MIDI_VELOCITY_6 = 0x716C, + QK_MIDI_VELOCITY_7 = 0x716D, + QK_MIDI_VELOCITY_8 = 0x716E, + QK_MIDI_VELOCITY_9 = 0x716F, + QK_MIDI_VELOCITY_10 = 0x7170, + QK_MIDI_VELOCITY_DOWN = 0x7171, + QK_MIDI_VELOCITY_UP = 0x7172, + QK_MIDI_CHANNEL_1 = 0x7173, + QK_MIDI_CHANNEL_2 = 0x7174, + QK_MIDI_CHANNEL_3 = 0x7175, + QK_MIDI_CHANNEL_4 = 0x7176, + QK_MIDI_CHANNEL_5 = 0x7177, + QK_MIDI_CHANNEL_6 = 0x7178, + QK_MIDI_CHANNEL_7 = 0x7179, + QK_MIDI_CHANNEL_8 = 0x717A, + QK_MIDI_CHANNEL_9 = 0x717B, + QK_MIDI_CHANNEL_10 = 0x717C, + QK_MIDI_CHANNEL_11 = 0x717D, + QK_MIDI_CHANNEL_12 = 0x717E, + QK_MIDI_CHANNEL_13 = 0x717F, + QK_MIDI_CHANNEL_14 = 0x7180, + QK_MIDI_CHANNEL_15 = 0x7181, + QK_MIDI_CHANNEL_16 = 0x7182, + QK_MIDI_CHANNEL_DOWN = 0x7183, + QK_MIDI_CHANNEL_UP = 0x7184, + QK_MIDI_ALL_NOTES_OFF = 0x7185, + QK_MIDI_SUSTAIN = 0x7186, + QK_MIDI_PORTAMENTO = 0x7187, + QK_MIDI_SOSTENUTO = 0x7188, + QK_MIDI_SOFT = 0x7189, + QK_MIDI_LEGATO = 0x718A, + QK_MIDI_MODULATION = 0x718B, + QK_MIDI_MODULATION_SPEED_DOWN = 0x718C, + QK_MIDI_MODULATION_SPEED_UP = 0x718D, + QK_MIDI_PITCH_BEND_DOWN = 0x718E, + QK_MIDI_PITCH_BEND_UP = 0x718F, SQ_ON = 0x7200, SQ_OFF = 0x7201, SQ_TOG = 0x7202, -- cgit v1.3.1 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 +++ data/schemas/keyboard.jsonschema | 2 +- docs/feature_converters.md | 27 ++++++++++++--- docs/platformdev_rp2040.md | 15 +++++++++ docs/squeezing_avr.md | 1 + .../converters/elite_c_to_elite_pi/_pin_defs.h | 39 ---------------------- .../converters/elite_c_to_elite_pi/converter.mk | 9 ----- .../elite_c_to_elite_pi/pre_converter.mk | 2 ++ .../converters/elite_c_to_helios/pre_converter.mk | 2 ++ .../converters/elite_c_to_rp2040_ce/_pin_defs.h | 39 ++++++++++++++++++++++ .../converters/elite_c_to_rp2040_ce/converter.mk | 10 ++++++ .../converters/promicro_to_elite_pi/_pin_defs.h | 36 -------------------- .../converters/promicro_to_elite_pi/converter.mk | 9 ----- .../promicro_to_elite_pi/pre_converter.mk | 2 ++ .../converters/promicro_to_helios/pre_converter.mk | 2 ++ .../converters/promicro_to_rp2040_ce/_pin_defs.h | 36 ++++++++++++++++++++ .../converters/promicro_to_rp2040_ce/converter.mk | 10 ++++++ 17 files changed, 148 insertions(+), 98 deletions(-) delete mode 100644 platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h delete mode 100644 platforms/chibios/converters/elite_c_to_elite_pi/converter.mk create mode 100644 platforms/chibios/converters/elite_c_to_elite_pi/pre_converter.mk create mode 100644 platforms/chibios/converters/elite_c_to_helios/pre_converter.mk create mode 100644 platforms/chibios/converters/elite_c_to_rp2040_ce/_pin_defs.h create mode 100644 platforms/chibios/converters/elite_c_to_rp2040_ce/converter.mk delete mode 100644 platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h delete mode 100644 platforms/chibios/converters/promicro_to_elite_pi/converter.mk create mode 100644 platforms/chibios/converters/promicro_to_elite_pi/pre_converter.mk create mode 100644 platforms/chibios/converters/promicro_to_helios/pre_converter.mk create mode 100644 platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h create mode 100644 platforms/chibios/converters/promicro_to_rp2040_ce/converter.mk (limited to 'data') 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" } } } diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 1f89bfeaa7..95387ba367 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -34,7 +34,7 @@ }, "development_board": { "type": "string", - "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4"] + "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios"] }, "pin_compatible": { "type": "string", diff --git a/docs/feature_converters.md b/docs/feature_converters.md index df42acac59..9baac14e97 100644 --- a/docs/feature_converters.md +++ b/docs/feature_converters.md @@ -18,9 +18,14 @@ Currently the following converters are available: | `promicro` | `stemcell` | | `promicro` | `bonsai_c4` | | `promicro` | `elite_pi` | +| `promicro` | `rp2040_ce` | +| `promicro` | `elite_pi` | +| `promicro` | `helios` | | `promicro` | `michi` | | `elite_c` | `stemcell` | +| `elite_c` | `rp2040_ce` | | `elite_c` | `elite_pi` | +| `elite_c` | `helios` | See below for more in depth information on each converter. @@ -82,6 +87,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co | [STeMCell](https://github.com/megamind4089/STeMCell) | `stemcell` | | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4` | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | +| [0xCB Helios](https://keeb.supply/products/0xcb-helios) | `helios` | | [Michi](https://github.com/ci-bus/michi-promicro-rp2040) | `michi` | Converter summary: @@ -95,7 +101,9 @@ Converter summary: | `bit_c_pro` | `-e CONVERT_TO=bit_c_pro` | `CONVERT_TO=bit_c_pro` | `#ifdef CONVERT_TO_BIT_C_PRO` | | `stemcell` | `-e CONVERT_TO=stemcell` | `CONVERT_TO=stemcell` | `#ifdef CONVERT_TO_STEMCELL` | | `bonsai_c4` | `-e CONVERT_TO=bonsai_c4` | `CONVERT_TO=bonsai_c4` | `#ifdef CONVERT_TO_BONSAI_C4` | +| `rp2040_ce` | `-e CONVERT_TO=rp2040_ce` | `CONVERT_TO=rp2040_ce` | `#ifdef CONVERT_TO_RP2040_CE` | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | +| `helios` | `-e CONVERT_TO=helios` | `CONVERT_TO=helios` | `#ifdef CONVERT_TO_HELIOS` | | `michi` | `-e CONVERT_TO=michi` | `CONVERT_TO=michi` | `#ifdef CONVERT_TO_MICHI` | ### Proton C :id=proton_c @@ -127,7 +135,7 @@ The following defaults are based on what has been implemented for [RP2040](platf | USB Host (e.g. USB-USB converter) | Not supported (USB host code is AVR specific and is not currently supported on ARM) | | [Split keyboards](feature_split_keyboard.md) | Partial via `PIO` vendor driver - heavily dependent on enabled features | -### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO, Elite-Pi and Michi :id=promicro_rp2040 +### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO and Michi :id=promicro_rp2040 Currently identical to [Adafruit KB2040](#kb2040). @@ -156,10 +164,18 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro ```c #undef B0 -// If Vbus detection is unused, we can send RXLED to the Vbus detect pin instead +// If VBUS detection is unused, we can send RXLED to the Vbus detect pin instead #define B0 PAL_LINE(GPIOA, 9) ``` +### RP2040 Community Edition - Elite-Pi and Helios :id=rp2040_ce + +Feature set currently identical to [Adafruit KB2040](#kb2040). + +Enables VBUS detection by default for superior split keyboard support. + +For more information, refer to the [RP2040 Community Edition](platformdev_rp2040.md#rp2040_ce) docs. + ## Elite-C If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4), the supported alternative controllers are: @@ -168,18 +184,21 @@ If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products |----------------------------------------------------------------------------------|-------------------| | [STeMCell](https://github.com/megamind4089/STeMCell) | `stemcell` | | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi` | +| [0xCB Helios](https://keeb.supply/products/0xcb-helios) | `helios` | Converter summary: | Target | Argument | `rules.mk` | Condition | |-------------------|---------------------------------|------------------------------|-------------------------------------| | `stemcell` | `-e CONVERT_TO=stemcell` | `CONVERT_TO=stemcell` | `#ifdef CONVERT_TO_STEMCELL` | +| `rp2040_ce` | `-e CONVERT_TO=rp2040_ce` | `CONVERT_TO=rp2040_ce` | `#ifdef CONVERT_TO_RP2040_CE` | | `elite_pi` | `-e CONVERT_TO=elite_pi` | `CONVERT_TO=elite_pi` | `#ifdef CONVERT_TO_ELITE_PI` | +| `helios` | `-e CONVERT_TO=helios` | `CONVERT_TO=helios` | `#ifdef CONVERT_TO_HELIOS` | ### STeMCell :id=stemcell_elite Currently identical to [STeMCell](#stemcell) with support for the additional bottom row of pins. -### Elite-Pi :id=elite_pi +### RP2040 Community Edition :id=rp2040_ce_elite -Currently identical to [Adafruit KB2040](#kb2040), with support for the additional bottom row of pins. +Currently identical to [RP2040 Community Edition](#rp2040_ce), with support for the additional bottom row of pins. diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md index b5b32c7b08..890dadb6f0 100644 --- a/docs/platformdev_rp2040.md +++ b/docs/platformdev_rp2040.md @@ -124,3 +124,18 @@ As the RP2040 does not have any internal flash memory it depends on an external | W25X10CL | `#define RP2040_FLASH_W25X10CL` | | IS25LP080 | `#define RP2040_FLASH_IS25LP080` | | Generic 03H flash | `#define RP2040_FLASH_GENERIC_03H` | + +## RP2040 Community Edition :id=rp2040_ce + +The "RP2040 Community Edition" standard is a pinout that was defined by a committee of designers on the BastardKB Discord server. + +These boards are designed to be a drop-in replacement for keyboards wanting an upgrade from ATmega32u4 based pro micros (eg. Elite-C). + +| Pinout Compatible Controllers | +| -------------------------------------------------------------------------------- | +| [0xB2 Splinky](https://github.com/plut0nium/0xB2/) | +| [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | +| [Sea-Picro EXT](https://github.com/joshajohnson/sea-picro) | +| [0xCB Helios](https://keeb.supply/products/0xcb-helios) | +| [Frood](https://github.com/piit79/Frood) | +| [Liatris](https://splitkb.com/products/liatris) | diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md index 60cda69c18..62db7f2471 100644 --- a/docs/squeezing_avr.md +++ b/docs/squeezing_avr.md @@ -193,6 +193,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers: * [SparkFun Pro Micro - RP2040](https://www.sparkfun.com/products/18288) * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) +* [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop) * [Michi](https://github.com/ci-bus/michi-promicro-rp2040) There are other, non-Pro Micro compatible boards out there. The most popular being: diff --git a/platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h b/platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h deleted file mode 100644 index 98dd37e279..0000000000 --- a/platforms/chibios/converters/elite_c_to_elite_pi/_pin_defs.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Left side (front) -#define D3 0U -#define D2 1U -// GND -// GND -#define D1 2U -#define D0 3U -#define D4 4U -#define C6 5U -#define D7 6U -#define E6 7U -#define B4 8U -#define B5 9U - -// Right side (front) -// RAW -// GND -// RESET -// VCC -#define F4 29U -#define F5 28U -#define F6 27U -#define F7 26U -#define B1 22U -#define B3 20U -#define B2 23U -#define B6 21U - -// Bottom row -#define B7 12U -#define D5 13U -#define C7 14U -#define F1 15U -#define F0 16U diff --git a/platforms/chibios/converters/elite_c_to_elite_pi/converter.mk b/platforms/chibios/converters/elite_c_to_elite_pi/converter.mk deleted file mode 100644 index 590a004189..0000000000 --- a/platforms/chibios/converters/elite_c_to_elite_pi/converter.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Elite-Pi MCU settings for converting AVR projects -MCU := RP2040 -BOARD := QMK_PM2040 -BOOTLOADER := rp2040 - -# These are defaults based on what has been implemented for RP2040 boards -SERIAL_DRIVER ?= vendor -WS2812_DRIVER ?= vendor -BACKLIGHT_DRIVER ?= software diff --git a/platforms/chibios/converters/elite_c_to_elite_pi/pre_converter.mk b/platforms/chibios/converters/elite_c_to_elite_pi/pre_converter.mk new file mode 100644 index 0000000000..b38823fa5f --- /dev/null +++ b/platforms/chibios/converters/elite_c_to_elite_pi/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/elite_c_to_rp2040_ce +ACTIVE_CONVERTER:=rp2040_ce diff --git a/platforms/chibios/converters/elite_c_to_helios/pre_converter.mk b/platforms/chibios/converters/elite_c_to_helios/pre_converter.mk new file mode 100644 index 0000000000..b38823fa5f --- /dev/null +++ b/platforms/chibios/converters/elite_c_to_helios/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/elite_c_to_rp2040_ce +ACTIVE_CONVERTER:=rp2040_ce diff --git a/platforms/chibios/converters/elite_c_to_rp2040_ce/_pin_defs.h b/platforms/chibios/converters/elite_c_to_rp2040_ce/_pin_defs.h new file mode 100644 index 0000000000..b5fd88fc36 --- /dev/null +++ b/platforms/chibios/converters/elite_c_to_rp2040_ce/_pin_defs.h @@ -0,0 +1,39 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// Left side (front) +#define D3 0U +#define D2 1U +// GND +// GND +#define D1 2U +#define D0 3U +#define D4 4U +#define C6 5U +#define D7 6U +#define E6 7U +#define B4 8U +#define B5 9U + +// Right side (front) +// RAW +// GND +// RESET +// VCC +#define F4 29U +#define F5 28U +#define F6 27U +#define F7 26U +#define B1 22U +#define B3 20U +#define B2 23U +#define B6 21U + +// Bottom row +#define B7 12U +#define D5 13U +#define C7 14U +#define F1 15U +#define F0 16U diff --git a/platforms/chibios/converters/elite_c_to_rp2040_ce/converter.mk b/platforms/chibios/converters/elite_c_to_rp2040_ce/converter.mk new file mode 100644 index 0000000000..bfca20cd99 --- /dev/null +++ b/platforms/chibios/converters/elite_c_to_rp2040_ce/converter.mk @@ -0,0 +1,10 @@ +# rp2040_ce MCU settings for converting AVR projects +MCU := RP2040 +BOARD := QMK_PM2040 +BOOTLOADER := rp2040 + +# These are defaults based on what has been implemented for RP2040 boards +SERIAL_DRIVER ?= vendor +WS2812_DRIVER ?= vendor +BACKLIGHT_DRIVER ?= software +OPT_DEFS += -DUSB_VBUS_PIN=19U diff --git a/platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h b/platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h deleted file mode 100644 index 1372bef79e..0000000000 --- a/platforms/chibios/converters/promicro_to_elite_pi/_pin_defs.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Left side (front) -#define D3 0U -#define D2 1U -// GND -// GND -#define D1 2U -#define D0 3U -#define D4 4U -#define C6 5U -#define D7 6U -#define E6 7U -#define B4 8U -#define B5 9U - -// Right side (front) -// RAW -// GND -// RESET -// VCC -#define F4 29U -#define F5 28U -#define F6 27U -#define F7 26U -#define B1 22U -#define B3 20U -#define B2 23U -#define B6 21U - -// LEDs -#define D5 12U -#define B0 13U diff --git a/platforms/chibios/converters/promicro_to_elite_pi/converter.mk b/platforms/chibios/converters/promicro_to_elite_pi/converter.mk deleted file mode 100644 index 590a004189..0000000000 --- a/platforms/chibios/converters/promicro_to_elite_pi/converter.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Elite-Pi MCU settings for converting AVR projects -MCU := RP2040 -BOARD := QMK_PM2040 -BOOTLOADER := rp2040 - -# These are defaults based on what has been implemented for RP2040 boards -SERIAL_DRIVER ?= vendor -WS2812_DRIVER ?= vendor -BACKLIGHT_DRIVER ?= software diff --git a/platforms/chibios/converters/promicro_to_elite_pi/pre_converter.mk b/platforms/chibios/converters/promicro_to_elite_pi/pre_converter.mk new file mode 100644 index 0000000000..7b3130a5e9 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_elite_pi/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/promicro_to_rp2040_ce +ACTIVE_CONVERTER:=rp2040_ce diff --git a/platforms/chibios/converters/promicro_to_helios/pre_converter.mk b/platforms/chibios/converters/promicro_to_helios/pre_converter.mk new file mode 100644 index 0000000000..7b3130a5e9 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_helios/pre_converter.mk @@ -0,0 +1,2 @@ +CONVERTER:=platforms/chibios/converters/promicro_to_rp2040_ce +ACTIVE_CONVERTER:=rp2040_ce diff --git a/platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h b/platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h new file mode 100644 index 0000000000..0109f884d4 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h @@ -0,0 +1,36 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// Left side (front) +#define D3 0U +#define D2 1U +// GND +// GND +#define D1 2U +#define D0 3U +#define D4 4U +#define C6 5U +#define D7 6U +#define E6 7U +#define B4 8U +#define B5 9U + +// Right side (front) +// RAW +// GND +// RESET +// VCC +#define F4 29U +#define F5 28U +#define F6 27U +#define F7 26U +#define B1 22U +#define B3 20U +#define B2 23U +#define B6 21U + +// LEDs +#define D5 12U +#define B0 13U diff --git a/platforms/chibios/converters/promicro_to_rp2040_ce/converter.mk b/platforms/chibios/converters/promicro_to_rp2040_ce/converter.mk new file mode 100644 index 0000000000..bfca20cd99 --- /dev/null +++ b/platforms/chibios/converters/promicro_to_rp2040_ce/converter.mk @@ -0,0 +1,10 @@ +# rp2040_ce MCU settings for converting AVR projects +MCU := RP2040 +BOARD := QMK_PM2040 +BOOTLOADER := rp2040 + +# These are defaults based on what has been implemented for RP2040 boards +SERIAL_DRIVER ?= vendor +WS2812_DRIVER ?= vendor +BACKLIGHT_DRIVER ?= software +OPT_DEFS += -DUSB_VBUS_PIN=19U -- cgit v1.3.1 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 + keyboards/brick/brick.c | 31 --- keyboards/brick/brick.h | 60 ----- keyboards/brick/config.h | 44 ---- keyboards/brick/info.json | 25 --- keyboards/brick/keymaps/default/keymap.c | 74 ------- keyboards/brick/keymaps/via/keymap.c | 48 ---- keyboards/brick/keymaps/via/rules.mk | 1 - keyboards/brick/readme.md | 24 -- keyboards/brick/rules.mk | 14 -- keyboards/pauperboards/brick/brick.c | 31 +++ keyboards/pauperboards/brick/info.json | 245 +++++++++++++++++++++ .../pauperboards/brick/keymaps/default/keymap.c | 74 +++++++ keyboards/pauperboards/brick/keymaps/via/keymap.c | 48 ++++ keyboards/pauperboards/brick/keymaps/via/rules.mk | 1 + keyboards/pauperboards/brick/readme.md | 28 +++ keyboards/pauperboards/brick/rules.mk | 1 + 17 files changed, 431 insertions(+), 321 deletions(-) delete mode 100644 keyboards/brick/brick.c delete mode 100644 keyboards/brick/brick.h delete mode 100644 keyboards/brick/config.h delete mode 100644 keyboards/brick/info.json delete mode 100644 keyboards/brick/keymaps/default/keymap.c delete mode 100644 keyboards/brick/keymaps/via/keymap.c delete mode 100644 keyboards/brick/keymaps/via/rules.mk delete mode 100644 keyboards/brick/readme.md delete mode 100644 keyboards/brick/rules.mk create mode 100644 keyboards/pauperboards/brick/brick.c create mode 100644 keyboards/pauperboards/brick/info.json create mode 100644 keyboards/pauperboards/brick/keymaps/default/keymap.c create mode 100644 keyboards/pauperboards/brick/keymaps/via/keymap.c create mode 100644 keyboards/pauperboards/brick/keymaps/via/rules.mk create mode 100644 keyboards/pauperboards/brick/readme.md create mode 100644 keyboards/pauperboards/brick/rules.mk (limited to 'data') 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" }, diff --git a/keyboards/brick/brick.c b/keyboards/brick/brick.c deleted file mode 100644 index 8c97cf97ff..0000000000 --- a/keyboards/brick/brick.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2023 Juno Nguyen - * - * 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 2 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 . - */ - -#include "brick.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} -#endif \ No newline at end of file diff --git a/keyboards/brick/brick.h b/keyboards/brick/brick.h deleted file mode 100644 index 0e9a7e7c61..0000000000 --- a/keyboards/brick/brick.h +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2023 Juno Nguyen - * - * 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 2 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 . - */ - -#pragma once - -#include "quantum.h" -#define XXX KC_NO - -#define LAYOUT_ortho_2x2u( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k31, k32, k33, k35, k36, k38, k39, k3a \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ - { XXX, k31, k32, k33, XXX, k35, k36, XXX, k38, k39, k3a, XXX } \ -} - -#define LAYOUT_mit( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k31, k32, k33, k34, k35, k37, k38, k39, k3a \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ - { XXX, k31, k32, k33, k34, k35, XXX, k37, k38, k39, k3a, XXX } \ -} - -#define LAYOUT_ortho_4x12( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ -} - diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h deleted file mode 100644 index adb3238c6a..0000000000 --- a/keyboards/brick/config.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2023 Juno Nguyen - * - * 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 2 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 . - */ - -#pragma once - -#define MATRIX_ROW_PINS { D3, D5, F0, F1 } -#define MATRIX_COL_PINS { B1, B3, F7, F6, D4, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 8 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -# define RGBLIGHT_EFFECT_TWINKLE -#endif - -#define ENCODERS_PAD_A { F4 } -#define ENCODERS_PAD_B { F5 } \ No newline at end of file diff --git a/keyboards/brick/info.json b/keyboards/brick/info.json deleted file mode 100644 index d20615dbbd..0000000000 --- a/keyboards/brick/info.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "keyboard_name": "Brick", - "manufacturer": "Pauper", - "url": "https://p3dstore.com/products/cervello-pcb-only-group-buy", - "maintainer": "JunoNgx", - "usb": { - "vid": "0xFEFE", - "pid": "0x0001", - "device_version": "1.0.0" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "community_layouts": [ "ortho_4x12" ], - "layouts": { - "LAYOUT_ortho_2x2u": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] - }, - "LAYOUT_mit": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] - }, - "LAYOUT_ortho_4x12": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}] - } - } -} diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/brick/keymaps/default/keymap.c deleted file mode 100644 index f488834ea4..0000000000 --- a/keyboards/brick/keymaps/default/keymap.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2023 Juno Nguyen - * - * 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 2 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 . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Layer 0 - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | GUI | Caps | Alt |Layer1| Space |Layer2| / | Left | Down |Right | - * `-----------------------------------------------------------------------------------' - */ - [0] = LAYOUT_ortho_4x12 ( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT, - KC_LCTL, KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT - ), - - /* Layer 1 - * ,-----------------------------------------------------------------------------------. - * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | Vol- | Vol+ | Mute | | | | F11 | F12 | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Reset| | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ - [1] = LAYOUT_ortho_4x12 ( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - /* Layer 2 (r_ Indicates RGB Controls) - * ,-----------------------------------------------------------------------------------. - * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | |r_TOG |r_Mode|r_Hue+|r_Hue-| | | - | = | [ | ] | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |BL_TOG|BL_STEP| | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ - [2] = LAYOUT_ortho_4x12 ( - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/brick/keymaps/via/keymap.c deleted file mode 100644 index 693cc71752..0000000000 --- a/keyboards/brick/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2023 Juno Nguyen - * - * 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 2 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 . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT_ortho_4x12 ( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT, - KC_LCTL, KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT_ortho_4x12 ( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [2] = LAYOUT_ortho_4x12 ( - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [3] = LAYOUT_ortho_4x12 ( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; diff --git a/keyboards/brick/keymaps/via/rules.mk b/keyboards/brick/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3..0000000000 --- a/keyboards/brick/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/brick/readme.md b/keyboards/brick/readme.md deleted file mode 100644 index c7894743d0..0000000000 --- a/keyboards/brick/readme.md +++ /dev/null @@ -1,24 +0,0 @@ -# Brick - -A 40% ortholinear Planck-shaped keyboard with bottom blockers for Cervello. Created by Pauper. - -* Keyboard Maintainer: [Juno Nguyen](https://github.com/JunoNgx) -* Hardware Availability: [P3D Store](https://p3dstore.com/collections/invisibolt-acrylic-cases/products/cervello-invisibolt-acrylic-keyboard-case-and-pcb) - -Make example for this keyboard (after setting up your build environment): - - make brick:default - -Flashing example for this keyboard: - - make brick:default:flash - -## Bootloader - -Enter the bootloader in 3 ways: - -* **Bootmagic reset**: Hold down Escape and plug in the keyboard. -* **Physical reset button**: Briefly press the reset button below the pro-micro. -* **Keycode in layout**: The `QK_BOOT` key can be found by holding `FUNC` in between the space bars and pressing `ESC`. - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/brick/rules.mk b/keyboards/brick/rules.mk deleted file mode 100644 index e0c821feb2..0000000000 --- a/keyboards/brick/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/pauperboards/brick/brick.c b/keyboards/pauperboards/brick/brick.c new file mode 100644 index 0000000000..13df995e54 --- /dev/null +++ b/keyboards/pauperboards/brick/brick.c @@ -0,0 +1,31 @@ +/* Copyright 2023 Jason Chestnut @pauperboards + * + * 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 2 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 . + */ + +#include "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} +#endif diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json new file mode 100644 index 0000000000..a5dd2522cd --- /dev/null +++ b/keyboards/pauperboards/brick/info.json @@ -0,0 +1,245 @@ +{ + "keyboard_name": "Brick", + "manufacturer": "pauperboards", + "url": "https://p3dstore.com/products/cervello-pcb-only-group-buy", + "maintainer": "pauper", + "usb": { + "vid": "0xFEFE", + "pid": "0x0001", + "device_version": "0.2.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": [ "D3", "D5", "F0", "F1" ], + "cols": [ "B1", "B3", "F7", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7" ] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true, + "rgblight": true, + "lto": true + }, + "encoder": { + "rotary": [ + { "pin_a": "F4", "pin_b": "F5", "resolution": 4 } + ] + }, + "rgblight": { + "pin": "D2", + "led_count": 8, + "hue_steps": 8, + "brightness_steps": 8, + "saturation_steps": 8, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": false, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT_ortho_2x2u": { + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3,5], "label": "Space", "x": 4, "y": 3, "w": 2 }, + { "matrix": [3,6], "label": "Space", "x": 6, "y": 3, "w": 2 }, + { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, + { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, + { "matrix": [3,10], "label": "↑", "x": 10, "y": 3 } + ] + }, + "LAYOUT_mit": { + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3,4], "label": "⇓", "x": 4, "y": 3 }, + { "matrix": [3,5], "label": "Space", "x": 5, "y": 3, "w": 2 }, + { "matrix": [3,7], "label": "⇑", "x": 7, "y": 3 }, + { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, + { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, + { "matrix": [3,10], "label": "↑", "x": 10, "y": 3 } + ] + }, + "LAYOUT_ortho_4x12_hhkb": { + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3,4], "label": "&dArr", "x": 4, "y": 3 }, + { "matrix": [3,5], "label": "Space", "x": 5, "y": 3 }, + { "matrix": [3,6], "label": "Space", "x": 6, "y": 3 }, + { "matrix": [3,7], "label": "⇑", "x": 7, "y": 3 }, + { "matrix": [3,8], "label": "Super", "x": 8, "y": 3 }, + { "matrix": [3,9], "label": "Alt", "x": 9, "y": 3 }, + { "matrix": [3,10], "label": "Ctrl", "x": 10, "y": 3 } + ] + }, + "LAYOUT_ortho_bigbar": { + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3, "w": 1.5 }, + { "matrix": [3,5], "label": "Space", "x": 2.5, "y": 3, "w": 7 }, + { "matrix": [3,10], "label": "Alt", "x": 9.5, "y": 3, "w": 1.5 } + ] + } + } +} diff --git a/keyboards/pauperboards/brick/keymaps/default/keymap.c b/keyboards/pauperboards/brick/keymaps/default/keymap.c new file mode 100644 index 0000000000..a008d2d8c2 --- /dev/null +++ b/keyboards/pauperboards/brick/keymaps/default/keymap.c @@ -0,0 +1,74 @@ +/* Copyright 2023 Jason Chestnut @pauperboards + * + * 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 2 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Layer 0 + * ,-----------------------------------------------------------------------------------. + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Tab | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * `------+------+------+------+------+------+------+------+------+------+------+------' + * | Caps | Ctrl | Alt | Space L1 | Space L2 | Alt | GUI | Ctrl | + * `---------------------------------------------------------------------' + */ + [0] = LAYOUT_ortho_2x2u ( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT, + KC_CAPS, KC_LCTL, KC_LALT, LT(1,KC_SPC), LT(2,KC_SPC), KC_LALT, KC_LGUI, KC_LCTL + ), + + /* Layer 1 + * ,-----------------------------------------------------------------------------------. + * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | Vol- | Vol+ | Mute | | | | F11 | F12 | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | + * `---------------------------------------------------------------------' + */ + [1] = LAYOUT_ortho_2x2u ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + /* Layer 2 (r_ Indicates RGB Controls) + * ,-----------------------------------------------------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | |r_TOG |r_Mode|r_Hue+|r_Hue-| | | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |BL_TOG|BL_STEP| | | | | | | | | BOOT | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | + * `---------------------------------------------------------------------' + */ + [2] = LAYOUT_ortho_2x2u ( + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/pauperboards/brick/keymaps/via/keymap.c b/keyboards/pauperboards/brick/keymaps/via/keymap.c new file mode 100644 index 0000000000..e5b8e24e7f --- /dev/null +++ b/keyboards/pauperboards/brick/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2023 Jason Chestnut @pauperboards + * + * 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 2 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ortho_4x12_hhkb ( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT, + KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN + ), + + [1] = LAYOUT_ortho_4x12_hhkb ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_ortho_4x12_hhkb ( + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT_ortho_4x12_hhkb ( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/pauperboards/brick/keymaps/via/rules.mk b/keyboards/pauperboards/brick/keymaps/via/rules.mk new file mode 100644 index 0000000000..036bd6d1c3 --- /dev/null +++ b/keyboards/pauperboards/brick/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/pauperboards/brick/readme.md b/keyboards/pauperboards/brick/readme.md new file mode 100644 index 0000000000..1c627a21d0 --- /dev/null +++ b/keyboards/pauperboards/brick/readme.md @@ -0,0 +1,28 @@ +# Brick + +![Brick, top view](https://i.imgur.com/BLJ6Tumh.jpg) +![Brick, layout options](https://i.imgur.com/JhsWzY7h.png) + +Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for PCBs like the Niu Mini. Brick features a USB-C port, an ATMega32u4, RGB underglow, three possible rotary encoder locations, and multiple ortho layout options. + +* Keyboard Maintainer: [pauper](https://github.com/pauperboards) +* Hardware Supported: + * Brick v0.1 - prototype first run with red solder mask and needing a bodge wire across the top row encoder location. + * Brick v0.2 - same layout and components as v0.1, but with the bodge fixed. This version was run as part of Cervello group buy by [P3DStore](http://p3dstore.com). +* Hardware Availability: Some remaining pcbs might be available for purchase from [P3D](http://p3dstore.com/collections/pcbs/products/cervello-pcb-only-group-buy). + +Make example for this keyboard (after setting up your build environment): + + make pauperboards/brick:default + +Flashing example for this keyboard: + + make pauperboards/brick:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader +Enter the bootloader in one of 2 ways: + +* **Physical Reset Button**: Briefly press the button on the underside of the pcb, near the MCU. +* **Keycode**: Press the key mapped to `QK_BOOT` in your keymap, if available. diff --git a/keyboards/pauperboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk new file mode 100644 index 0000000000..333c4e5973 --- /dev/null +++ b/keyboards/pauperboards/brick/rules.mk @@ -0,0 +1 @@ +# This file intenionally left blank -- cgit v1.3.1 From f587a0c548d966bd4381236ed726f5ba733b67e2 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 18 Feb 2023 15:44:36 +0000 Subject: Align sequencer keycodes (#19875) --- .../keycodes/keycodes_0.0.2_sequencer.hjson | 69 ++++++++++++++++++++++ docs/feature_sequencer.md | 28 ++++----- quantum/keycodes.h | 29 +++++---- quantum/process_keycode/process_sequencer.c | 24 ++++---- quantum/quantum_keycodes_legacy.h | 1 + tests/test_common/keycode_table.cpp | 18 +++--- 6 files changed, 124 insertions(+), 45 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2_sequencer.hjson (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2_sequencer.hjson b/data/constants/keycodes/keycodes_0.0.2_sequencer.hjson new file mode 100644 index 0000000000..eedaed166c --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_sequencer.hjson @@ -0,0 +1,69 @@ +{ + "keycodes": { + "!reset!":0, + + "0x7200": { + "group": "sequencer", + "key": "QK_SEQUENCER_ON", + "aliases": [ + "SQ_ON" + ] + }, + "0x7201": { + "group": "sequencer", + "key": "QK_SEQUENCER_OFF", + "aliases": [ + "SQ_OFF" + ] + }, + "0x7202": { + "group": "sequencer", + "key": "QK_SEQUENCER_TOGGLE", + "aliases": [ + "SQ_TOGG" + ] + }, + "0x7203": { + "group": "sequencer", + "key": "QK_SEQUENCER_TEMPO_DOWN", + "aliases": [ + "SQ_TMPD" + ] + }, + "0x7204": { + "group": "sequencer", + "key": "QK_SEQUENCER_TEMPO_UP", + "aliases": [ + "SQ_TMPU" + ] + }, + "0x7205": { + "group": "sequencer", + "key": "QK_SEQUENCER_RESOLUTION_DOWN", + "aliases": [ + "SQ_RESD" + ] + }, + "0x7206": { + "group": "sequencer", + "key": "QK_SEQUENCER_RESOLUTION_UP", + "aliases": [ + "SQ_RESU" + ] + }, + "0x7207": { + "group": "sequencer", + "key": "QK_SEQUENCER_STEPS_ALL", + "aliases": [ + "SQ_SALL" + ] + }, + "0x7208": { + "group": "sequencer", + "key": "QK_SEQUENCER_STEPS_CLEAR", + "aliases": [ + "SQ_SCLR" + ] + } + } +} \ No newline at end of file diff --git a/docs/feature_sequencer.md b/docs/feature_sequencer.md index 76b4db5cf6..87a277400a 100644 --- a/docs/feature_sequencer.md +++ b/docs/feature_sequencer.md @@ -40,20 +40,20 @@ While the tempo defines the absolute speed at which the sequencer goes through t ## Keycodes -|Keycode |Description | -|------- |----------- | -|`SQ_ON` |Start the step sequencer | -|`SQ_OFF` |Stop the step sequencer | -|`SQ_TOG` |Toggle the step sequencer playback | -|`SQ_SALL`|Enable all the steps | -|`SQ_SCLR`|Disable all the steps | -|`SQ_S(n)`|Toggle the step `n` | -|`SQ_TMPD`|Decrease the tempo | -|`SQ_TMPU`|Increase the tempo | -|`SQ_R(n)`|Set the resolution to n | -|`SQ_RESD`|Change to the slower resolution | -|`SQ_RESU`|Change to the faster resolution | -|`SQ_T(n)`|Set `n` as the only active track or deactivate all | +|Key |Aliases |Description | +|-------------------------------|---------|---------------------------------------------------| +|`QK_SEQUENCER_ON` |`SQ_ON` |Start the step sequencer | +|`QK_SEQUENCER_OFF` |`SQ_OFF` |Stop the step sequencer | +|`QK_SEQUENCER_TOGGLE` |`SQ_TOG` |Toggle the step sequencer playback | +|`QK_SEQUENCER_STEPS_ALL` |`SQ_SALL`|Enable all the steps | +|`QK_SEQUENCER_STEPS_CLEAR` |`SQ_SCLR`|Disable all the steps | +|`QK_SEQUENCER_TEMPO_DOWN` |`SQ_TMPD`|Decrease the tempo | +|`QK_SEQUENCER_TEMPO_UP` |`SQ_TMPU`|Increase the tempo | +|`QK_SEQUENCER_RESOLUTION_DOWN` |`SQ_RESD`|Change to the slower resolution | +|`QK_SEQUENCER_RESOLUTION_UP` |`SQ_RESU`|Change to the faster resolution | +|`SQ_S(n)` | |Toggle the step `n` | +|`SQ_R(n)` | |Set the resolution to n | +|`SQ_T(n)` | |Set `n` as the only active track or deactivate all | ## Functions diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 73b86ce9b9..36cec4eab8 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -494,15 +494,15 @@ enum qk_keycode_defines { QK_MIDI_MODULATION_SPEED_UP = 0x718D, QK_MIDI_PITCH_BEND_DOWN = 0x718E, QK_MIDI_PITCH_BEND_UP = 0x718F, - SQ_ON = 0x7200, - SQ_OFF = 0x7201, - SQ_TOG = 0x7202, - SQ_TMPD = 0x7203, - SQ_TMPU = 0x7204, - SQ_RESD = 0x7205, - SQ_RESU = 0x7206, - SQ_SALL = 0x7207, - SQ_SCLR = 0x7208, + QK_SEQUENCER_ON = 0x7200, + QK_SEQUENCER_OFF = 0x7201, + QK_SEQUENCER_TOGGLE = 0x7202, + QK_SEQUENCER_TEMPO_DOWN = 0x7203, + QK_SEQUENCER_TEMPO_UP = 0x7204, + QK_SEQUENCER_RESOLUTION_DOWN = 0x7205, + QK_SEQUENCER_RESOLUTION_UP = 0x7206, + QK_SEQUENCER_STEPS_ALL = 0x7207, + QK_SEQUENCER_STEPS_CLEAR = 0x7208, QK_JOYSTICK_BUTTON_0 = 0x7400, QK_JOYSTICK_BUTTON_1 = 0x7401, QK_JOYSTICK_BUTTON_2 = 0x7402, @@ -1085,6 +1085,15 @@ enum qk_keycode_defines { MI_MODU = QK_MIDI_MODULATION_SPEED_UP, MI_BNDD = QK_MIDI_PITCH_BEND_DOWN, MI_BNDU = QK_MIDI_PITCH_BEND_UP, + SQ_ON = QK_SEQUENCER_ON, + SQ_OFF = QK_SEQUENCER_OFF, + SQ_TOGG = QK_SEQUENCER_TOGGLE, + SQ_TMPD = QK_SEQUENCER_TEMPO_DOWN, + SQ_TMPU = QK_SEQUENCER_TEMPO_UP, + SQ_RESD = QK_SEQUENCER_RESOLUTION_DOWN, + SQ_RESU = QK_SEQUENCER_RESOLUTION_UP, + SQ_SALL = QK_SEQUENCER_STEPS_ALL, + SQ_SCLR = QK_SEQUENCER_STEPS_CLEAR, JS_0 = QK_JOYSTICK_BUTTON_0, JS_1 = QK_JOYSTICK_BUTTON_1, JS_2 = QK_JOYSTICK_BUTTON_2, @@ -1329,7 +1338,7 @@ enum qk_keycode_defines { #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT) #define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) #define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP) -#define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR) +#define IS_SEQUENCER_KEYCODE(code) ((code) >= QK_SEQUENCER_ON && (code) <= QK_SEQUENCER_STEPS_CLEAR) #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31) #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32) #define IS_AUDIO_KEYCODE(code) ((code) >= QK_AUDIO_ON && (code) <= QK_AUDIO_VOICE_PREVIOUS) diff --git a/quantum/process_keycode/process_sequencer.c b/quantum/process_keycode/process_sequencer.c index 334b4c0092..6391d1ba9d 100644 --- a/quantum/process_keycode/process_sequencer.c +++ b/quantum/process_keycode/process_sequencer.c @@ -19,39 +19,39 @@ bool process_sequencer(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { - case SQ_ON: + case QK_SEQUENCER_ON: sequencer_on(); return false; - case SQ_OFF: + case QK_SEQUENCER_OFF: sequencer_off(); return false; - case SQ_TOG: + case QK_SEQUENCER_TOGGLE: sequencer_toggle(); return false; - case SQ_TMPD: + case QK_SEQUENCER_TEMPO_DOWN: sequencer_decrease_tempo(); return false; - case SQ_TMPU: + case QK_SEQUENCER_TEMPO_UP: sequencer_increase_tempo(); return false; - case SEQUENCER_RESOLUTION_MIN ... SEQUENCER_RESOLUTION_MAX: - sequencer_set_resolution(keycode - SEQUENCER_RESOLUTION_MIN); - return false; - case SQ_RESD: + case QK_SEQUENCER_RESOLUTION_DOWN: sequencer_decrease_resolution(); return false; - case SQ_RESU: + case QK_SEQUENCER_RESOLUTION_UP: sequencer_increase_resolution(); return false; - case SQ_SALL: + case QK_SEQUENCER_STEPS_ALL: sequencer_set_all_steps_on(); return false; - case SQ_SCLR: + case QK_SEQUENCER_STEPS_CLEAR: sequencer_set_all_steps_off(); return false; case SEQUENCER_STEP_MIN ... SEQUENCER_STEP_MAX: sequencer_toggle_step(keycode - SEQUENCER_STEP_MIN); return false; + case SEQUENCER_RESOLUTION_MIN ... SEQUENCER_RESOLUTION_MAX: + sequencer_set_resolution(keycode - SEQUENCER_RESOLUTION_MIN); + return false; case SEQUENCER_TRACK_MIN ... SEQUENCER_TRACK_MAX: sequencer_toggle_single_active_track(keycode - SEQUENCER_TRACK_MIN); return false; diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index 28634d00f7..b23ed00e98 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -4,3 +4,4 @@ // Deprecated Quantum keycodes #define SH_TG QK_SWAP_HANDS_TOGGLE +#define SQ_TOG QK_SEQUENCER_TOGGLE diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 337bc8fb5f..8947659411 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -436,15 +436,15 @@ std::map KEYCODE_ID_TABLE = { {QK_MIDI_MODULATION_SPEED_UP, "QK_MIDI_MODULATION_SPEED_UP"}, {QK_MIDI_PITCH_BEND_DOWN, "QK_MIDI_PITCH_BEND_DOWN"}, {QK_MIDI_PITCH_BEND_UP, "QK_MIDI_PITCH_BEND_UP"}, - {SQ_ON, "SQ_ON"}, - {SQ_OFF, "SQ_OFF"}, - {SQ_TOG, "SQ_TOG"}, - {SQ_TMPD, "SQ_TMPD"}, - {SQ_TMPU, "SQ_TMPU"}, - {SQ_RESD, "SQ_RESD"}, - {SQ_RESU, "SQ_RESU"}, - {SQ_SALL, "SQ_SALL"}, - {SQ_SCLR, "SQ_SCLR"}, + {QK_SEQUENCER_ON, "QK_SEQUENCER_ON"}, + {QK_SEQUENCER_OFF, "QK_SEQUENCER_OFF"}, + {QK_SEQUENCER_TOGGLE, "QK_SEQUENCER_TOGGLE"}, + {QK_SEQUENCER_TEMPO_DOWN, "QK_SEQUENCER_TEMPO_DOWN"}, + {QK_SEQUENCER_TEMPO_UP, "QK_SEQUENCER_TEMPO_UP"}, + {QK_SEQUENCER_RESOLUTION_DOWN, "QK_SEQUENCER_RESOLUTION_DOWN"}, + {QK_SEQUENCER_RESOLUTION_UP, "QK_SEQUENCER_RESOLUTION_UP"}, + {QK_SEQUENCER_STEPS_ALL, "QK_SEQUENCER_STEPS_ALL"}, + {QK_SEQUENCER_STEPS_CLEAR, "QK_SEQUENCER_STEPS_CLEAR"}, {QK_JOYSTICK_BUTTON_0, "QK_JOYSTICK_BUTTON_0"}, {QK_JOYSTICK_BUTTON_1, "QK_JOYSTICK_BUTTON_1"}, {QK_JOYSTICK_BUTTON_2, "QK_JOYSTICK_BUTTON_2"}, -- cgit v1.3.1 From 0152dd811dad101d5764f66476fa842170b86695 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 19 Feb 2023 07:59:50 +0000 Subject: Move `KC_MISSION_CONTROL`/`KC_LAUNCHPAD` keycodes to core (#19884) --- data/constants/keycodes/keycodes_0.0.2_basic.hjson | 20 +++++++ docs/keycodes.md | 2 + docs/keycodes_basic.md | 62 +++++++++++----------- .../gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c | 21 -------- .../gmmk/pro/rev1/ansi/keymaps/macos/keymap.c | 21 +------- keyboards/keebio/sinc/keymaps/lickel/keymap.c | 33 ------------ keyboards/keychron/common/keychron_common.c | 14 ----- keyboards/keychron/common/keychron_common.h | 8 +-- .../keychron/q1/ansi/keymaps/gtg465x/keymap.c | 32 ----------- .../keychron/q1/ansi/keymaps/mkillewald/keymap.c | 22 +------- keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c | 28 ---------- .../q1/iso/keymaps/mkillewald_iso/keymap.c | 22 +------- .../keychron/q2/ansi/keymaps/ladduro/keymap.c | 28 ---------- keyboards/keychron/q2/ansi/keymaps/via/keymap.c | 4 +- keyboards/yandrstudio/wave75/wave75.c | 14 ----- keyboards/yandrstudio/wave75/wave75.h | 6 --- keyboards/yandrstudio/yr6095/yr6095.c | 14 ----- keyboards/yandrstudio/yr6095/yr6095.h | 6 --- keyboards/yandrstudio/yr80/yr80.c | 14 ----- keyboards/yandrstudio/yr80/yr80.h | 6 --- quantum/keycodes.h | 6 ++- tests/test_common/keycode_table.cpp | 2 + tmk_core/protocol/report.h | 8 ++- 23 files changed, 76 insertions(+), 317 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2_basic.hjson (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2_basic.hjson b/data/constants/keycodes/keycodes_0.0.2_basic.hjson new file mode 100644 index 0000000000..2b5df85d99 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_basic.hjson @@ -0,0 +1,20 @@ +{ + "keycodes": { + "0x00C1": { + "group": "media", + "key": "KC_MISSION_CONTROL", + "label": "Open Mission Control", + "aliases": [ + "KC_MCTL" + ] + }, + "0x00C2": { + "group": "media", + "key": "KC_LAUNCHPAD", + "label": "Open Launchpad", + "aliases": [ + "KC_LPAD" + ] + } + } +} \ No newline at end of file diff --git a/docs/keycodes.md b/docs/keycodes.md index b3be0847e8..7fd76db648 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -209,6 +209,8 @@ See also: [Basic Keycodes](keycodes_basic.md) |`KC_BRIGHTNESS_DOWN` |`KC_BRID` |Brightness Down |✔ |✔ |✔ | |`KC_CONTROL_PANEL` |`KC_CPNL` |Open Control Panel |✔ | | | |`KC_ASSISTANT` |`KC_ASST` |Launch Context-Aware Assistant |✔ | | | +|`KC_MISSION_CONTROL` |`KC_MCTL` |Open Mission Control | |✔ | | +|`KC_LAUNCHPAD` |`KC_LPAD` |Open Launchpad | |✔ | | 1. The Linux kernel HID driver recognizes [nearly all keycodes](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-input.c), but the default bindings depend on the DE/WM.
2. Treated as F13-F15.
diff --git a/docs/keycodes_basic.md b/docs/keycodes_basic.md index d2a49100d1..c95accd79e 100644 --- a/docs/keycodes_basic.md +++ b/docs/keycodes_basic.md @@ -193,36 +193,38 @@ These keycodes are not part of the Keyboard/Keypad usage page. The `SYSTEM_` key ?> Some of these keycodes may behave differently depending on the OS. For example, on macOS, the keycodes `KC_MEDIA_FAST_FORWARD`, `KC_MEDIA_REWIND`, `KC_MEDIA_NEXT_TRACK` and `KC_MEDIA_PREV_TRACK` skip within the current track when held, but skip the entire track when tapped. -|Key |Aliases |Description | -|-----------------------|---------|-------------------| -|`KC_SYSTEM_POWER` |`KC_PWR` |System Power Down | -|`KC_SYSTEM_SLEEP` |`KC_SLEP`|System Sleep | -|`KC_SYSTEM_WAKE` |`KC_WAKE`|System Wake | -|`KC_AUDIO_MUTE` |`KC_MUTE`|Mute | -|`KC_AUDIO_VOL_UP` |`KC_VOLU`|Volume Up | -|`KC_AUDIO_VOL_DOWN` |`KC_VOLD`|Volume Down | -|`KC_MEDIA_NEXT_TRACK` |`KC_MNXT`|Next Track | -|`KC_MEDIA_PREV_TRACK` |`KC_MPRV`|Previous Track | -|`KC_MEDIA_STOP` |`KC_MSTP`|Stop Track | -|`KC_MEDIA_PLAY_PAUSE` |`KC_MPLY`|Play/Pause Track | -|`KC_MEDIA_SELECT` |`KC_MSEL`|Launch Media Player| -|`KC_MEDIA_EJECT` |`KC_EJCT`|Eject | -|`KC_MAIL` | |Launch Mail | -|`KC_CALCULATOR` |`KC_CALC`|Launch Calculator | -|`KC_MY_COMPUTER` |`KC_MYCM`|Launch My Computer | -|`KC_WWW_SEARCH` |`KC_WSCH`|Browser Search | -|`KC_WWW_HOME` |`KC_WHOM`|Browser Home | -|`KC_WWW_BACK` |`KC_WBAK`|Browser Back | -|`KC_WWW_FORWARD` |`KC_WFWD`|Browser Forward | -|`KC_WWW_STOP` |`KC_WSTP`|Browser Stop | -|`KC_WWW_REFRESH` |`KC_WREF`|Browser Refresh | -|`KC_WWW_FAVORITES` |`KC_WFAV`|Browser Favorites | -|`KC_MEDIA_FAST_FORWARD`|`KC_MFFD`|Next Track | -|`KC_MEDIA_REWIND` |`KC_MRWD`|Previous Track | -|`KC_BRIGHTNESS_UP` |`KC_BRIU`|Brightness Up | -|`KC_BRIGHTNESS_DOWN` |`KC_BRID`|Brightness Down | -|`KC_CONTROL_PANEL` |`KC_CPNL`|Open Control Panel | -|`KC_ASSISTANT` |`KC_ASST`|Launch Assistant | +|Key |Aliases |Description | +|-----------------------|---------|--------------------| +|`KC_SYSTEM_POWER` |`KC_PWR` |System Power Down | +|`KC_SYSTEM_SLEEP` |`KC_SLEP`|System Sleep | +|`KC_SYSTEM_WAKE` |`KC_WAKE`|System Wake | +|`KC_AUDIO_MUTE` |`KC_MUTE`|Mute | +|`KC_AUDIO_VOL_UP` |`KC_VOLU`|Volume Up | +|`KC_AUDIO_VOL_DOWN` |`KC_VOLD`|Volume Down | +|`KC_MEDIA_NEXT_TRACK` |`KC_MNXT`|Next Track | +|`KC_MEDIA_PREV_TRACK` |`KC_MPRV`|Previous Track | +|`KC_MEDIA_STOP` |`KC_MSTP`|Stop Track | +|`KC_MEDIA_PLAY_PAUSE` |`KC_MPLY`|Play/Pause Track | +|`KC_MEDIA_SELECT` |`KC_MSEL`|Launch Media Player | +|`KC_MEDIA_EJECT` |`KC_EJCT`|Eject | +|`KC_MAIL` | |Launch Mail | +|`KC_CALCULATOR` |`KC_CALC`|Launch Calculator | +|`KC_MY_COMPUTER` |`KC_MYCM`|Launch My Computer | +|`KC_WWW_SEARCH` |`KC_WSCH`|Browser Search | +|`KC_WWW_HOME` |`KC_WHOM`|Browser Home | +|`KC_WWW_BACK` |`KC_WBAK`|Browser Back | +|`KC_WWW_FORWARD` |`KC_WFWD`|Browser Forward | +|`KC_WWW_STOP` |`KC_WSTP`|Browser Stop | +|`KC_WWW_REFRESH` |`KC_WREF`|Browser Refresh | +|`KC_WWW_FAVORITES` |`KC_WFAV`|Browser Favorites | +|`KC_MEDIA_FAST_FORWARD`|`KC_MFFD`|Next Track | +|`KC_MEDIA_REWIND` |`KC_MRWD`|Previous Track | +|`KC_BRIGHTNESS_UP` |`KC_BRIU`|Brightness Up | +|`KC_BRIGHTNESS_DOWN` |`KC_BRID`|Brightness Down | +|`KC_CONTROL_PANEL` |`KC_CPNL`|Open Control Panel | +|`KC_ASSISTANT` |`KC_ASST`|Launch Assistant | +|`KC_MISSION_CONTROL` |`KC_MCTL`|Open Mission Control| +|`KC_LAUNCHPAD` |`KC_LPAD`|Open Launchpad | ## Number Pad diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c index c7c183e33c..f803b44abb 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c @@ -24,15 +24,8 @@ enum layers { MAC_FN }; -enum custom_keycodes { - KC_MISSION_CONTROL = SAFE_RANGE, - KC_LAUNCHPAD -}; - #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD #define TO_WINB TO(WIN_BASE) #define TO_MACB TO(MAC_BASE) #define MO_WINF MO(WIN_FN) @@ -174,20 +167,6 @@ bool led_update_user(led_t led_state) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key #ifdef RGB_MATRIX_ENABLE #ifdef NKRO_ENABLE case NK_TOGG: diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c index 50a2ac6ca3..60bd53f407 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c @@ -23,9 +23,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H enum my_keycodes { - KC_MSCTRL = SAFE_RANGE, - KC_LNPD, - LED_TLDE, + LED_TLDE = SAFE_RANGE, LED_1, LED_2, LED_3, @@ -209,23 +207,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - // https://github.com/qmk/qmk_firmware/issues/10111 - case KC_MSCTRL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; /* Skip all further processing of this key */ - - case KC_LNPD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; /* Skip all further processing of this key */ - #ifdef NKRO_ENABLE #if RGB_CONFIRMATION_BLINKING_TIME > 0 case NK_TOGG: diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c index 11656a755c..22636f7176 100644 --- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c +++ b/keyboards/keebio/sinc/keymaps/lickel/keymap.c @@ -16,18 +16,6 @@ #include QMK_KEYBOARD_H -enum custom_keycodes { -#ifdef VIA_ENABLE - KC_MISSION_CONTROL = USER00, -#else - KC_MISSION_CONTROL = SAFE_RANGE, -#endif - KC_LAUNCHPAD -}; - -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD - // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -75,24 +63,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }, }; #endif - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; - default: - return true; - } -} diff --git a/keyboards/keychron/common/keychron_common.c b/keyboards/keychron/common/keychron_common.c index d3c1294fe9..a04f3b7264 100644 --- a/keyboards/keychron/common/keychron_common.c +++ b/keyboards/keychron/common/keychron_common.c @@ -41,20 +41,6 @@ void housekeeping_task_keychron(void) { bool process_record_keychron(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key case KC_LOPTN: case KC_ROPTN: case KC_LCMMD: diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h index 543baf9c94..9f943b8986 100644 --- a/keyboards/keychron/common/keychron_common.h +++ b/keyboards/keychron/common/keychron_common.h @@ -22,12 +22,10 @@ enum custom_keycodes { #ifdef VIA_ENABLE - KC_MISSION_CONTROL = USER00, + KC_LOPTN = USER00, #else - KC_MISSION_CONTROL = SAFE_RANGE, + KC_LOPTN = SAFE_RANGE, #endif - KC_LAUNCHPAD, - KC_LOPTN, KC_ROPTN, KC_LCMMD, KC_RCMMD, @@ -38,8 +36,6 @@ enum custom_keycodes { KC_CORTANA }; -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD #define KC_TASK KC_TASK_VIEW #define KC_FLXP KC_FILE_EXPLORER #define KC_SNAP KC_SCREEN_SHOT diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c b/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c index 7f806f6b45..8da475c3c6 100644 --- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c +++ b/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c @@ -22,17 +22,6 @@ // clang-format off -enum custom_keycodes { -#ifdef VIA_ENABLE - KC_MISSION_CONTROL = USER00, -#else - KC_MISSION_CONTROL = SAFE_RANGE, -#endif - KC_LAUNCHPAD -}; - -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) @@ -79,24 +68,3 @@ void matrix_init_user(void) { rgb_matrix_init_user(); #endif } - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - default: - return true; // Process all other keycodes normally - } -} diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c index 937b20ee10..0c198180d4 100644 --- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c +++ b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c @@ -36,19 +36,15 @@ user_config_t user_config; enum custom_keycodes { #ifdef VIA_ENABLE - KC_MISSION_CONTROL = USER00, + KC_LIGHT_TAB_TOGGLE = USER00, #else - KC_MISSION_CONTROL = SAFE_RANGE, + KC_LIGHT_TAB_TOGGLE = SAFE_RANGE, #endif - KC_LAUNCHPAD, - KC_LIGHT_TAB_TOGGLE, KC_LIGHT_ALPHAS_TOGGLE, KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE, KC_FN_LAYER_COLOR_TOGGLE }; -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD #define KC_LTTOG KC_LIGHT_TAB_TOGGLE #define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE #define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE @@ -115,20 +111,6 @@ void eeconfig_init_user(void) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key case KC_LIGHT_TAB_TOGGLE: if (record->event.pressed) { user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c index 3a0cddab7c..7bf1721514 100644 --- a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c +++ b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c @@ -22,13 +22,6 @@ // clang-format off -enum custom_keycodes { - KC_MISSION_CONTROL = USER00, - KC_LAUNCHPAD, -}; - -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD #define TG_NKRO MAGIC_TOGGLE_NKRO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -72,24 +65,3 @@ void matrix_init_user(void) { rgb_matrix_init_user(); #endif } - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - default: - return true; // Process all other keycodes normally - } -} diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c index c62d065ef7..e6457b0208 100644 --- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c +++ b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c @@ -36,19 +36,15 @@ user_config_t user_config; enum custom_keycodes { #ifdef VIA_ENABLE - KC_MISSION_CONTROL = USER00, + KC_LIGHT_TAB_TOGGLE = USER00, #else - KC_MISSION_CONTROL = SAFE_RANGE, + KC_LIGHT_TAB_TOGGLE = SAFE_RANGE, #endif - KC_LAUNCHPAD, - KC_LIGHT_TAB_TOGGLE, KC_LIGHT_ALPHAS_TOGGLE, KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE, KC_FN_LAYER_COLOR_TOGGLE }; -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD #define KC_LTTOG KC_LIGHT_TAB_TOGGLE #define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE #define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE @@ -115,20 +111,6 @@ void eeconfig_init_user(void) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key case KC_LIGHT_TAB_TOGGLE: if (record->event.pressed) { user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c index cc83640b39..55ee7a9732 100644 --- a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c +++ b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c @@ -20,16 +20,9 @@ # include "rgb_matrix_user.h" #endif -enum custom_keycodes { - KC_MISSION_CONTROL = SAFE_RANGE, - KC_LAUNCHPAD -}; - #define KC_WAVE S(KC_GRV) #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_67( @@ -73,24 +66,3 @@ void matrix_init_user(void) { rgb_matrix_init_user(); #endif } - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - default: - return true; // Process all other keycodes normally - } -} diff --git a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c index f1b6b66ff8..a80ca64630 100644 --- a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c +++ b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c @@ -25,9 +25,7 @@ enum layers{ }; enum custom_keycodes { - KC_MISSION_CONTROL = USER00, - KC_LAUNCHPAD, - KC_TASK, + KC_TASK = USER00, KC_FLXP }; diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c index cc58a1d43e..4e0d748c23 100644 --- a/keyboards/yandrstudio/wave75/wave75.c +++ b/keyboards/yandrstudio/wave75/wave75.c @@ -28,20 +28,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { process_magic(CG_TOGG, record); } return false; - case KC_MCTL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; default: return true; } diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h index f0d041241a..209a044466 100644 --- a/keyboards/yandrstudio/wave75/wave75.h +++ b/keyboards/yandrstudio/wave75/wave75.h @@ -37,19 +37,13 @@ enum keyboard_keycodes { #ifdef VIA_ENABLE LOCK_GUI = USER00, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE = SAFE_RANGE // Important! #else LOCK_GUI = SAFE_RANGE, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE // Important! #endif }; #define KC_LG LOCK_GUI #define KC_MACOS TOG_MACOS_KEYMAP -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c index c0a2c94cc2..3ce43eb297 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.c +++ b/keyboards/yandrstudio/yr6095/yr6095.c @@ -57,20 +57,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { process_magic(CG_TOGG, record); } return false; - case KC_MCTL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; default: return true; } diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h index 37b4412aaa..f21ee93634 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.h +++ b/keyboards/yandrstudio/yr6095/yr6095.h @@ -62,19 +62,13 @@ enum keyboard_keycodes { #ifdef VIA_ENABLE LOCK_GUI = USER00, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE = SAFE_RANGE // Important! #else LOCK_GUI = SAFE_RANGE, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE // Important! #endif }; #define KC_LG LOCK_GUI #define KC_MACOS TOG_MACOS_KEYMAP -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD diff --git a/keyboards/yandrstudio/yr80/yr80.c b/keyboards/yandrstudio/yr80/yr80.c index 16415bf9ab..0228545e8c 100644 --- a/keyboards/yandrstudio/yr80/yr80.c +++ b/keyboards/yandrstudio/yr80/yr80.c @@ -52,20 +52,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { process_magic(CG_TOGG, record); } return false; - case KC_MCTL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; default: return true; } diff --git a/keyboards/yandrstudio/yr80/yr80.h b/keyboards/yandrstudio/yr80/yr80.h index 11cec853c3..c5289696f8 100644 --- a/keyboards/yandrstudio/yr80/yr80.h +++ b/keyboards/yandrstudio/yr80/yr80.h @@ -38,19 +38,13 @@ enum keyboard_keycodes { #ifdef VIA_ENABLE LOCK_GUI = USER00, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE = SAFE_RANGE // Important! #else LOCK_GUI = SAFE_RANGE, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE // Important! #endif }; #define KC_LG LOCK_GUI #define KC_MACOS TOG_MACOS_KEYMAP -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 36cec4eab8..e47286a443 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -281,6 +281,8 @@ enum qk_keycode_defines { KC_BRIGHTNESS_DOWN = 0x00BE, KC_CONTROL_PANEL = 0x00BF, KC_ASSISTANT = 0x00C0, + KC_MISSION_CONTROL = 0x00C1, + KC_LAUNCHPAD = 0x00C2, KC_MS_UP = 0x00CD, KC_MS_DOWN = 0x00CE, KC_MS_LEFT = 0x00CF, @@ -835,6 +837,8 @@ enum qk_keycode_defines { KC_BRID = KC_BRIGHTNESS_DOWN, KC_CPNL = KC_CONTROL_PANEL, KC_ASST = KC_ASSISTANT, + KC_MCTL = KC_MISSION_CONTROL, + KC_LPAD = KC_LAUNCHPAD, KC_MS_U = KC_MS_UP, KC_MS_D = KC_MS_DOWN, KC_MS_L = KC_MS_LEFT, @@ -1332,7 +1336,7 @@ enum qk_keycode_defines { #define IS_INTERNAL_KEYCODE(code) ((code) >= KC_NO && (code) <= KC_TRANSPARENT) #define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL) #define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE) -#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_ASSISTANT) +#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_LAUNCHPAD) #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2) #define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT) diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 8947659411..887f24f927 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -223,6 +223,8 @@ std::map KEYCODE_ID_TABLE = { {KC_BRIGHTNESS_DOWN, "KC_BRIGHTNESS_DOWN"}, {KC_CONTROL_PANEL, "KC_CONTROL_PANEL"}, {KC_ASSISTANT, "KC_ASSISTANT"}, + {KC_MISSION_CONTROL, "KC_MISSION_CONTROL"}, + {KC_LAUNCHPAD, "KC_LAUNCHPAD"}, {KC_MS_UP, "KC_MS_UP"}, {KC_MS_DOWN, "KC_MS_DOWN"}, {KC_MS_LEFT, "KC_MS_LEFT"}, diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h index e4526e4ee6..9d415a3bfd 100644 --- a/tmk_core/protocol/report.h +++ b/tmk_core/protocol/report.h @@ -103,7 +103,9 @@ enum consumer_usages { AC_FORWARD = 0x225, AC_STOP = 0x226, AC_REFRESH = 0x227, - AC_BOOKMARKS = 0x22A + AC_BOOKMARKS = 0x22A, + AC_MISSION_CONTROL = 0x29F, + AC_LAUNCHPAD = 0x2A0 }; /* Generic Desktop Page (0x01) @@ -318,6 +320,10 @@ static inline uint16_t KEYCODE2CONSUMER(uint8_t key) { return BRIGHTNESS_DOWN; case KC_WWW_FAVORITES: return AC_BOOKMARKS; + case KC_MISSION_CONTROL: + return AC_MISSION_CONTROL; + case KC_LAUNCHPAD: + return AC_LAUNCHPAD; default: return 0; } -- cgit v1.3.1 From 403b0addea48548abdbde6203d8673f2b77164a7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 21:14:29 +0000 Subject: Align magic keycodes (#19877) --- data/constants/keycodes/keycodes_0.0.2_magic.hjson | 251 +++++++++++++++++++++ docs/keycodes.md | 74 +++--- docs/keycodes_magic.md | 73 +++--- quantum/keycodes.h | 142 ++++++------ quantum/process_keycode/process_magic.c | 70 +++--- quantum/quantum_keycodes_legacy.h | 48 ++++ tests/test_common/keycode_table.cpp | 70 +++--- 7 files changed, 514 insertions(+), 214 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2_magic.hjson (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2_magic.hjson b/data/constants/keycodes/keycodes_0.0.2_magic.hjson new file mode 100644 index 0000000000..81758975e3 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_magic.hjson @@ -0,0 +1,251 @@ +{ + "keycodes": { + "!reset!":0, + + "0x7000": { + "group": "magic", + "key": "QK_MAGIC_SWAP_CONTROL_CAPS_LOCK", + "aliases": [ + "CL_SWAP" + ] + }, + "0x7001": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK", + "aliases": [ + "CL_NORM" + ] + }, + "0x7002": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK", + "aliases": [ + "CL_TOGG" + ] + }, + "0x7003": { + "group": "magic", + "key": "QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF", + "aliases": [ + "CL_CAPS" + ] + }, + "0x7004": { + "group": "magic", + "key": "QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON", + "aliases": [ + "CL_CTRL" + ] + }, + "0x7005": { + "group": "magic", + "key": "QK_MAGIC_SWAP_LALT_LGUI", + "aliases": [ + "AG_LSWP" + ] + }, + "0x7006": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_LALT_LGUI", + "aliases": [ + "AG_LNRM" + ] + }, + "0x7007": { + "group": "magic", + "key": "QK_MAGIC_SWAP_RALT_RGUI", + "aliases": [ + "AG_RSWP" + ] + }, + "0x7008": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_RALT_RGUI", + "aliases": [ + "AG_RNRM" + ] + }, + "0x7009": { + "group": "magic", + "key": "QK_MAGIC_GUI_ON", + "aliases": [ + "GU_ON" + ] + }, + "0x700A": { + "group": "magic", + "key": "QK_MAGIC_GUI_OFF", + "aliases": [ + "GU_OFF" + ] + }, + "0x700B": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_GUI", + "aliases": [ + "GU_TOGG" + ] + }, + "0x700C": { + "group": "magic", + "key": "QK_MAGIC_SWAP_GRAVE_ESC", + "aliases": [ + "GE_SWAP" + ] + }, + "0x700D": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_GRAVE_ESC", + "aliases": [ + "GE_NORM" + ] + }, + "0x700E": { + "group": "magic", + "key": "QK_MAGIC_SWAP_BACKSLASH_BACKSPACE", + "aliases": [ + "BS_SWAP" + ] + }, + "0x700F": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE", + "aliases": [ + "BS_NORM" + ] + }, + "0x7010": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE", + "aliases": [ + "BS_TOGG" + ] + }, + "0x7011": { + "group": "magic", + "key": "QK_MAGIC_NKRO_ON", + "aliases": [ + "NK_ON" + ] + }, + "0x7012": { + "group": "magic", + "key": "QK_MAGIC_NKRO_OFF", + "aliases": [ + "NK_OFF" + ] + }, + "0x7013": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_NKRO", + "aliases": [ + "NK_TOGG" + ] + }, + "0x7014": { + "group": "magic", + "key": "QK_MAGIC_SWAP_ALT_GUI", + "aliases": [ + "AG_SWAP" + ] + }, + "0x7015": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_ALT_GUI", + "aliases": [ + "AG_NORM" + ] + }, + "0x7016": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_ALT_GUI", + "aliases": [ + "AG_TOGG" + ] + }, + "0x7017": { + "group": "magic", + "key": "QK_MAGIC_SWAP_LCTL_LGUI", + "aliases": [ + "CG_LSWP" + ] + }, + "0x7018": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_LCTL_LGUI", + "aliases": [ + "CG_LNRM" + ] + }, + "0x7019": { + "group": "magic", + "key": "QK_MAGIC_SWAP_RCTL_RGUI", + "aliases": [ + "CG_RSWP" + ] + }, + "0x701A": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_RCTL_RGUI", + "aliases": [ + "CG_RNRM" + ] + }, + "0x701B": { + "group": "magic", + "key": "QK_MAGIC_SWAP_CTL_GUI", + "aliases": [ + "CG_SWAP" + ] + }, + "0x701C": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_CTL_GUI", + "aliases": [ + "CG_NORM" + ] + }, + "0x701D": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_CTL_GUI", + "aliases": [ + "CG_TOGG" + ] + }, + "0x701E": { + "group": "magic", + "key": "QK_MAGIC_EE_HANDS_LEFT", + "aliases": [ + "EH_LEFT" + ] + }, + "0x701F": { + "group": "magic", + "key": "QK_MAGIC_EE_HANDS_RIGHT", + "aliases": [ + "EH_RGHT" + ] + }, + "0x7020": { + "group": "magic", + "key": "QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK", + "aliases": [ + "EC_SWAP" + ] + }, + "0x7021": { + "group": "magic", + "key": "QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK", + "aliases": [ + "EC_NORM" + ] + }, + "0x7022": { + "group": "magic", + "key": "QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK", + "aliases": [ + "EC_TOGG" + ] + } + } +} \ No newline at end of file diff --git a/docs/keycodes.md b/docs/keycodes.md index 7fd76db648..cad050ccf7 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -402,43 +402,43 @@ See also: [Leader Key](feature_leader_key.md) See also: [Magic Keycodes](keycodes_magic.md) -|Key |Aliases |Description | -|----------------------------------|---------|--------------------------------------------------------------------------| -|`MAGIC_SWAP_CONTROL_CAPSLOCK` |`CL_SWAP`|Swap Caps Lock and Left Control | -|`MAGIC_UNSWAP_CONTROL_CAPSLOCK` |`CL_NORM`|Unswap Caps Lock and Left Control | -|`MAGIC_TOGGLE_CONTROL_CAPSLOCK` |`CL_TOGG`|Toggle Caps Lock and Left Control swap | -|`MAGIC_SWAP_ESCAPE_CAPSLOCK` |`EC_SWAP`|Swap Caps Lock and Escape | -|`MAGIC_UNSWAP_ESCAPE_CAPSLOCK` |`EC_NORM`|Unswap Caps Lock and Escape | -|`MAGIC_TOGGLE_ESCAPE_CAPSLOCK` |`EC_TOGG`|Toggle Caps Lock and Escape swap | -|`MAGIC_CAPSLOCK_TO_CONTROL` |`CL_CTRL`|Treat Caps Lock as Control | -|`MAGIC_UNCAPSLOCK_TO_CONTROL` |`CL_CAPS`|Stop treating Caps Lock as Control | -|`MAGIC_SWAP_LCTL_LGUI` |`LCG_SWP`|Swap Left Control and GUI | -|`MAGIC_UNSWAP_LCTL_LGUI` |`LCG_NRM`|Unswap Left Control and GUI | -|`MAGIC_SWAP_RCTL_RGUI` |`RCG_SWP`|Swap Right Control and GUI | -|`MAGIC_UNSWAP_RCTL_RGUI` |`RCG_NRM`|Unswap Right Control and GUI | -|`MAGIC_SWAP_CTL_GUI` |`CG_SWAP`|Swap Control and GUI on both sides | -|`MAGIC_UNSWAP_CTL_GUI` |`CG_NORM`|Unswap Control and GUI on both sides | -|`MAGIC_TOGGLE_CTL_GUI` |`CG_TOGG`|Toggle Control and GUI swap on both sides | -|`MAGIC_SWAP_LALT_LGUI` |`LAG_SWP`|Swap Left Alt and GUI | -|`MAGIC_UNSWAP_LALT_LGUI` |`LAG_NRM`|Unswap Left Alt and GUI | -|`MAGIC_SWAP_RALT_RGUI` |`RAG_SWP`|Swap Right Alt and GUI | -|`MAGIC_UNSWAP_RALT_RGUI` |`RAG_NRM`|Unswap Right Alt and GUI | -|`MAGIC_SWAP_ALT_GUI` |`AG_SWAP`|Swap Alt and GUI on both sides | -|`MAGIC_UNSWAP_ALT_GUI` |`AG_NORM`|Unswap Alt and GUI on both sides | -|`MAGIC_TOGGLE_ALT_GUI` |`AG_TOGG`|Toggle Alt and GUI swap on both sides | -|`MAGIC_NO_GUI` |`GUI_OFF`|Disable the GUI keys | -|`MAGIC_UNNO_GUI` |`GUI_ON` |Enable the GUI keys | -|`MAGIC_TOGGLE_GUI` |`GUI_TOG`|Toggles the status of the GUI keys | -|`MAGIC_SWAP_GRAVE_ESC` |`GE_SWAP`|Swap ` and Escape | -|`MAGIC_UNSWAP_GRAVE_ESC` |`GE_NORM`|Unswap ` and Escape | -|`MAGIC_SWAP_BACKSLASH_BACKSPACE` |`BS_SWAP`|Swap `\` and Backspace | -|`MAGIC_UNSWAP_BACKSLASH_BACKSPACE`|`BS_NORM`|Unswap `\` and Backspace | -|`MAGIC_TOGGLE_BACKSLASH_BACKSPACE`|`BS_TOGG`|Toggle `\` and Backspace swap state | -|`MAGIC_HOST_NKRO` |`NK_ON` |Enable N-key rollover | -|`MAGIC_UNHOST_NKRO` |`NK_OFF` |Disable N-key rollover | -|`MAGIC_TOGGLE_NKRO` |`NK_TOGG`|Toggle N-key rollover | -|`MAGIC_EE_HANDS_LEFT` |`EH_LEFT`|Set the master half of a split keyboard as the left hand (for `EE_HANDS`) | -|`MAGIC_EE_HANDS_RIGHT` |`EH_RGHT`|Set the master half of a split keyboard as the right hand (for `EE_HANDS`)| +|Key |Aliases |Description | +|-------------------------------------|---------|--------------------------------------------------------------------------| +|`QK_MAGIC_SWAP_CONTROL_CAPS_LOCK` |`CL_SWAP`|Swap Caps Lock and Left Control | +|`QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK` |`CL_NORM`|Unswap Caps Lock and Left Control | +|`QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK` |`CL_TOGG`|Toggle Caps Lock and Left Control swap | +|`QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON` |`CL_CTRL`|Treat Caps Lock as Control | +|`QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF` |`CL_CAPS`|Stop treating Caps Lock as Control | +|`QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK` |`EC_SWAP`|Swap Caps Lock and Escape | +|`QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK` |`EC_NORM`|Unswap Caps Lock and Escape | +|`QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK` |`EC_TOGG`|Toggle Caps Lock and Escape swap | +|`QK_MAGIC_SWAP_LCTL_LGUI` |`CG_LSWP`|Swap Left Control and GUI | +|`QK_MAGIC_UNSWAP_LCTL_LGUI` |`CG_LNRM`|Unswap Left Control and GUI | +|`QK_MAGIC_SWAP_RCTL_RGUI` |`CG_RSWP`|Swap Right Control and GUI | +|`QK_MAGIC_UNSWAP_RCTL_RGUI` |`CG_RNRM`|Unswap Right Control and GUI | +|`QK_MAGIC_SWAP_CTL_GUI` |`CG_SWAP`|Swap Control and GUI on both sides | +|`QK_MAGIC_UNSWAP_CTL_GUI` |`CG_NORM`|Unswap Control and GUI on both sides | +|`QK_MAGIC_TOGGLE_CTL_GUI` |`CG_TOGG`|Toggle Control and GUI swap on both sides | +|`QK_MAGIC_SWAP_LALT_LGUI` |`AG_LSWP`|Swap Left Alt and GUI | +|`QK_MAGIC_UNSWAP_LALT_LGUI` |`AG_LNRM`|Unswap Left Alt and GUI | +|`QK_MAGIC_SWAP_RALT_RGUI` |`AG_RSWP`|Swap Right Alt and GUI | +|`QK_MAGIC_UNSWAP_RALT_RGUI` |`AG_RNRM`|Unswap Right Alt and GUI | +|`QK_MAGIC_SWAP_ALT_GUI` |`AG_SWAP`|Swap Alt and GUI on both sides | +|`QK_MAGIC_UNSWAP_ALT_GUI` |`AG_NORM`|Unswap Alt and GUI on both sides | +|`QK_MAGIC_TOGGLE_ALT_GUI` |`AG_TOGG`|Toggle Alt and GUI swap on both sides | +|`QK_MAGIC_GUI_OFF` |`GU_OFF` |Disable the GUI keys | +|`QK_MAGIC_GUI_ON` |`GU_ON` |Enable the GUI keys | +|`QK_MAGIC_TOGGLE_GUI` |`GU_TOGG`|Toggles the status of the GUI keys | +|`QK_MAGIC_SWAP_GRAVE_ESC` |`GE_SWAP`|Swap ` and Escape | +|`QK_MAGIC_UNSWAP_GRAVE_ESC` |`GE_NORM`|Unswap ` and Escape | +|`QK_MAGIC_SWAP_BACKSLASH_BACKSPACE` |`BS_SWAP`|Swap `\` and Backspace | +|`QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE`|`BS_NORM`|Unswap `\` and Backspace | +|`QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE`|`BS_TOGG`|Toggle `\` and Backspace swap state | +|`QK_MAGIC_NKRO_ON` |`NK_ON` |Enable N-key rollover | +|`QK_MAGIC_NKRO_OFF` |`NK_OFF` |Disable N-key rollover | +|`QK_MAGIC_TOGGLE_NKRO` |`NK_TOGG`|Toggle N-key rollover | +|`QK_MAGIC_EE_HANDS_LEFT` |`EH_LEFT`|Set the master half of a split keyboard as the left hand (for `EE_HANDS`) | +|`QK_MAGIC_EE_HANDS_RIGHT` |`EH_RGHT`|Set the master half of a split keyboard as the right hand (for `EE_HANDS`)| ## MIDI :id=midi diff --git a/docs/keycodes_magic.md b/docs/keycodes_magic.md index 982a301630..8470612345 100644 --- a/docs/keycodes_magic.md +++ b/docs/keycodes_magic.md @@ -2,39 +2,40 @@ **Magic Keycodes** are prefixed with `MAGIC_`, and allow you to access the functionality of the deprecated Bootmagic feature *after* your keyboard has initialized. To use the keycodes, assign them to your keymap as you would any other keycode. -|Key |Aliases |Description | -|----------------------------------|---------|--------------------------------------------------------------------------| -|`MAGIC_SWAP_CONTROL_CAPSLOCK` |`CL_SWAP`|Swap Caps Lock and Left Control | -|`MAGIC_UNSWAP_CONTROL_CAPSLOCK` |`CL_NORM`|Unswap Caps Lock and Left Control | -|`MAGIC_TOGGLE_CONTROL_CAPSLOCK` |`CL_TOGG`|Toggle Caps Lock and Left Control swap | -|`MAGIC_SWAP_ESCAPE_CAPSLOCK` |`EC_SWAP`|Swap Caps Lock and Escape | -|`MAGIC_UNSWAP_ESCAPE_CAPSLOCK` |`EC_NORM`|Unswap Caps Lock and Escape | -|`MAGIC_TOGGLE_ESCAPE_CAPSLOCK` |`EC_TOGG`|Toggle Caps Lock and Escape swap | -|`MAGIC_CAPSLOCK_TO_CONTROL` |`CL_CTRL`|Treat Caps Lock as Control | -|`MAGIC_UNCAPSLOCK_TO_CONTROL` |`CL_CAPS`|Stop treating Caps Lock as Control | -|`MAGIC_SWAP_LCTL_LGUI` |`LCG_SWP`|Swap Left Control and GUI | -|`MAGIC_UNSWAP_LCTL_LGUI` |`LCG_NRM`|Unswap Left Control and GUI | -|`MAGIC_SWAP_RCTL_RGUI` |`RCG_SWP`|Swap Right Control and GUI | -|`MAGIC_UNSWAP_RCTL_RGUI` |`RCG_NRM`|Unswap Right Control and GUI | -|`MAGIC_SWAP_CTL_GUI` |`CG_SWAP`|Swap Control and GUI on both sides | -|`MAGIC_UNSWAP_CTL_GUI` |`CG_NORM`|Unswap Control and GUI on both sides | -|`MAGIC_TOGGLE_CTL_GUI` |`CG_TOGG`|Toggle Control and GUI swap on both sides | -|`MAGIC_SWAP_LALT_LGUI` |`LAG_SWP`|Swap Left Alt and GUI | -|`MAGIC_UNSWAP_LALT_LGUI` |`LAG_NRM`|Unswap Left Alt and GUI | -|`MAGIC_SWAP_RALT_RGUI` |`RAG_SWP`|Swap Right Alt and GUI | -|`MAGIC_UNSWAP_RALT_RGUI` |`RAG_NRM`|Unswap Right Alt and GUI | -|`MAGIC_SWAP_ALT_GUI` |`AG_SWAP`|Swap Alt and GUI on both sides | -|`MAGIC_UNSWAP_ALT_GUI` |`AG_NORM`|Unswap Alt and GUI on both sides | -|`MAGIC_TOGGLE_ALT_GUI` |`AG_TOGG`|Toggle Alt and GUI swap on both sides | -|`MAGIC_NO_GUI` |`GUI_OFF`|Disable the GUI keys | -|`MAGIC_UNNO_GUI` |`GUI_ON` |Enable the GUI keys | -|`MAGIC_TOGGLE_GUI` |`GUI_TOG`|Toggles the status of the GUI keys | -|`MAGIC_SWAP_GRAVE_ESC` |`GE_SWAP`|Swap ` and Escape | -|`MAGIC_UNSWAP_GRAVE_ESC` |`GE_NORM`|Unswap ` and Escape | -|`MAGIC_SWAP_BACKSLASH_BACKSPACE` |`BS_SWAP`|Swap `\` and Backspace | -|`MAGIC_UNSWAP_BACKSLASH_BACKSPACE`|`BS_NORM`|Unswap `\` and Backspace | -|`MAGIC_HOST_NKRO` |`NK_ON` |Enable N-key rollover | -|`MAGIC_UNHOST_NKRO` |`NK_OFF` |Disable N-key rollover | -|`MAGIC_TOGGLE_NKRO` |`NK_TOGG`|Toggle N-key rollover | -|`MAGIC_EE_HANDS_LEFT` |`EH_LEFT`|Set the master half of a split keyboard as the left hand (for `EE_HANDS`) | -|`MAGIC_EE_HANDS_RIGHT` |`EH_RGHT`|Set the master half of a split keyboard as the right hand (for `EE_HANDS`)| +|Key |Aliases |Description | +|-------------------------------------|---------|--------------------------------------------------------------------------| +|`QK_MAGIC_SWAP_CONTROL_CAPS_LOCK` |`CL_SWAP`|Swap Caps Lock and Left Control | +|`QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK` |`CL_NORM`|Unswap Caps Lock and Left Control | +|`QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK` |`CL_TOGG`|Toggle Caps Lock and Left Control swap | +|`QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON` |`CL_CTRL`|Treat Caps Lock as Control | +|`QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF` |`CL_CAPS`|Stop treating Caps Lock as Control | +|`QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK` |`EC_SWAP`|Swap Caps Lock and Escape | +|`QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK` |`EC_NORM`|Unswap Caps Lock and Escape | +|`QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK` |`EC_TOGG`|Toggle Caps Lock and Escape swap | +|`QK_MAGIC_SWAP_LCTL_LGUI` |`CG_LSWP`|Swap Left Control and GUI | +|`QK_MAGIC_UNSWAP_LCTL_LGUI` |`CG_LNRM`|Unswap Left Control and GUI | +|`QK_MAGIC_SWAP_RCTL_RGUI` |`CG_RSWP`|Swap Right Control and GUI | +|`QK_MAGIC_UNSWAP_RCTL_RGUI` |`CG_RNRM`|Unswap Right Control and GUI | +|`QK_MAGIC_SWAP_CTL_GUI` |`CG_SWAP`|Swap Control and GUI on both sides | +|`QK_MAGIC_UNSWAP_CTL_GUI` |`CG_NORM`|Unswap Control and GUI on both sides | +|`QK_MAGIC_TOGGLE_CTL_GUI` |`CG_TOGG`|Toggle Control and GUI swap on both sides | +|`QK_MAGIC_SWAP_LALT_LGUI` |`AG_LSWP`|Swap Left Alt and GUI | +|`QK_MAGIC_UNSWAP_LALT_LGUI` |`AG_LNRM`|Unswap Left Alt and GUI | +|`QK_MAGIC_SWAP_RALT_RGUI` |`AG_RSWP`|Swap Right Alt and GUI | +|`QK_MAGIC_UNSWAP_RALT_RGUI` |`AG_RNRM`|Unswap Right Alt and GUI | +|`QK_MAGIC_SWAP_ALT_GUI` |`AG_SWAP`|Swap Alt and GUI on both sides | +|`QK_MAGIC_UNSWAP_ALT_GUI` |`AG_NORM`|Unswap Alt and GUI on both sides | +|`QK_MAGIC_TOGGLE_ALT_GUI` |`AG_TOGG`|Toggle Alt and GUI swap on both sides | +|`QK_MAGIC_GUI_OFF` |`GU_OFF` |Disable the GUI keys | +|`QK_MAGIC_GUI_ON` |`GU_ON` |Enable the GUI keys | +|`QK_MAGIC_TOGGLE_GUI` |`GU_TOGG`|Toggles the status of the GUI keys | +|`QK_MAGIC_SWAP_GRAVE_ESC` |`GE_SWAP`|Swap ` and Escape | +|`QK_MAGIC_UNSWAP_GRAVE_ESC` |`GE_NORM`|Unswap ` and Escape | +|`QK_MAGIC_SWAP_BACKSLASH_BACKSPACE` |`BS_SWAP`|Swap `\` and Backspace | +|`QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE`|`BS_NORM`|Unswap `\` and Backspace | +|`QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE`|`BS_TOGG`|Toggle `\` and Backspace swap state | +|`QK_MAGIC_NKRO_ON` |`NK_ON` |Enable N-key rollover | +|`QK_MAGIC_NKRO_OFF` |`NK_OFF` |Disable N-key rollover | +|`QK_MAGIC_TOGGLE_NKRO` |`NK_TOGG`|Toggle N-key rollover | +|`QK_MAGIC_EE_HANDS_LEFT` |`EH_LEFT`|Set the master half of a split keyboard as the left hand (for `EE_HANDS`) | +|`QK_MAGIC_EE_HANDS_RIGHT` |`EH_RGHT`|Set the master half of a split keyboard as the right hand (for `EE_HANDS`)| diff --git a/quantum/keycodes.h b/quantum/keycodes.h index e47286a443..ec51459272 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -317,41 +317,41 @@ enum qk_keycode_defines { QK_SWAP_HANDS_OFF = 0x56F4, QK_SWAP_HANDS_ON = 0x56F5, QK_SWAP_HANDS_ONE_SHOT = 0x56F6, - MAGIC_SWAP_CONTROL_CAPSLOCK = 0x7000, - MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7001, - MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x7002, - MAGIC_UNCAPSLOCK_TO_CONTROL = 0x7003, - MAGIC_CAPSLOCK_TO_CONTROL = 0x7004, - MAGIC_SWAP_LALT_LGUI = 0x7005, - MAGIC_UNSWAP_LALT_LGUI = 0x7006, - MAGIC_SWAP_RALT_RGUI = 0x7007, - MAGIC_UNSWAP_RALT_RGUI = 0x7008, - MAGIC_UNNO_GUI = 0x7009, - MAGIC_NO_GUI = 0x700A, - MAGIC_TOGGLE_GUI = 0x700B, - MAGIC_SWAP_GRAVE_ESC = 0x700C, - MAGIC_UNSWAP_GRAVE_ESC = 0x700D, - MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E, - MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F, - MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010, - MAGIC_HOST_NKRO = 0x7011, - MAGIC_UNHOST_NKRO = 0x7012, - MAGIC_TOGGLE_NKRO = 0x7013, - MAGIC_SWAP_ALT_GUI = 0x7014, - MAGIC_UNSWAP_ALT_GUI = 0x7015, - MAGIC_TOGGLE_ALT_GUI = 0x7016, - MAGIC_SWAP_LCTL_LGUI = 0x7017, - MAGIC_UNSWAP_LCTL_LGUI = 0x7018, - MAGIC_SWAP_RCTL_RGUI = 0x7019, - MAGIC_UNSWAP_RCTL_RGUI = 0x701A, - MAGIC_SWAP_CTL_GUI = 0x701B, - MAGIC_UNSWAP_CTL_GUI = 0x701C, - MAGIC_TOGGLE_CTL_GUI = 0x701D, - MAGIC_EE_HANDS_LEFT = 0x701E, - MAGIC_EE_HANDS_RIGHT = 0x701F, - MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020, - MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021, - MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022, + QK_MAGIC_SWAP_CONTROL_CAPS_LOCK = 0x7000, + QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK = 0x7001, + QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK = 0x7002, + QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF = 0x7003, + QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON = 0x7004, + QK_MAGIC_SWAP_LALT_LGUI = 0x7005, + QK_MAGIC_UNSWAP_LALT_LGUI = 0x7006, + QK_MAGIC_SWAP_RALT_RGUI = 0x7007, + QK_MAGIC_UNSWAP_RALT_RGUI = 0x7008, + QK_MAGIC_GUI_ON = 0x7009, + QK_MAGIC_GUI_OFF = 0x700A, + QK_MAGIC_TOGGLE_GUI = 0x700B, + QK_MAGIC_SWAP_GRAVE_ESC = 0x700C, + QK_MAGIC_UNSWAP_GRAVE_ESC = 0x700D, + QK_MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E, + QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F, + QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010, + QK_MAGIC_NKRO_ON = 0x7011, + QK_MAGIC_NKRO_OFF = 0x7012, + QK_MAGIC_TOGGLE_NKRO = 0x7013, + QK_MAGIC_SWAP_ALT_GUI = 0x7014, + QK_MAGIC_UNSWAP_ALT_GUI = 0x7015, + QK_MAGIC_TOGGLE_ALT_GUI = 0x7016, + QK_MAGIC_SWAP_LCTL_LGUI = 0x7017, + QK_MAGIC_UNSWAP_LCTL_LGUI = 0x7018, + QK_MAGIC_SWAP_RCTL_RGUI = 0x7019, + QK_MAGIC_UNSWAP_RCTL_RGUI = 0x701A, + QK_MAGIC_SWAP_CTL_GUI = 0x701B, + QK_MAGIC_UNSWAP_CTL_GUI = 0x701C, + QK_MAGIC_TOGGLE_CTL_GUI = 0x701D, + QK_MAGIC_EE_HANDS_LEFT = 0x701E, + QK_MAGIC_EE_HANDS_RIGHT = 0x701F, + QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK = 0x7020, + QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK = 0x7021, + QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK = 0x7022, QK_MIDI_ON = 0x7100, QK_MIDI_OFF = 0x7101, QK_MIDI_TOGGLE = 0x7102, @@ -880,41 +880,41 @@ enum qk_keycode_defines { SH_OFF = QK_SWAP_HANDS_OFF, SH_ON = QK_SWAP_HANDS_ON, SH_OS = QK_SWAP_HANDS_ONE_SHOT, - CL_SWAP = MAGIC_SWAP_CONTROL_CAPSLOCK, - CL_NORM = MAGIC_UNSWAP_CONTROL_CAPSLOCK, - CL_TOGG = MAGIC_TOGGLE_CONTROL_CAPSLOCK, - CL_CAPS = MAGIC_UNCAPSLOCK_TO_CONTROL, - CL_CTRL = MAGIC_CAPSLOCK_TO_CONTROL, - LAG_SWP = MAGIC_SWAP_LALT_LGUI, - LAG_NRM = MAGIC_UNSWAP_LALT_LGUI, - RAG_SWP = MAGIC_SWAP_RALT_RGUI, - RAG_NRM = MAGIC_UNSWAP_RALT_RGUI, - GUI_ON = MAGIC_UNNO_GUI, - GUI_OFF = MAGIC_NO_GUI, - GUI_TOG = MAGIC_TOGGLE_GUI, - GE_SWAP = MAGIC_SWAP_GRAVE_ESC, - GE_NORM = MAGIC_UNSWAP_GRAVE_ESC, - BS_SWAP = MAGIC_SWAP_BACKSLASH_BACKSPACE, - BS_NORM = MAGIC_UNSWAP_BACKSLASH_BACKSPACE, - BS_TOGG = MAGIC_TOGGLE_BACKSLASH_BACKSPACE, - NK_ON = MAGIC_HOST_NKRO, - NK_OFF = MAGIC_UNHOST_NKRO, - NK_TOGG = MAGIC_TOGGLE_NKRO, - AG_SWAP = MAGIC_SWAP_ALT_GUI, - AG_NORM = MAGIC_UNSWAP_ALT_GUI, - AG_TOGG = MAGIC_TOGGLE_ALT_GUI, - LCG_SWP = MAGIC_SWAP_LCTL_LGUI, - LCG_NRM = MAGIC_UNSWAP_LCTL_LGUI, - RCG_SWP = MAGIC_SWAP_RCTL_RGUI, - RCG_NRM = MAGIC_UNSWAP_RCTL_RGUI, - CG_SWAP = MAGIC_SWAP_CTL_GUI, - CG_NORM = MAGIC_UNSWAP_CTL_GUI, - CG_TOGG = MAGIC_TOGGLE_CTL_GUI, - EH_LEFT = MAGIC_EE_HANDS_LEFT, - EH_RGHT = MAGIC_EE_HANDS_RIGHT, - EC_SWAP = MAGIC_SWAP_ESCAPE_CAPSLOCK, - EC_NORM = MAGIC_UNSWAP_ESCAPE_CAPSLOCK, - EC_TOGG = MAGIC_TOGGLE_ESCAPE_CAPSLOCK, + CL_SWAP = QK_MAGIC_SWAP_CONTROL_CAPS_LOCK, + CL_NORM = QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK, + CL_TOGG = QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK, + CL_CAPS = QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF, + CL_CTRL = QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON, + AG_LSWP = QK_MAGIC_SWAP_LALT_LGUI, + AG_LNRM = QK_MAGIC_UNSWAP_LALT_LGUI, + AG_RSWP = QK_MAGIC_SWAP_RALT_RGUI, + AG_RNRM = QK_MAGIC_UNSWAP_RALT_RGUI, + GU_ON = QK_MAGIC_GUI_ON, + GU_OFF = QK_MAGIC_GUI_OFF, + GU_TOGG = QK_MAGIC_TOGGLE_GUI, + GE_SWAP = QK_MAGIC_SWAP_GRAVE_ESC, + GE_NORM = QK_MAGIC_UNSWAP_GRAVE_ESC, + BS_SWAP = QK_MAGIC_SWAP_BACKSLASH_BACKSPACE, + BS_NORM = QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE, + BS_TOGG = QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE, + NK_ON = QK_MAGIC_NKRO_ON, + NK_OFF = QK_MAGIC_NKRO_OFF, + NK_TOGG = QK_MAGIC_TOGGLE_NKRO, + AG_SWAP = QK_MAGIC_SWAP_ALT_GUI, + AG_NORM = QK_MAGIC_UNSWAP_ALT_GUI, + AG_TOGG = QK_MAGIC_TOGGLE_ALT_GUI, + CG_LSWP = QK_MAGIC_SWAP_LCTL_LGUI, + CG_LNRM = QK_MAGIC_UNSWAP_LCTL_LGUI, + CG_RSWP = QK_MAGIC_SWAP_RCTL_RGUI, + CG_RNRM = QK_MAGIC_UNSWAP_RCTL_RGUI, + CG_SWAP = QK_MAGIC_SWAP_CTL_GUI, + CG_NORM = QK_MAGIC_UNSWAP_CTL_GUI, + CG_TOGG = QK_MAGIC_TOGGLE_CTL_GUI, + EH_LEFT = QK_MAGIC_EE_HANDS_LEFT, + EH_RGHT = QK_MAGIC_EE_HANDS_RIGHT, + EC_SWAP = QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK, + EC_NORM = QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK, + EC_TOGG = QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK, MI_ON = QK_MIDI_ON, MI_OFF = QK_MIDI_OFF, MI_TOGG = QK_MIDI_TOGGLE, @@ -1340,7 +1340,7 @@ enum qk_keycode_defines { #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2) #define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT) -#define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) +#define IS_MAGIC_KEYCODE(code) ((code) >= QK_MAGIC_SWAP_CONTROL_CAPS_LOCK && (code) <= QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK) #define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP) #define IS_SEQUENCER_KEYCODE(code) ((code) >= QK_SEQUENCER_ON && (code) <= QK_SEQUENCER_STEPS_CLEAR) #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31) diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c index 72332b20d7..5fafe8550f 100644 --- a/quantum/process_keycode/process_magic.c +++ b/quantum/process_keycode/process_magic.c @@ -44,99 +44,99 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { /* keymap config */ keymap_config.raw = eeconfig_read_keymap(); switch (keycode) { - case MAGIC_SWAP_CONTROL_CAPSLOCK: + case QK_MAGIC_SWAP_CONTROL_CAPS_LOCK: keymap_config.swap_control_capslock = true; break; - case MAGIC_SWAP_ESCAPE_CAPSLOCK: + case QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK: keymap_config.swap_escape_capslock = true; break; - case MAGIC_CAPSLOCK_TO_CONTROL: + case QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON: keymap_config.capslock_to_control = true; break; - case MAGIC_SWAP_LALT_LGUI: + case QK_MAGIC_SWAP_LALT_LGUI: keymap_config.swap_lalt_lgui = true; break; - case MAGIC_SWAP_RALT_RGUI: + case QK_MAGIC_SWAP_RALT_RGUI: keymap_config.swap_ralt_rgui = true; break; - case MAGIC_SWAP_LCTL_LGUI: + case QK_MAGIC_SWAP_LCTL_LGUI: keymap_config.swap_lctl_lgui = true; break; - case MAGIC_SWAP_RCTL_RGUI: + case QK_MAGIC_SWAP_RCTL_RGUI: keymap_config.swap_rctl_rgui = true; break; - case MAGIC_NO_GUI: + case QK_MAGIC_GUI_OFF: keymap_config.no_gui = true; break; - case MAGIC_SWAP_GRAVE_ESC: + case QK_MAGIC_SWAP_GRAVE_ESC: keymap_config.swap_grave_esc = true; break; - case MAGIC_SWAP_BACKSLASH_BACKSPACE: + case QK_MAGIC_SWAP_BACKSLASH_BACKSPACE: keymap_config.swap_backslash_backspace = true; break; - case MAGIC_HOST_NKRO: + case QK_MAGIC_NKRO_ON: clear_keyboard(); // clear first buffer to prevent stuck keys keymap_config.nkro = true; break; - case MAGIC_SWAP_ALT_GUI: + case QK_MAGIC_SWAP_ALT_GUI: keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; #ifdef AUDIO_ENABLE PLAY_SONG(ag_swap_song); #endif break; - case MAGIC_SWAP_CTL_GUI: + case QK_MAGIC_SWAP_CTL_GUI: keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; #ifdef AUDIO_ENABLE PLAY_SONG(cg_swap_song); #endif break; - case MAGIC_UNSWAP_CONTROL_CAPSLOCK: + case QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK: keymap_config.swap_control_capslock = false; break; - case MAGIC_UNSWAP_ESCAPE_CAPSLOCK: + case QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK: keymap_config.swap_escape_capslock = false; break; - case MAGIC_UNCAPSLOCK_TO_CONTROL: + case QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF: keymap_config.capslock_to_control = false; break; - case MAGIC_UNSWAP_LALT_LGUI: + case QK_MAGIC_UNSWAP_LALT_LGUI: keymap_config.swap_lalt_lgui = false; break; - case MAGIC_UNSWAP_RALT_RGUI: + case QK_MAGIC_UNSWAP_RALT_RGUI: keymap_config.swap_ralt_rgui = false; break; - case MAGIC_UNSWAP_LCTL_LGUI: + case QK_MAGIC_UNSWAP_LCTL_LGUI: keymap_config.swap_lctl_lgui = false; break; - case MAGIC_UNSWAP_RCTL_RGUI: + case QK_MAGIC_UNSWAP_RCTL_RGUI: keymap_config.swap_rctl_rgui = false; break; - case MAGIC_UNNO_GUI: + case QK_MAGIC_GUI_ON: keymap_config.no_gui = false; break; - case MAGIC_UNSWAP_GRAVE_ESC: + case QK_MAGIC_UNSWAP_GRAVE_ESC: keymap_config.swap_grave_esc = false; break; - case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: + case QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE: keymap_config.swap_backslash_backspace = false; break; - case MAGIC_UNHOST_NKRO: + case QK_MAGIC_NKRO_OFF: clear_keyboard(); // clear first buffer to prevent stuck keys keymap_config.nkro = false; break; - case MAGIC_UNSWAP_ALT_GUI: + case QK_MAGIC_UNSWAP_ALT_GUI: keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; #ifdef AUDIO_ENABLE PLAY_SONG(ag_norm_song); #endif break; - case MAGIC_UNSWAP_CTL_GUI: + case QK_MAGIC_UNSWAP_CTL_GUI: keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; #ifdef AUDIO_ENABLE PLAY_SONG(cg_norm_song); #endif break; - case MAGIC_TOGGLE_ALT_GUI: + case QK_MAGIC_TOGGLE_ALT_GUI: keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; #ifdef AUDIO_ENABLE @@ -147,7 +147,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { } #endif break; - case MAGIC_TOGGLE_CTL_GUI: + case QK_MAGIC_TOGGLE_CTL_GUI: keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; #ifdef AUDIO_ENABLE @@ -158,26 +158,26 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { } #endif break; - case MAGIC_TOGGLE_BACKSLASH_BACKSPACE: + case QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE: keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace; break; - case MAGIC_TOGGLE_NKRO: + case QK_MAGIC_TOGGLE_NKRO: clear_keyboard(); // clear first buffer to prevent stuck keys keymap_config.nkro = !keymap_config.nkro; break; - case MAGIC_EE_HANDS_LEFT: + case QK_MAGIC_EE_HANDS_LEFT: eeconfig_update_handedness(true); break; - case MAGIC_EE_HANDS_RIGHT: + case QK_MAGIC_EE_HANDS_RIGHT: eeconfig_update_handedness(false); break; - case MAGIC_TOGGLE_GUI: + case QK_MAGIC_TOGGLE_GUI: keymap_config.no_gui = !keymap_config.no_gui; break; - case MAGIC_TOGGLE_CONTROL_CAPSLOCK: + case QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK: keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock; break; - case MAGIC_TOGGLE_ESCAPE_CAPSLOCK: + case QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK: keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock; break; } diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index b23ed00e98..120c98bc62 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -5,3 +5,51 @@ // Deprecated Quantum keycodes #define SH_TG QK_SWAP_HANDS_TOGGLE #define SQ_TOG QK_SEQUENCER_TOGGLE + +#define MAGIC_SWAP_CONTROL_CAPSLOCK QK_MAGIC_SWAP_CONTROL_CAPS_LOCK +#define MAGIC_UNSWAP_CONTROL_CAPSLOCK QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK +#define MAGIC_TOGGLE_CONTROL_CAPSLOCK QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK +#define MAGIC_UNCAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF +#define MAGIC_CAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON +#define MAGIC_SWAP_LALT_LGUI QK_MAGIC_SWAP_LALT_LGUI +#define MAGIC_UNSWAP_LALT_LGUI QK_MAGIC_UNSWAP_LALT_LGUI +#define MAGIC_SWAP_RALT_RGUI QK_MAGIC_SWAP_RALT_RGUI +#define MAGIC_UNSWAP_RALT_RGUI QK_MAGIC_UNSWAP_RALT_RGUI +#define MAGIC_UNNO_GUI QK_MAGIC_GUI_ON +#define MAGIC_NO_GUI QK_MAGIC_GUI_OFF +#define MAGIC_TOGGLE_GUI QK_MAGIC_TOGGLE_GUI +#define MAGIC_SWAP_GRAVE_ESC QK_MAGIC_SWAP_GRAVE_ESC +#define MAGIC_UNSWAP_GRAVE_ESC QK_MAGIC_UNSWAP_GRAVE_ESC +#define MAGIC_SWAP_BACKSLASH_BACKSPACE QK_MAGIC_SWAP_BACKSLASH_BACKSPACE +#define MAGIC_UNSWAP_BACKSLASH_BACKSPACE QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE +#define MAGIC_TOGGLE_BACKSLASH_BACKSPACE QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE +#define MAGIC_HOST_NKRO QK_MAGIC_NKRO_ON +#define MAGIC_UNHOST_NKRO QK_MAGIC_NKRO_OFF +#define MAGIC_TOGGLE_NKRO QK_MAGIC_TOGGLE_NKRO +#define MAGIC_SWAP_ALT_GUI QK_MAGIC_SWAP_ALT_GUI +#define MAGIC_UNSWAP_ALT_GUI QK_MAGIC_UNSWAP_ALT_GUI +#define MAGIC_TOGGLE_ALT_GUI QK_MAGIC_TOGGLE_ALT_GUI +#define MAGIC_SWAP_LCTL_LGUI QK_MAGIC_SWAP_LCTL_LGUI +#define MAGIC_UNSWAP_LCTL_LGUI QK_MAGIC_UNSWAP_LCTL_LGUI +#define MAGIC_SWAP_RCTL_RGUI QK_MAGIC_SWAP_RCTL_RGUI +#define MAGIC_UNSWAP_RCTL_RGUI QK_MAGIC_UNSWAP_RCTL_RGUI +#define MAGIC_SWAP_CTL_GUI QK_MAGIC_SWAP_CTL_GUI +#define MAGIC_UNSWAP_CTL_GUI QK_MAGIC_UNSWAP_CTL_GUI +#define MAGIC_TOGGLE_CTL_GUI QK_MAGIC_TOGGLE_CTL_GUI +#define MAGIC_EE_HANDS_LEFT QK_MAGIC_EE_HANDS_LEFT +#define MAGIC_EE_HANDS_RIGHT QK_MAGIC_EE_HANDS_RIGHT +#define MAGIC_SWAP_ESCAPE_CAPSLOCK QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK +#define MAGIC_UNSWAP_ESCAPE_CAPSLOCK QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK +#define MAGIC_TOGGLE_ESCAPE_CAPSLOCK QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK + +#define LCG_SWP QK_MAGIC_SWAP_LCTL_LGUI +#define LCG_NRM QK_MAGIC_UNSWAP_LCTL_LGUI +#define RCG_SWP QK_MAGIC_SWAP_RCTL_RGUI +#define RCG_NRM QK_MAGIC_UNSWAP_RCTL_RGUI +#define LAG_SWP QK_MAGIC_SWAP_LALT_LGUI +#define LAG_NRM QK_MAGIC_UNSWAP_LALT_LGUI +#define RAG_SWP QK_MAGIC_SWAP_RALT_RGUI +#define RAG_NRM QK_MAGIC_UNSWAP_RALT_RGUI +#define GUI_ON QK_MAGIC_GUI_ON +#define GUI_OFF QK_MAGIC_GUI_OFF +#define GUI_TOG QK_MAGIC_TOGGLE_GUI diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 887f24f927..3aa97f4e0d 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -259,41 +259,41 @@ std::map KEYCODE_ID_TABLE = { {QK_SWAP_HANDS_OFF, "QK_SWAP_HANDS_OFF"}, {QK_SWAP_HANDS_ON, "QK_SWAP_HANDS_ON"}, {QK_SWAP_HANDS_ONE_SHOT, "QK_SWAP_HANDS_ONE_SHOT"}, - {MAGIC_SWAP_CONTROL_CAPSLOCK, "MAGIC_SWAP_CONTROL_CAPSLOCK"}, - {MAGIC_UNSWAP_CONTROL_CAPSLOCK, "MAGIC_UNSWAP_CONTROL_CAPSLOCK"}, - {MAGIC_TOGGLE_CONTROL_CAPSLOCK, "MAGIC_TOGGLE_CONTROL_CAPSLOCK"}, - {MAGIC_UNCAPSLOCK_TO_CONTROL, "MAGIC_UNCAPSLOCK_TO_CONTROL"}, - {MAGIC_CAPSLOCK_TO_CONTROL, "MAGIC_CAPSLOCK_TO_CONTROL"}, - {MAGIC_SWAP_LALT_LGUI, "MAGIC_SWAP_LALT_LGUI"}, - {MAGIC_UNSWAP_LALT_LGUI, "MAGIC_UNSWAP_LALT_LGUI"}, - {MAGIC_SWAP_RALT_RGUI, "MAGIC_SWAP_RALT_RGUI"}, - {MAGIC_UNSWAP_RALT_RGUI, "MAGIC_UNSWAP_RALT_RGUI"}, - {MAGIC_UNNO_GUI, "MAGIC_UNNO_GUI"}, - {MAGIC_NO_GUI, "MAGIC_NO_GUI"}, - {MAGIC_TOGGLE_GUI, "MAGIC_TOGGLE_GUI"}, - {MAGIC_SWAP_GRAVE_ESC, "MAGIC_SWAP_GRAVE_ESC"}, - {MAGIC_UNSWAP_GRAVE_ESC, "MAGIC_UNSWAP_GRAVE_ESC"}, - {MAGIC_SWAP_BACKSLASH_BACKSPACE, "MAGIC_SWAP_BACKSLASH_BACKSPACE"}, - {MAGIC_UNSWAP_BACKSLASH_BACKSPACE, "MAGIC_UNSWAP_BACKSLASH_BACKSPACE"}, - {MAGIC_TOGGLE_BACKSLASH_BACKSPACE, "MAGIC_TOGGLE_BACKSLASH_BACKSPACE"}, - {MAGIC_HOST_NKRO, "MAGIC_HOST_NKRO"}, - {MAGIC_UNHOST_NKRO, "MAGIC_UNHOST_NKRO"}, - {MAGIC_TOGGLE_NKRO, "MAGIC_TOGGLE_NKRO"}, - {MAGIC_SWAP_ALT_GUI, "MAGIC_SWAP_ALT_GUI"}, - {MAGIC_UNSWAP_ALT_GUI, "MAGIC_UNSWAP_ALT_GUI"}, - {MAGIC_TOGGLE_ALT_GUI, "MAGIC_TOGGLE_ALT_GUI"}, - {MAGIC_SWAP_LCTL_LGUI, "MAGIC_SWAP_LCTL_LGUI"}, - {MAGIC_UNSWAP_LCTL_LGUI, "MAGIC_UNSWAP_LCTL_LGUI"}, - {MAGIC_SWAP_RCTL_RGUI, "MAGIC_SWAP_RCTL_RGUI"}, - {MAGIC_UNSWAP_RCTL_RGUI, "MAGIC_UNSWAP_RCTL_RGUI"}, - {MAGIC_SWAP_CTL_GUI, "MAGIC_SWAP_CTL_GUI"}, - {MAGIC_UNSWAP_CTL_GUI, "MAGIC_UNSWAP_CTL_GUI"}, - {MAGIC_TOGGLE_CTL_GUI, "MAGIC_TOGGLE_CTL_GUI"}, - {MAGIC_EE_HANDS_LEFT, "MAGIC_EE_HANDS_LEFT"}, - {MAGIC_EE_HANDS_RIGHT, "MAGIC_EE_HANDS_RIGHT"}, - {MAGIC_SWAP_ESCAPE_CAPSLOCK, "MAGIC_SWAP_ESCAPE_CAPSLOCK"}, - {MAGIC_UNSWAP_ESCAPE_CAPSLOCK, "MAGIC_UNSWAP_ESCAPE_CAPSLOCK"}, - {MAGIC_TOGGLE_ESCAPE_CAPSLOCK, "MAGIC_TOGGLE_ESCAPE_CAPSLOCK"}, + {QK_MAGIC_SWAP_CONTROL_CAPS_LOCK, "QK_MAGIC_SWAP_CONTROL_CAPS_LOCK"}, + {QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK, "QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK"}, + {QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK, "QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK"}, + {QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF, "QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF"}, + {QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON, "QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON"}, + {QK_MAGIC_SWAP_LALT_LGUI, "QK_MAGIC_SWAP_LALT_LGUI"}, + {QK_MAGIC_UNSWAP_LALT_LGUI, "QK_MAGIC_UNSWAP_LALT_LGUI"}, + {QK_MAGIC_SWAP_RALT_RGUI, "QK_MAGIC_SWAP_RALT_RGUI"}, + {QK_MAGIC_UNSWAP_RALT_RGUI, "QK_MAGIC_UNSWAP_RALT_RGUI"}, + {QK_MAGIC_GUI_ON, "QK_MAGIC_GUI_ON"}, + {QK_MAGIC_GUI_OFF, "QK_MAGIC_GUI_OFF"}, + {QK_MAGIC_TOGGLE_GUI, "QK_MAGIC_TOGGLE_GUI"}, + {QK_MAGIC_SWAP_GRAVE_ESC, "QK_MAGIC_SWAP_GRAVE_ESC"}, + {QK_MAGIC_UNSWAP_GRAVE_ESC, "QK_MAGIC_UNSWAP_GRAVE_ESC"}, + {QK_MAGIC_SWAP_BACKSLASH_BACKSPACE, "QK_MAGIC_SWAP_BACKSLASH_BACKSPACE"}, + {QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE, "QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE"}, + {QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE, "QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE"}, + {QK_MAGIC_NKRO_ON, "QK_MAGIC_NKRO_ON"}, + {QK_MAGIC_NKRO_OFF, "QK_MAGIC_NKRO_OFF"}, + {QK_MAGIC_TOGGLE_NKRO, "QK_MAGIC_TOGGLE_NKRO"}, + {QK_MAGIC_SWAP_ALT_GUI, "QK_MAGIC_SWAP_ALT_GUI"}, + {QK_MAGIC_UNSWAP_ALT_GUI, "QK_MAGIC_UNSWAP_ALT_GUI"}, + {QK_MAGIC_TOGGLE_ALT_GUI, "QK_MAGIC_TOGGLE_ALT_GUI"}, + {QK_MAGIC_SWAP_LCTL_LGUI, "QK_MAGIC_SWAP_LCTL_LGUI"}, + {QK_MAGIC_UNSWAP_LCTL_LGUI, "QK_MAGIC_UNSWAP_LCTL_LGUI"}, + {QK_MAGIC_SWAP_RCTL_RGUI, "QK_MAGIC_SWAP_RCTL_RGUI"}, + {QK_MAGIC_UNSWAP_RCTL_RGUI, "QK_MAGIC_UNSWAP_RCTL_RGUI"}, + {QK_MAGIC_SWAP_CTL_GUI, "QK_MAGIC_SWAP_CTL_GUI"}, + {QK_MAGIC_UNSWAP_CTL_GUI, "QK_MAGIC_UNSWAP_CTL_GUI"}, + {QK_MAGIC_TOGGLE_CTL_GUI, "QK_MAGIC_TOGGLE_CTL_GUI"}, + {QK_MAGIC_EE_HANDS_LEFT, "QK_MAGIC_EE_HANDS_LEFT"}, + {QK_MAGIC_EE_HANDS_RIGHT, "QK_MAGIC_EE_HANDS_RIGHT"}, + {QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK, "QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK"}, + {QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK, "QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK"}, + {QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK, "QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK"}, {QK_MIDI_ON, "QK_MIDI_ON"}, {QK_MIDI_OFF, "QK_MIDI_OFF"}, {QK_MIDI_TOGGLE, "QK_MIDI_TOGGLE"}, -- cgit v1.3.1 From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- data/constants/keycodes/keycodes_0.0.2_kb.hjson | 132 +++++++++++++++++++++ data/constants/keycodes/keycodes_0.0.2_user.hjson | 132 +++++++++++++++++++++ keyboards/acheron/shark/alpha/keymaps/via/keymap.c | 4 +- keyboards/bandominedoni/keymaps/via/keymap.c | 2 +- keyboards/bastardkb/charybdis/charybdis.h | 6 +- keyboards/bastardkb/dilemma/dilemma.h | 6 +- .../cannonkeys/satisfaction75/satisfaction75.h | 2 +- keyboards/chromatonemini/keymaps/via/keymap.c | 2 +- keyboards/crkbd/keymaps/mb_via/keymap.c | 2 +- keyboards/crkbd/keymaps/via/keymap.c | 2 +- .../delikeeb/flatbread60/keymaps/via/keymap.c | 2 +- keyboards/delikeeb/vaneela/keymaps/via/keymap.c | 2 +- keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c | 2 +- keyboards/dm9records/lain/keymaps/via/keymap.c | 8 +- keyboards/dm9records/lain/keymaps/via/readme.md | 2 +- keyboards/dm9records/plaid/keymaps/via/keymap.c | 4 +- keyboards/durgod/dgk6x/dgk6x.h | 2 +- keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c | 2 +- keyboards/flygone60/rev3/keymaps/via/keymap.c | 2 +- keyboards/foostan/cornelius/keymaps/via/keymap.c | 2 +- keyboards/fortitude60/keymaps/via/keymap.c | 2 +- .../geekboards/macropad_v2/keymaps/via/keymap.c | 4 +- keyboards/giabalanai/keymaps/via/keymap.c | 2 +- .../giabalanai/keymaps/via_giabarinaix2/keymap.c | 2 +- keyboards/halfcliff/keymaps/via/keymap.c | 6 +- .../handwired/tractyl_manuform/tractyl_manuform.h | 6 +- keyboards/hardwareabstraction/handwire/handwire.c | 6 +- .../handwire/keymaps/via/keymap.c | 2 +- keyboards/helix/rev3_4rows/keymaps/via/keymap.c | 4 +- keyboards/helix/rev3_5rows/keymaps/via/keymap.c | 4 +- keyboards/idobao/id42/keymaps/default/keymap.c | 33 +----- keyboards/idobao/id42/keymaps/default/rules.mk | 1 + keyboards/idobao/id42/keymaps/idobao/keymap.c | 4 +- keyboards/idobao/id42/keymaps/via/keymap.c | 2 +- keyboards/idobao/id61/keymaps/idobao/keymap.c | 2 +- keyboards/idobao/id61/keymaps/idobao/specialk.c | 4 +- keyboards/idobao/id63/keymaps/idobao/keymap.c | 6 +- keyboards/idobao/id67/keymaps/idobao/keymap.c | 4 +- .../idobao/id67/keymaps/vinorodrigues/keymap.c | 6 +- .../idobao/id80/v3/ansi/keymaps/idobao/keymap.c | 4 +- keyboards/idobao/id87/v2/keymaps/idobao/keymap.c | 8 +- keyboards/idobao/id87/v2/keymaps/via/keymap.c | 4 +- keyboards/kbdfans/niu_mini/keymaps/via/keymap.c | 4 +- keyboards/keebio/bamfk1/keymaps/via/keymap.c | 2 +- keyboards/keebio/iris/keymaps/via/keymap.c | 2 +- keyboards/keebio/levinson/keymaps/via/keymap.c | 2 +- keyboards/keebio/nyquist/keymaps/via/keymap.c | 2 +- keyboards/keychron/common/keychron_common.h | 6 +- .../keychron/q1/ansi/keymaps/mkillewald/keymap.c | 10 +- .../keychron/q1/ansi/keymaps/mkillewald/readme.md | 14 +-- keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c | 2 +- .../q1/iso/keymaps/mkillewald_iso/keymap.c | 18 ++- .../q1/iso/keymaps/mkillewald_iso/readme.md | 14 +-- .../q10/ansi_encoder/keymaps/keychron/keymap.c | 20 ++-- .../keychron/q10/ansi_encoder/keymaps/via/keymap.c | 20 ++-- .../q10/iso_encoder/keymaps/keychron/keymap.c | 20 ++-- .../keychron/q10/iso_encoder/keymaps/via/keymap.c | 20 ++-- keyboards/keychron/q2/ansi/keymaps/via/keymap.c | 5 - .../q65/ansi_encoder/keymaps/keychron/keymap.c | 16 +-- .../bm60hsrgb_ec/rev2/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/jj40/keymaps/via/keymap.c | 4 +- keyboards/kprepublic/jj50/keymaps/via/keymap.c | 4 +- keyboards/massdrop/alt/keymaps/via/keymap.c | 2 +- keyboards/massdrop/alt/keymaps/via/readme.md | 13 +- keyboards/massdrop/ctrl/keymaps/via/keymap.c | 2 +- keyboards/mechlovin/adelais/keymaps/via/keymap.c | 20 ++-- keyboards/mechlovin/kay65/keymaps/via/keymap.c | 4 +- .../no_backlight/wearhaus66/keymaps/via/keymap.c | 2 +- keyboards/mechwild/puckbuddy/puckbuddy.h | 6 +- keyboards/moonlander/keymaps/via/keymap.c | 8 +- keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c | 5 + keyboards/mwstudio/mw75r2/keymaps/via/keymap.c | 5 + keyboards/mxss/mxss_frontled.h | 2 +- .../nibble/keymaps/oled_bongocat/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/via/keymap.c | 13 +- keyboards/orthocode/orthocode.h | 10 +- keyboards/paprikman/albacore/keymaps/pulp/keymap.c | 2 +- keyboards/pdxkbc/keymaps/via/keymap.c | 4 +- keyboards/planck/keymaps/via/keymap.c | 4 +- keyboards/ploopyco/mouse/mouse.h | 10 +- keyboards/ploopyco/trackball/trackball.h | 10 +- keyboards/ploopyco/trackball_mini/trackball_mini.h | 10 +- .../ploopyco/trackball_thumb/trackball_thumb.h | 10 +- keyboards/plum47/keymaps/via/keymap.c | 4 +- keyboards/preonic/keymaps/jpe230/jpe230.h | 8 +- keyboards/preonic/keymaps/via/keymap.c | 6 +- keyboards/rainkeebs/delilah/keymaps/via/keymap.c | 4 +- keyboards/reviung/reviung39/keymaps/via/keymap.c | 2 +- keyboards/rocketboard_16/keycode_lookup.c | 68 +++++------ .../heavy_left/keymaps/takashicompany/keymap.c | 2 +- .../takashicompany/heavy_left/keymaps/via/keymap.c | 2 +- .../takashicompany/radialex/keymaps/via/keymap.c | 2 +- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 2 +- keyboards/w1_at/keymaps/via/keymap.c | 2 +- .../rama_works_kara/keymaps/default/keymap.c | 4 +- .../rama_works_m50_a/keymaps/default/keymap.c | 2 +- .../rama_works_m50_ax/keymaps/default/keymap.c | 2 +- .../rama_works_m50_ax/rama_works_m50_ax.c | 28 ----- .../rama_works_m60_a/keymaps/default/keymap.c | 4 +- .../rama_works_m60_a/keymaps/proto/keymap.c | 4 +- .../rama_works_m60_a/keymaps/via/keymap.c | 4 +- .../rama_works_m60_a/keymaps/zyber/keymap.c | 4 +- .../wilba_tech/wt60_b/keymaps/default/keymap.c | 4 +- keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c | 4 +- .../wilba_tech/wt60_bx/keymaps/default/keymap.c | 4 +- keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c | 4 +- .../wilba_tech/wt60_c/keymaps/default/keymap.c | 4 +- keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c | 4 +- keyboards/wilba_tech/wt_main.c | 31 ++--- keyboards/wilba_tech/wt_mono_backlight.c | 15 ++- keyboards/wilba_tech/wt_mono_backlight.h | 1 + keyboards/wilba_tech/wt_rgb_backlight.c | 13 +- keyboards/wilba_tech/wt_rgb_backlight.h | 1 + keyboards/wilba_tech/wt_rgb_backlight_keycodes.h | 29 +++-- .../zeal60/keymaps/ansi_split_bs_rshift/keymap.c | 4 +- .../wilba_tech/zeal60/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c | 4 +- keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c | 2 +- .../zeal60/keymaps/sethBarberee/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/via/keymap.c | 2 +- .../wilba_tech/zeal65/keymaps/default/keymap.c | 2 +- .../wilba_tech/zeal65/keymaps/split_bs/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c | 2 +- keyboards/work_louder/micro/keymaps/via/keymap.c | 6 +- keyboards/work_louder/rgb_functions.h | 18 +-- .../work_louder/work_board/keymaps/via/keymap.c | 10 +- keyboards/xelus/la_plus/la_plus.h | 6 +- .../yoichiro/lunakey_pico/keymaps/via/keymap.c | 4 +- quantum/keycodes.h | 67 ++++++++++- quantum/quantum_keycodes.h | 2 + quantum/via.c | 54 ++------- quantum/via.h | 42 +------ tests/test_common/keycode_table.cpp | 65 +++++++++- users/talljoe/talljoe.h | 2 +- 135 files changed, 761 insertions(+), 572 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.2_kb.hjson create mode 100644 data/constants/keycodes/keycodes_0.0.2_user.hjson create mode 100644 keyboards/idobao/id42/keymaps/default/rules.mk (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2_kb.hjson b/data/constants/keycodes/keycodes_0.0.2_kb.hjson new file mode 100644 index 0000000000..f9ffc7432d --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_kb.hjson @@ -0,0 +1,132 @@ +{ + "keycodes": { + "0x7E00": { + "group": "kb", + "key": "QK_KB_0", + }, + "0x7E01": { + "group": "kb", + "key": "QK_KB_1", + }, + "0x7E02": { + "group": "kb", + "key": "QK_KB_2", + }, + "0x7E03": { + "group": "kb", + "key": "QK_KB_3", + }, + "0x7E04": { + "group": "kb", + "key": "QK_KB_4", + }, + "0x7E05": { + "group": "kb", + "key": "QK_KB_5", + }, + "0x7E06": { + "group": "kb", + "key": "QK_KB_6", + }, + "0x7E07": { + "group": "kb", + "key": "QK_KB_7", + }, + "0x7E08": { + "group": "kb", + "key": "QK_KB_8", + }, + "0x7E09": { + "group": "kb", + "key": "QK_KB_9", + }, + "0x7E0A": { + "group": "kb", + "key": "QK_KB_10", + }, + "0x7E0B": { + "group": "kb", + "key": "QK_KB_11", + }, + "0x7E0C": { + "group": "kb", + "key": "QK_KB_12", + }, + "0x7E0D": { + "group": "kb", + "key": "QK_KB_13", + }, + "0x7E0E": { + "group": "kb", + "key": "QK_KB_14", + }, + "0x7E0F": { + "group": "kb", + "key": "QK_KB_15", + }, + "0x7E10": { + "group": "kb", + "key": "QK_KB_16", + }, + "0x7E11": { + "group": "kb", + "key": "QK_KB_17", + }, + "0x7E12": { + "group": "kb", + "key": "QK_KB_18", + }, + "0x7E13": { + "group": "kb", + "key": "QK_KB_19", + }, + "0x7E14": { + "group": "kb", + "key": "QK_KB_20", + }, + "0x7E15": { + "group": "kb", + "key": "QK_KB_21", + }, + "0x7E16": { + "group": "kb", + "key": "QK_KB_22", + }, + "0x7E17": { + "group": "kb", + "key": "QK_KB_23", + }, + "0x7E18": { + "group": "kb", + "key": "QK_KB_24", + }, + "0x7E19": { + "group": "kb", + "key": "QK_KB_25", + }, + "0x7E1A": { + "group": "kb", + "key": "QK_KB_26", + }, + "0x7E1B": { + "group": "kb", + "key": "QK_KB_27", + }, + "0x7E1C": { + "group": "kb", + "key": "QK_KB_28", + }, + "0x7E1D": { + "group": "kb", + "key": "QK_KB_29", + }, + "0x7E1E": { + "group": "kb", + "key": "QK_KB_30", + }, + "0x7E1F": { + "group": "kb", + "key": "QK_KB_31", + }, + } +} diff --git a/data/constants/keycodes/keycodes_0.0.2_user.hjson b/data/constants/keycodes/keycodes_0.0.2_user.hjson new file mode 100644 index 0000000000..b41731b1be --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.2_user.hjson @@ -0,0 +1,132 @@ +{ + "keycodes": { + "0x7F00": { + "group": "user", + "key": "QK_USER_0", + }, + "0x7F01": { + "group": "user", + "key": "QK_USER_1", + }, + "0x7F02": { + "group": "user", + "key": "QK_USER_2", + }, + "0x7F03": { + "group": "user", + "key": "QK_USER_3", + }, + "0x7F04": { + "group": "user", + "key": "QK_USER_4", + }, + "0x7F05": { + "group": "user", + "key": "QK_USER_5", + }, + "0x7F06": { + "group": "user", + "key": "QK_USER_6", + }, + "0x7F07": { + "group": "user", + "key": "QK_USER_7", + }, + "0x7F08": { + "group": "user", + "key": "QK_USER_8", + }, + "0x7F09": { + "group": "user", + "key": "QK_USER_9", + }, + "0x7F0A": { + "group": "user", + "key": "QK_USER_10", + }, + "0x7F0B": { + "group": "user", + "key": "QK_USER_11", + }, + "0x7F0C": { + "group": "user", + "key": "QK_USER_12", + }, + "0x7F0D": { + "group": "user", + "key": "QK_USER_13", + }, + "0x7F0E": { + "group": "user", + "key": "QK_USER_14", + }, + "0x7F0F": { + "group": "user", + "key": "QK_USER_15", + }, + "0x7F10": { + "group": "user", + "key": "QK_USER_16", + }, + "0x7F11": { + "group": "user", + "key": "QK_USER_17", + }, + "0x7F12": { + "group": "user", + "key": "QK_USER_18", + }, + "0x7F13": { + "group": "user", + "key": "QK_USER_19", + }, + "0x7F14": { + "group": "user", + "key": "QK_USER_20", + }, + "0x7F15": { + "group": "user", + "key": "QK_USER_21", + }, + "0x7F16": { + "group": "user", + "key": "QK_USER_22", + }, + "0x7F17": { + "group": "user", + "key": "QK_USER_23", + }, + "0x7F18": { + "group": "user", + "key": "QK_USER_24", + }, + "0x7F19": { + "group": "user", + "key": "QK_USER_25", + }, + "0x7F1A": { + "group": "user", + "key": "QK_USER_26", + }, + "0x7F1B": { + "group": "user", + "key": "QK_USER_27", + }, + "0x7F1C": { + "group": "user", + "key": "QK_USER_28", + }, + "0x7F1D": { + "group": "user", + "key": "QK_USER_29", + }, + "0x7F1E": { + "group": "user", + "key": "QK_USER_30", + }, + "0x7F1F": { + "group": "user", + "key": "QK_USER_31", + }, + } +} diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c index 046e546848..2d3123cccf 100644 --- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c +++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c @@ -22,8 +22,8 @@ enum layers { _ADJUST, }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c index b600cb0be4..a546373b8c 100644 --- a/keyboards/bandominedoni/keymaps/via/keymap.c +++ b/keyboards/bandominedoni/keymaps/via/keymap.c @@ -30,7 +30,7 @@ enum layer_names { }; enum custom_keycodes { - VERSION = USER00 + VERSION = QK_KB_0 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h index f624c554f4..2e311a4aaf 100644 --- a/keyboards/bastardkb/charybdis/charybdis.h +++ b/keyboards/bastardkb/charybdis/charybdis.h @@ -35,11 +35,7 @@ #ifdef POINTING_DEVICE_ENABLE # ifndef NO_CHARYBDIS_KEYCODES enum charybdis_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h index 68d86b03ce..469986839d 100644 --- a/keyboards/bastardkb/dilemma/dilemma.h +++ b/keyboards/bastardkb/dilemma/dilemma.h @@ -32,11 +32,7 @@ #ifdef POINTING_DEVICE_ENABLE # ifndef NO_DILEMMA_KEYCODES enum dilemma_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h index ec852eef6c..9e28bb32a1 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h @@ -25,7 +25,7 @@ typedef union { // Start these at the USER code range in VIA enum my_keycodes { - ENC_PRESS = USER00, + ENC_PRESS = QK_KB_0, CLOCK_SET, OLED_TOGG }; diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c index 185e4a37a7..2ac1412eff 100644 --- a/keyboards/chromatonemini/keymaps/via/keymap.c +++ b/keyboards/chromatonemini/keymaps/via/keymap.c @@ -41,7 +41,7 @@ static bool led_indicator_enable = true; // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - SHIFT_L = USER00, + SHIFT_L = QK_KB_0, SHIFT_R, TGLINDI, // ToGgLe INDIcator TGLINTR, // ToGgLe INdicator location {(_KEY01, _KEY13, _KEY25, _KEY37) or (_KEY02, _KEY14, _KEY26) / (_KEY12, _KEY24, _KEY36)}in TRans mode diff --git a/keyboards/crkbd/keymaps/mb_via/keymap.c b/keyboards/crkbd/keymaps/mb_via/keymap.c index 30a67de5c9..027e1449cc 100644 --- a/keyboards/crkbd/keymaps/mb_via/keymap.c +++ b/keyboards/crkbd/keymaps/mb_via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT //`--------------------------' `--------------------------' ), diff --git a/keyboards/crkbd/keymaps/via/keymap.c b/keyboards/crkbd/keymaps/via/keymap.c index 33ca8026f8..3e93d5bbcf 100644 --- a/keyboards/crkbd/keymaps/via/keymap.c +++ b/keyboards/crkbd/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT //`--------------------------' `--------------------------' ), diff --git a/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c index b551b4e24f..0fa0a000e9 100644 --- a/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c +++ b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_NO, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_NO, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower diff --git a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c index 808cc9d1ef..065f79efba 100644 --- a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, - KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower diff --git a/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c index 1e41c777a8..a126bc65b7 100644 --- a/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_KP_EQUAL, KC_7, KC_8, KC_9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_KP_MINUS, KC_4, KC_5, KC_6, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_KP_PLUS, KC_1, KC_2, KC_3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, -KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, KC_0, KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT +KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, KC_0, KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower diff --git a/keyboards/dm9records/lain/keymaps/via/keymap.c b/keyboards/dm9records/lain/keymaps/via/keymap.c index f6d49cc553..d900ffb3a2 100644 --- a/keyboards/dm9records/lain/keymaps/via/keymap.c +++ b/keyboards/dm9records/lain/keymaps/via/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_INS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT, KC_MENU, KC_RCTL, KC_RSFT + KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT, KC_MENU, KC_RCTL, KC_RSFT ), [NUM] = LAYOUT( KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [CONF] = LAYOUT( QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - USER00, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_USER_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), @@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case USER00: - // via user keycode USER00 : toggle leds enable + case QK_USER_0: + // via user keycode QK_USER : toggle leds enable if (record->event.pressed) { lain_enable_leds_toggle(); } diff --git a/keyboards/dm9records/lain/keymaps/via/readme.md b/keyboards/dm9records/lain/keymaps/via/readme.md index efde27cb47..d2192ae4d1 100644 --- a/keyboards/dm9records/lain/keymaps/via/readme.md +++ b/keyboards/dm9records/lain/keymaps/via/readme.md @@ -5,4 +5,4 @@ 2-3: Layor indicator ## Via user keycode -USER00 : toggle leds enable +USER(0) : toggle leds enable diff --git a/keyboards/dm9records/plaid/keymaps/via/keymap.c b/keyboards/dm9records/plaid/keymaps/via/keymap.c index d326bac8ed..f54c5b9008 100644 --- a/keyboards/dm9records/plaid/keymaps/via/keymap.c +++ b/keyboards/dm9records/plaid/keymaps/via/keymap.c @@ -16,8 +16,8 @@ #include QMK_KEYBOARD_H -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/durgod/dgk6x/dgk6x.h b/keyboards/durgod/dgk6x/dgk6x.h index 676240fb31..5a303b461e 100644 --- a/keyboards/durgod/dgk6x/dgk6x.h +++ b/keyboards/durgod/dgk6x/dgk6x.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Jessica Sullivan and Don Kjer +/* Copyright 2021 Jessica Sullivan and Don Kjer * * 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 diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c index db88a2132f..87ea995a9a 100644 --- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c +++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, KC_UP, KC_END, - KC_CAPS,KC_LGUI,FN_MO13, KC_SPACE, FN_MO23, KC_LALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + KC_CAPS,KC_LGUI,TL_LOWR, KC_SPACE, TL_UPPR, KC_LALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [_VIM_EDITING_LAYER] = LAYOUT_65_ansi( KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DELETE, KC_INSERT, diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/flygone60/rev3/keymaps/via/keymap.c index 0f00248839..54b0e4f673 100644 --- a/keyboards/flygone60/rev3/keymaps/via/keymap.c +++ b/keyboards/flygone60/rev3/keymaps/via/keymap.c @@ -25,7 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - SHILL = USER00, + SHILL = QK_KB_0, NUT, FRACNO }; diff --git a/keyboards/foostan/cornelius/keymaps/via/keymap.c b/keyboards/foostan/cornelius/keymaps/via/keymap.c index f1b7f7fcdf..ac6bac292e 100644 --- a/keyboards/foostan/cornelius/keymaps/via/keymap.c +++ b/keyboards/foostan/cornelius/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX + XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX ), [1] = LAYOUT( diff --git a/keyboards/fortitude60/keymaps/via/keymap.c b/keyboards/fortitude60/keymaps/via/keymap.c index feda619041..77cc709dc8 100644 --- a/keyboards/fortitude60/keymaps/via/keymap.c +++ b/keyboards/fortitude60/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - KC_LGUI, KC_LALT, FN_MO13, KC_SPC, KC_LCTL, KC_ENT, KC_SPC,FN_MO23, KC_RALT, KC_RGUI + KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_LCTL, KC_ENT, KC_SPC,TL_UPPR, KC_RALT, KC_RGUI ), /* Lower diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c index b0e5b9327d..4e6655c23c 100644 --- a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c +++ b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c @@ -20,12 +20,12 @@ bool is_alt_tab_active = false; uint16_t alt_tab_timer = 0; enum custom_keycodes { - ALT_TAB = USER00, + ALT_TAB = QK_KB_0, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_2x4( - LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MACRO00, + LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MC_0, ALT_TAB, KC_MPRV, KC_MNXT, KC_MPLY ), [1] = LAYOUT_ortho_2x4( diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c index 06fa10d67c..812f4967c8 100644 --- a/keyboards/giabalanai/keymaps/via/keymap.c +++ b/keyboards/giabalanai/keymaps/via/keymap.c @@ -141,7 +141,7 @@ enum custom_keycodes { MY_CHORD_MAX = MI_CH_BDim7, - VERSION = USER00 + VERSION = QK_KB_0 }; #define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1) diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c index 512084f1dd..88b032209f 100644 --- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c +++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c @@ -141,7 +141,7 @@ enum custom_keycodes { MY_CHORD_MAX = MI_CH_BDim7, - VERSION = USER00 + VERSION = QK_KB_0 }; #define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1) diff --git a/keyboards/halfcliff/keymaps/via/keymap.c b/keyboards/halfcliff/keymaps/via/keymap.c index 3c0090ffec..ee7e29d4c7 100644 --- a/keyboards/halfcliff/keymaps/via/keymap.c +++ b/keyboards/halfcliff/keymaps/via/keymap.c @@ -16,8 +16,8 @@ #include QMK_KEYBOARD_H #include "keymap_japanese.h" -#define RAISE FN_MO13 -#define LOWER FN_MO23 +#define RAISE TL_LOWR +#define LOWER TL_UPPR // Defines names for use in layer keycodes and the keymap enum layer_names { @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT , JP_LBRC, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, JP_COLN, JP_RBRC, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, KC_SPC, FN_MO23, FN_MO13, KC_SPC, JP_HENK, JP_KANA, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, KC_SPC, TL_UPPR, TL_LOWR, KC_SPC, JP_HENK, JP_KANA, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT ), /* RAISE * ,--------------------------------------------------------------------------------------------------------------------------------------. diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h index b62b6f7553..8ec9bceaf4 100644 --- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h +++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h @@ -25,11 +25,7 @@ #endif enum charybdis_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c index 61a233d120..c61e4c7626 100644 --- a/keyboards/hardwareabstraction/handwire/handwire.c +++ b/keyboards/hardwareabstraction/handwire/handwire.c @@ -11,11 +11,7 @@ static bool buzzer_active = false; static bool initial_keypress = false; enum custom_keycodes{ - #ifdef VIA_ENABLE - KC_HPTON = USER00, - #else - KC_HPTON = SAFE_RANGE, - #endif + KC_HPTON = QK_KB_0, KC_HPTOFF, KC_HPTTOG, KC_HPTRST, diff --git a/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c b/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c index b5fcd913a9..0ae30fb8b6 100644 --- a/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c +++ b/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H enum custom_keycodes{ - KC_HPTON = USER00, + KC_HPTON = QK_KB_0, KC_HPTOFF, KC_HPTTOG, KC_HPTRST, diff --git a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c index 18d0ed9993..45729991e9 100644 --- a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c +++ b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c @@ -32,8 +32,8 @@ enum custom_keycodes { RGBRST }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c index 2f37426ee5..cc66b90a0d 100644 --- a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c +++ b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c @@ -32,8 +32,8 @@ enum custom_keycodes { RGBRST }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty diff --git a/keyboards/idobao/id42/keymaps/default/keymap.c b/keyboards/idobao/id42/keymaps/default/keymap.c index efef7d7183..ffcef7a7ed 100644 --- a/keyboards/idobao/id42/keymaps/default/keymap.c +++ b/keyboards/idobao/id42/keymaps/default/keymap.c @@ -3,11 +3,6 @@ #include QMK_KEYBOARD_H -enum custom_keycodes { - FN_MO13 = SAFE_RANGE, - FN_MO23, -}; - // more Layer Tap stuff #define SPC_FN1 LT(1, KC_SPC) #define SPC_FN2 LT(2, KC_SPC) @@ -29,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, FN_MO13, KC_LEFT, KC_DOWN, KC_RIGHT + KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, TL_LOWR, KC_LEFT, KC_DOWN, KC_RIGHT ), /* Layer 2 @@ -86,29 +81,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ), }; - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case FN_MO13: - if (record->event.pressed) { - layer_on(1); - update_tri_layer(1, 2, 3); - } else { - layer_off(1); - update_tri_layer(1, 2, 3); - } - return false; - break; - case FN_MO23: - if (record->event.pressed) { - layer_on(2); - update_tri_layer(1, 2, 3); - } else { - layer_off(2); - update_tri_layer(1, 2, 3); - } - return false; - break; - } - return true; -} diff --git a/keyboards/idobao/id42/keymaps/default/rules.mk b/keyboards/idobao/id42/keymaps/default/rules.mk new file mode 100644 index 0000000000..7c9bf212a6 --- /dev/null +++ b/keyboards/idobao/id42/keymaps/default/rules.mk @@ -0,0 +1 @@ +TRI_LAYER_ENABLE = yes diff --git a/keyboards/idobao/id42/keymaps/idobao/keymap.c b/keyboards/idobao/id42/keymaps/idobao/keymap.c index e4dd411df2..bc7a5b97e1 100644 --- a/keyboards/idobao/id42/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id42/keymaps/idobao/keymap.c @@ -9,7 +9,7 @@ #include "version.h" enum { - KB_VRSN = USER09 // debug, type version + KB_VRSN = QK_KB_9 // debug, type version }; #define SPC_FN1 LT(1, KC_SPC) @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, FN_MO13, KC_LEFT, KC_DOWN, KC_RIGHT + KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, TL_LOWR, KC_LEFT, KC_DOWN, KC_RIGHT ), /* Layer 1 diff --git a/keyboards/idobao/id42/keymaps/via/keymap.c b/keyboards/idobao/id42/keymaps/via/keymap.c index 6f0e8534b5..953227bc20 100644 --- a/keyboards/idobao/id42/keymaps/via/keymap.c +++ b/keyboards/idobao/id42/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, FN_MO13, KC_LEFT, KC_DOWN, KC_RIGHT + KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, TL_LOWR, KC_LEFT, KC_DOWN, KC_RIGHT ), /* diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c index 6cc41aac34..bd0b500615 100644 --- a/keyboards/idobao/id61/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c @@ -26,7 +26,7 @@ enum { }; enum { - KB_ARRW = USER00, // toggle right modifiers are arrows feature + KB_ARRW = QK_KB_0, // toggle right modifiers are arrows feature KB_RSFT, // right shift or up arrow KB_RALT, // right alt or left arrow KB_RAPP, // menu or down arrow (Windows Menu) diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.c b/keyboards/idobao/id61/keymaps/idobao/specialk.c index 358d0cb764..03a31e6804 100644 --- a/keyboards/idobao/id61/keymaps/idobao/specialk.c +++ b/keyboards/idobao/id61/keymaps/idobao/specialk.c @@ -22,7 +22,7 @@ bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mo bool is_raised = get_highest_layer(layer_state|default_layer_state) != 0; if (record->event.pressed) { - set_keycode_raised(keycode - USER00, is_raised); // save for key release event + set_keycode_raised(keycode - QK_KB_0, is_raised); // save for key release event if (is_raised) { // *** Fn keyed *** if (arrow_mode) { @@ -43,7 +43,7 @@ bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mo } } } else { - if (get_keycode_raised(keycode - USER00)) { + if (get_keycode_raised(keycode - QK_KB_0)) { // *** Fn keyed *** if (arrow_mode) { // alternate key diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c index 9a290815b4..9213e4ffcf 100644 --- a/keyboards/idobao/id63/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c @@ -32,12 +32,12 @@ enum { enum { #ifdef RGB_MATRIX_ENABLE - RGB_TPK = USER00, // Toggle Per-Key + RGB_TPK = QK_KB_0, // Toggle Per-Key #ifndef ID63_DISABLE_UNDERGLOW RGB_TUG, // Toggle Underglow #endif // ID63_DISABLE_UNDERGLOW #endif // RGB_MATRIX_ENABLE - KB_VRSN = USER09 // debug, type version + KB_VRSN = QK_KB_9 // debug, type version }; #ifndef RGB_MATRIX_ENABLE @@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, SK_LT1C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, FN_MO13, SK_LT2A, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TL_LOWR, SK_LT2A, KC_LEFT, KC_DOWN, KC_RGHT ), /* diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c index 272c5326a3..7ebb8be5dc 100644 --- a/keyboards/idobao/id67/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c @@ -25,12 +25,12 @@ typedef union { enum { #ifdef RGB_MATRIX_ENABLE - RGB_TPK = USER00, // Toggle Per-Key + RGB_TPK = QK_KB_0, // Toggle Per-Key #ifndef ID67_DISABLE_UNDERGLOW RGB_TUG, // Toggle Underglow #endif // ID67_DISABLE_UNDERGLOW #endif //RGB_MATRIX_ENABLE - KB_VRSN = USER09 // debug, type version + KB_VRSN = QK_KB_9 // debug, type version }; #ifndef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c index f2d48cdc5d..d34c70fa63 100644 --- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c +++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c @@ -100,11 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ [_FN3] = LAYOUT_65_ansi_blocker( - QK_BOOT, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11, MACRO12, KC_PWR, KC_F15, + QK_BOOT, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, MC_11, MC_12, KC_PWR, KC_F15, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACRO00, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, KC_WAKE, XXXXXXX, XXXXXXX, MACRO13, MACRO14, MACRO15) + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MC_0, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, KC_WAKE, XXXXXXX, XXXXXXX, MC_13, MC_14, MC_15) }; #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c index 945484fbb0..710bb8c089 100644 --- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c @@ -30,10 +30,10 @@ enum { enum { #ifdef RGB_MATRIX_ENABLE - RGB_TPK = USER00, // Toggle Per-Key + RGB_TPK = QK_KB_0, // Toggle Per-Key RGB_TUG, // Toggle Underglow #endif // RGB_MATRIX_ENABLE - KB_VRSN = USER09 // debug, type version + KB_VRSN = QK_KB_9 // debug, type version }; #ifndef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c index bfc626c88e..53871f9161 100644 --- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c @@ -23,10 +23,10 @@ typedef union { enum { #ifdef RGB_MATRIX_ENABLE - RGB_TPK = USER00, // Toggle Per-Key + RGB_TPK = QK_KB_0, // Toggle Per-Key RGB_TUG, // Toggle Underglow #endif // RGB_MATRIX_ENABLE - KB_VRSN = USER09 // debug, type version + KB_VRSN = QK_KB_9 // debug, type version }; #ifndef RGB_MATRIX_ENABLE @@ -103,8 +103,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [2] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______, - _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, _______, _______, _______, _______, _______, _______, + _______, MC_11, MC_12, MC_13, MC_14, MC_15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c index 2d4ea973f8..cfdf65ae6f 100644 --- a/keyboards/idobao/id87/v2/keymaps/via/keymap.c +++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c @@ -72,8 +72,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [2] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______, - _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, _______, _______, _______, _______, _______, _______, + _______, MC_11, MC_12, MC_13, MC_14, MC_15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c index 663b710814..18e98b55af 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c index e7cde2d7ee..80ada5d8aa 100644 --- a/keyboards/keebio/bamfk1/keymaps/via/keymap.c +++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c @@ -14,7 +14,7 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT( RGB_MOD, // Big Switch - FN_MO13, KC_MUTE, // Encoder presses + TL_LOWR, KC_MUTE, // Encoder presses KC_DOWN, KC_UP, // Left encoder turns KC_VOLD, KC_VOLU // Right encoder turns ), diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c index cfd274cd9a..65d3ac434e 100644 --- a/keyboards/keebio/iris/keymaps/via/keymap.c +++ b/keyboards/keebio/iris/keymaps/via/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - KC_LGUI, FN_MO13, KC_ENT, KC_SPC, FN_MO23, KC_RALT + KC_LGUI, TL_LOWR, KC_ENT, KC_SPC, TL_UPPR, KC_RALT // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), diff --git a/keyboards/keebio/levinson/keymaps/via/keymap.c b/keyboards/keebio/levinson/keymaps/via/keymap.c index da90c73a4a..d640e1bf23 100644 --- a/keyboards/keebio/levinson/keymaps/via/keymap.c +++ b/keyboards/keebio/levinson/keymaps/via/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [1] = LAYOUT_ortho_4x12( diff --git a/keyboards/keebio/nyquist/keymaps/via/keymap.c b/keyboards/keebio/nyquist/keymaps/via/keymap.c index f5bf204c2a..5d986e69a0 100644 --- a/keyboards/keebio/nyquist/keymaps/via/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - MO(3), KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + MO(3), KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [1] = LAYOUT_ortho_5x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h index b492cda88f..5e56a828c8 100644 --- a/keyboards/keychron/common/keychron_common.h +++ b/keyboards/keychron/common/keychron_common.h @@ -23,11 +23,7 @@ #include "quantum_keycodes.h" enum custom_keycodes { -#ifdef VIA_ENABLE - KC_LOPTN = USER00, -#else - KC_LOPTN = SAFE_RANGE, -#endif + KC_LOPTN = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK. KC_ROPTN, KC_LCMMD, KC_RCMMD, diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c index 0c198180d4..4fc8ad58e5 100644 --- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c +++ b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c @@ -35,11 +35,7 @@ typedef union { user_config_t user_config; enum custom_keycodes { -#ifdef VIA_ENABLE - KC_LIGHT_TAB_TOGGLE = USER00, -#else - KC_LIGHT_TAB_TOGGLE = SAFE_RANGE, -#endif + KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK. KC_LIGHT_ALPHAS_TOGGLE, KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE, KC_FN_LAYER_COLOR_TOGGLE @@ -115,7 +111,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit eeconfig_update_user(user_config.raw); - } + } return false; // Skip all further processing of this key case KC_LIGHT_ALPHAS_TOGGLE: if (record->event.pressed) { @@ -154,4 +150,4 @@ bool get_fn_layer_transparent_keys_off(void) { bool get_fn_layer_color_enable(void) { return user_config.fn_layer_color_enable; -} \ No newline at end of file +} diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md b/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md index f8d5de012f..8ff2dbcc2c 100644 --- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md +++ b/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md @@ -18,16 +18,16 @@ This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple opt - Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off) - All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes: - - USER00 (default: F3) macOS Mission Control - - USER01 (default: F4) macOS Launchpad - - USER02 (default: Fn+Z) Caps Lock light Tab toggle - - USER03 (default: Fn+X) Caps Lock light alphas toggle - - USER04 (default: Fn+C) Fn layer non-defined keys RGB toggle - - USER05 (default: Fn+V) Fn layer defined keys static color toggle + - USER(0) (default: F3) macOS Mission Control + - USER(1) (default: F4) macOS Launchpad + - USER(2) (default: Fn+Z) Caps Lock light Tab toggle + - USER(3) (default: Fn+X) Caps Lock light alphas toggle + - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle + - USER(5) (default: Fn+V) Fn layer defined keys static color toggle RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness. -Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER00 through USER05 custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed. +Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed. #### USE AT YOUR OWN RISK diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c index 7bf1721514..77af30c5b6 100644 --- a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c +++ b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGMAC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_MACFN, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - + [MAC_FN] = LAYOUT_ansi_82( _______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MACPS, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c index e6457b0208..f86a84e468 100644 --- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c +++ b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c @@ -35,11 +35,7 @@ typedef union { user_config_t user_config; enum custom_keycodes { -#ifdef VIA_ENABLE - KC_LIGHT_TAB_TOGGLE = USER00, -#else - KC_LIGHT_TAB_TOGGLE = SAFE_RANGE, -#endif + KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK. KC_LIGHT_ALPHAS_TOGGLE, KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE, KC_FN_LAYER_COLOR_TOGGLE @@ -54,7 +50,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[MAC_BASE] = LAYOUT_iso_83( +[MAC_BASE] = LAYOUT_iso_83( KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_INS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, @@ -62,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[MAC_FN] = LAYOUT_iso_83( +[MAC_FN] = LAYOUT_iso_83( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -70,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -[WIN_BASE] = LAYOUT_iso_83( +[WIN_BASE] = LAYOUT_iso_83( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, @@ -78,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[WIN_FN] = LAYOUT_iso_83( +[WIN_FN] = LAYOUT_iso_83( KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -115,7 +111,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit eeconfig_update_user(user_config.raw); - } + } return false; // Skip all further processing of this key case KC_LIGHT_ALPHAS_TOGGLE: if (record->event.pressed) { @@ -154,4 +150,4 @@ bool get_fn_layer_transparent_keys_off(void) { bool get_fn_layer_color_enable(void) { return user_config.fn_layer_color_enable; -} \ No newline at end of file +} diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md index a6da9b3460..25d835b1c0 100644 --- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md +++ b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md @@ -18,16 +18,16 @@ This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple opt - Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off) - All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes: - - USER00 (default: F3) macOS Mission Control - - USER01 (default: F4) macOS Launchpad - - USER02 (default: Fn+Z) Caps Lock light Tab toggle - - USER03 (default: Fn+X) Caps Lock light alphas toggle - - USER04 (default: Fn+C) Fn layer non-defined keys RGB toggle - - USER05 (default: Fn+V) Fn layer defined keys static color toggle + - USER(0) (default: F3) macOS Mission Control + - USER(1) (default: F4) macOS Launchpad + - USER(2) (default: Fn+Z) Caps Lock light Tab toggle + - USER(3) (default: Fn+X) Caps Lock light alphas toggle + - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle + - USER(5) (default: Fn+V) Fn layer defined keys static color toggle RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness. -Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER00 through USER05 custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed. +Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed. #### USE AT YOUR OWN RISK diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c index 0693820029..538f13d786 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c @@ -29,11 +29,11 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_89( KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_ansi_89( RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, @@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_ansi_89( KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_ansi_89( RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c index da55586f86..eead42e5a9 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c @@ -31,11 +31,11 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_89( KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_ansi_89( RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, @@ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_ansi_89( KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_ansi_89( RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c index 9d19e8b09f..a62d880370 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c @@ -29,11 +29,11 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_90( KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_iso_90( RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, @@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_iso_90( KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_iso_90( RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c index 7d61df46b9..24c39fee4e 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c @@ -31,11 +31,11 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_90( KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_iso_90( RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, @@ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_BASE] = LAYOUT_iso_90( KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, - MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_iso_90( RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, diff --git a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c index a80ca64630..ea386157bc 100644 --- a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c +++ b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c @@ -24,11 +24,6 @@ enum layers{ _FN3 }; -enum custom_keycodes { - KC_TASK = USER00, - KC_FLXP -}; - #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) diff --git a/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c index 95fd7a12e0..898da7dbac 100644 --- a/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c @@ -30,17 +30,17 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_73( KC_MUTE, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), [WIN_BASE] = LAYOUT_ansi_73( KC_MUTE, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, - MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - MACRO05, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), + MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + MC_5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_ansi_73( RGB_TOG, KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c index 74191c2ff9..288f920d5e 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c @@ -15,7 +15,7 @@ #include QMK_KEYBOARD_H enum my_keycodes { - RMT = USER00, + RMT = QK_KB_0, RMS, RMIH, RMDH, diff --git a/keyboards/kprepublic/jj40/keymaps/via/keymap.c b/keyboards/kprepublic/jj40/keymaps/via/keymap.c index 131566cfbe..84e2708849 100644 --- a/keyboards/kprepublic/jj40/keymaps/via/keymap.c +++ b/keyboards/kprepublic/jj40/keymaps/via/keymap.c @@ -15,8 +15,8 @@ */ #include QMK_KEYBOARD_H -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty diff --git a/keyboards/kprepublic/jj50/keymaps/via/keymap.c b/keyboards/kprepublic/jj50/keymaps/via/keymap.c index a47756b212..3e8d1c5686 100644 --- a/keyboards/kprepublic/jj50/keymaps/via/keymap.c +++ b/keyboards/kprepublic/jj50/keymaps/via/keymap.c @@ -26,8 +26,8 @@ enum layers { }; #define FN MO(_FN) -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/massdrop/alt/keymaps/via/keymap.c b/keyboards/massdrop/alt/keymaps/via/keymap.c index 3781f2227b..2722fbbb37 100644 --- a/keyboards/massdrop/alt/keymaps/via/keymap.c +++ b/keyboards/massdrop/alt/keymaps/via/keymap.c @@ -17,7 +17,7 @@ #include QMK_KEYBOARD_H enum alt_keycodes { - U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active U_T_AGCR, //USB Toggle Automatic GCR control DBG_TOG, //DEBUG Toggle On / Off DBG_MTRX, //DEBUG Toggle Matrix Prints diff --git a/keyboards/massdrop/alt/keymaps/via/readme.md b/keyboards/massdrop/alt/keymaps/via/readme.md index 1315fb085d..61194ff7ab 100644 --- a/keyboards/massdrop/alt/keymaps/via/readme.md +++ b/keyboards/massdrop/alt/keymaps/via/readme.md @@ -1,19 +1,22 @@ # VIA keymap for the Drop Alt Keyboard -## *LED Modes:* + +## _LED Modes:_ + Enables all RGB Matrix animation modes available in QMK, all of which are selectable through VIA or using the LED mode keys ```c #define USB_LED_INDICATOR_ENABLE -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES ``` -## *User Keycodes:* +## _User Keycodes:_ + All keyboard specific keycodes are defined in the user_keycodes space, allowing for them to be placed on your keyboard through VIA ```c enum alt_keycodes { - U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active U_T_AGCR, //USB Toggle Automatic GCR control DBG_TOG, //DEBUG Toggle On / Off DBG_MTRX, //DEBUG Toggle Matrix Prints @@ -21,4 +24,4 @@ enum alt_keycodes { DBG_MOU, //DEBUG Toggle Mouse Prints MD_BOOT, //Restart into bootloader after hold timeout }; -``` \ No newline at end of file +``` diff --git a/keyboards/massdrop/ctrl/keymaps/via/keymap.c b/keyboards/massdrop/ctrl/keymaps/via/keymap.c index 6cca86cfac..471dd69aa0 100644 --- a/keyboards/massdrop/ctrl/keymaps/via/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/via/keymap.c @@ -17,7 +17,7 @@ #include QMK_KEYBOARD_H enum ctrl_keycodes { - U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active U_T_AGCR, //USB Toggle Automatic GCR control DBG_TOG, //DEBUG Toggle On / Off DBG_MTRX, //DEBUG Toggle Matrix Prints diff --git a/keyboards/mechlovin/adelais/keymaps/via/keymap.c b/keyboards/mechlovin/adelais/keymaps/via/keymap.c index c83d398f64..c67904c516 100644 --- a/keyboards/mechlovin/adelais/keymaps/via/keymap.c +++ b/keyboards/mechlovin/adelais/keymaps/via/keymap.c @@ -16,16 +16,16 @@ #include QMK_KEYBOARD_H enum my_keycodes { - BL_TOG = USER00, - BL_EFFECT = USER01, - BL_ISPD = USER02, - BL_DSPD = USER03, - BL_IHUE = USER04, - BL_DHUE = USER05, - BL_ISAT = USER06, - BL_DSAT = USER07, - BL_IVAL = USER08, - BL_DVAL = USER09 + BL_TOG = QK_KB_0, + BL_EFFECT, + BL_ISPD, + BL_DSPD, + BL_IHUE, + BL_DHUE, + BL_ISAT, + BL_DSAT, + BL_IVAL, + BL_DVAL }; diff --git a/keyboards/mechlovin/kay65/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c index 5011472a79..1f29ba8c3a 100644 --- a/keyboards/mechlovin/kay65/keymaps/via/keymap.c +++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c @@ -18,8 +18,8 @@ along with this program. If not, see . #include QMK_KEYBOARD_H enum my_keycodes { - LOGO_LED_ON = USER00, - LOGO_LED_OFF = USER01 + LOGO_LED_ON = QK_KB_0, + LOGO_LED_OFF }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c index b57369b8e1..344be9548c 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H enum my_keycodes { - LOGO_LED_ON = USER00, + LOGO_LED_ON = QK_KB_0, LOGO_LED_OFF }; diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.h b/keyboards/mechwild/puckbuddy/puckbuddy.h index 13540a5075..42c7ac16f0 100644 --- a/keyboards/mechwild/puckbuddy/puckbuddy.h +++ b/keyboards/mechwild/puckbuddy/puckbuddy.h @@ -40,11 +40,7 @@ extern keyboard_config_t keyboard_config; extern uint16_t dpi_array[]; enum keyboard_keycodes { -#ifdef VIA_ENABLE - DPI_UP = USER00, -#else - DPI_UP = SAFE_RANGE, -#endif + DPI_UP = QK_KB_0, DPI_DN, DPI_FINE, TAP_UP, diff --git a/keyboards/moonlander/keymaps/via/keymap.c b/keyboards/moonlander/keymaps/via/keymap.c index 70264c240b..91ad0d1bf7 100644 --- a/keyboards/moonlander/keymaps/via/keymap.c +++ b/keyboards/moonlander/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [SYMB] = LAYOUT_moonlander( - USER00, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + QK_KB_0, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, _______, _______, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, _______, @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [MDIA] = LAYOUT_moonlander( - USER01, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + QK_KB_1, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______, @@ -100,12 +100,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case USER00: + case QK_KB_0: if (record->event.pressed) { SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); } return false; - case USER01: + case QK_KB_1: if (record->event.pressed) { keyboard_config.led_level ^= 1; eeconfig_update_kb(keyboard_config.raw); diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c index 4204b7acd8..a1b54a8411 100644 --- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c @@ -26,6 +26,11 @@ typedef union { user_config_t user_config; +enum custom_keycodes { + USER00 = QK_KB_0, + USER01 +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c index bdcd738708..e94667954e 100644 --- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c @@ -27,6 +27,11 @@ typedef union { user_config_t user_config; +enum custom_keycodes { + USER00 = QK_KB_0, + USER01 +}; + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/mxss/mxss_frontled.h b/keyboards/mxss/mxss_frontled.h index 3660668655..71aba3a793 100644 --- a/keyboards/mxss/mxss_frontled.h +++ b/keyboards/mxss/mxss_frontled.h @@ -64,7 +64,7 @@ typedef union { // Custom keycodes for front LED control enum fled_keycodes { - FLED_MOD = USER00, // USER00 = VIA custom keycode start + FLED_MOD = QK_KB_0, // QK_KB_0 = VIA custom keycode start FLED_VAI, FLED_VAD, NEW_SAFE_RANGE // define a new safe range diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c index 631f28171a..33652005cb 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c @@ -29,7 +29,7 @@ enum layer_names { #define KC_DISC_DEAF KC_F24 enum custom_keycodes { - PROG = USER00, + PROG = QK_KB_0, DISC_MUTE, DISC_DEAF, SUPER_ALT_TAB, diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c index aab6a41af3..b71f9119ef 100644 --- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c @@ -24,11 +24,9 @@ enum layer_names { #define KC_DISC_MUTE KC_F23 #define KC_DISC_DEAF KC_F24 -#define NUM_CUST_KEYCODES (_NUM_CUST_KCS - SAFE_RANGE) -#define VIA_KEYCODE_RANGE USER00 enum custom_keycodes { - PROG = SAFE_RANGE, + PROG = QK_KB_0, DISC_MUTE, DISC_DEAF, SUPER_ALT_TAB, @@ -76,17 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void map_via_keycode(uint16_t * keycode) { - if (abs(*keycode - VIA_KEYCODE_RANGE) < NUM_CUST_KEYCODES) { //make into macro? - dprintf("VIA custom keycode found, mapping to QMK keycode.\n"); - uint16_t new_keycode = (*keycode - VIA_KEYCODE_RANGE) + SAFE_RANGE; - dprintf("VIA KC: %u QMK KC: %u\n", *keycode, new_keycode); - *keycode = new_keycode; - } -} bool process_record_user(uint16_t keycode, keyrecord_t *record) { - map_via_keycode(&keycode); // Send keystrokes to host keyboard, if connected (see readme) process_record_remote_kb(keycode, record); switch(keycode) { diff --git a/keyboards/orthocode/orthocode.h b/keyboards/orthocode/orthocode.h index 57f122a471..fd3fa92744 100644 --- a/keyboards/orthocode/orthocode.h +++ b/keyboards/orthocode/orthocode.h @@ -37,14 +37,6 @@ } enum custom_keycodes { -#ifdef VIA_ENABLE - SHIFTSPACE = USER00, -#else - SHIFTSPACE = SAFE_RANGE, -#endif -#ifdef VIA_ENABLE - QWERTY = SAFE_RANGE -#else + SHIFTSPACE = QK_KB_0, QWERTY -#endif }; diff --git a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c index 0bf0d42d5a..0bb0c2221d 100644 --- a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c +++ b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c @@ -18,7 +18,7 @@ uint16_t layer_timer; enum layer_keycodes { - TG_LAYER = USER00 + TG_LAYER = QK_KB_0 }; uint8_t get_hold_layer(void) { diff --git a/keyboards/pdxkbc/keymaps/via/keymap.c b/keyboards/pdxkbc/keymaps/via/keymap.c index 89d98dea89..84507008e5 100644 --- a/keyboards/pdxkbc/keymaps/via/keymap.c +++ b/keyboards/pdxkbc/keymaps/via/keymap.c @@ -16,8 +16,8 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - MACRO00, MACRO01, - MACRO02, MACRO03, + MC_0, MC_1, + MC_2, MC_3, KC_VOLU, KC_VOLD ), diff --git a/keyboards/planck/keymaps/via/keymap.c b/keyboards/planck/keymaps/via/keymap.c index 57c6900d83..b0226b6a1e 100644 --- a/keyboards/planck/keymaps/via/keymap.c +++ b/keyboards/planck/keymaps/via/keymap.c @@ -17,8 +17,8 @@ #include QMK_KEYBOARD_H -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h index 508a883169..906b6c9308 100644 --- a/keyboards/ploopyco/mouse/mouse.h +++ b/keyboards/ploopyco/mouse/mouse.h @@ -41,17 +41,9 @@ extern keyboard_config_t keyboard_config; extern uint16_t dpi_array[]; enum ploopy_keycodes { -#ifdef VIA_ENABLE - DPI_CONFIG = USER00, -#else - DPI_CONFIG = SAFE_RANGE, -#endif + DPI_CONFIG = QK_KB_0, DRAG_SCROLL, -#ifdef VIA_ENABLE - PLOOPY_SAFE_RANGE = SAFE_RANGE, -#else PLOOPY_SAFE_RANGE, -#endif }; bool encoder_update_user(uint8_t index, bool clockwise); diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h index e2e46b2c97..d6c4b0f985 100644 --- a/keyboards/ploopyco/trackball/trackball.h +++ b/keyboards/ploopyco/trackball/trackball.h @@ -44,17 +44,9 @@ extern keyboard_config_t keyboard_config; extern uint16_t dpi_array[]; enum ploopy_keycodes { -#ifdef VIA_ENABLE - DPI_CONFIG = USER00, -#else - DPI_CONFIG = SAFE_RANGE, -#endif + DPI_CONFIG = QK_KB_0, DRAG_SCROLL, -#ifdef VIA_ENABLE - PLOOPY_SAFE_RANGE = SAFE_RANGE, -#else PLOOPY_SAFE_RANGE, -#endif }; bool encoder_update_user(uint8_t index, bool clockwise); diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h index 3410751cb0..cbd84cc4b4 100644 --- a/keyboards/ploopyco/trackball_mini/trackball_mini.h +++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h @@ -41,17 +41,9 @@ typedef union { extern keyboard_config_t keyboard_config; enum ploopy_keycodes { -#ifdef VIA_ENABLE - DPI_CONFIG = USER00, -#else - DPI_CONFIG = SAFE_RANGE, -#endif + DPI_CONFIG = QK_KB_0, DRAG_SCROLL, -#ifdef VIA_ENABLE - PLOOPY_SAFE_RANGE = SAFE_RANGE, -#else PLOOPY_SAFE_RANGE, -#endif }; bool encoder_update_user(uint8_t index, bool clockwise); diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h index 168e894064..9a01944282 100644 --- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h +++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h @@ -46,15 +46,7 @@ extern keyboard_config_t keyboard_config; extern uint16_t dpi_array[]; enum ploopy_keycodes { -#ifdef VIA_ENABLE - DPI_CONFIG = USER00, -#else - DPI_CONFIG = SAFE_RANGE, -#endif + DPI_CONFIG = QK_KB_0, DRAG_SCROLL, -#ifdef VIA_ENABLE - PLOOPY_SAFE_RANGE = SAFE_RANGE, -#else PLOOPY_SAFE_RANGE, -#endif }; diff --git a/keyboards/plum47/keymaps/via/keymap.c b/keyboards/plum47/keymaps/via/keymap.c index 8927fa4f76..3d50fe1133 100644 --- a/keyboards/plum47/keymaps/via/keymap.c +++ b/keyboards/plum47/keymaps/via/keymap.c @@ -23,8 +23,8 @@ enum layer_names { _BLANK }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty diff --git a/keyboards/preonic/keymaps/jpe230/jpe230.h b/keyboards/preonic/keymaps/jpe230/jpe230.h index e6b4ed1401..b53239bd31 100644 --- a/keyboards/preonic/keymaps/jpe230/jpe230.h +++ b/keyboards/preonic/keymaps/jpe230/jpe230.h @@ -15,14 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef VIA_ENABLE - #define USER_START USER00 -#else - #define USER_START SAFE_RANGE -#endif - enum jpe230_keycodes { - KC_LSRS = USER_START, + KC_LSRS = QK_KB_0, KC_LERS, KC_LSRE }; diff --git a/keyboards/preonic/keymaps/via/keymap.c b/keyboards/preonic/keymaps/via/keymap.c index e9c5c32c73..2d8a3c763f 100644 --- a/keyboards/preonic/keymaps/via/keymap.c +++ b/keyboards/preonic/keymaps/via/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower @@ -190,8 +190,8 @@ void matrix_scan_user(void) { bool music_mask_user(uint16_t keycode) { switch (keycode) { - case FN_MO13: - case FN_MO23: + case TL_LOWR: + case TL_UPPR: return false; default: return true; diff --git a/keyboards/rainkeebs/delilah/keymaps/via/keymap.c b/keyboards/rainkeebs/delilah/keymaps/via/keymap.c index 3a6e0d9a20..3cd3624146 100644 --- a/keyboards/rainkeebs/delilah/keymaps/via/keymap.c +++ b/keyboards/rainkeebs/delilah/keymaps/via/keymap.c @@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, FN_MO23, - KC_LCTL, KC_LGUI, KC_LALT, FN_MO13, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TL_UPPR, + KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/reviung/reviung39/keymaps/via/keymap.c b/keyboards/reviung/reviung39/keymaps/via/keymap.c index 2ec7b53d21..386c2741dd 100644 --- a/keyboards/reviung/reviung39/keymaps/via/keymap.c +++ b/keyboards/reviung/reviung39/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), - FN_MO13, KC_SPC, FN_MO23 + TL_LOWR, KC_SPC, TL_UPPR ), [_LOWER] = LAYOUT( diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c index e744aee527..61b73bd0c0 100644 --- a/keyboards/rocketboard_16/keycode_lookup.c +++ b/keyboards/rocketboard_16/keycode_lookup.c @@ -337,38 +337,38 @@ lookup_table_t lookup_table[333] = {"SC_RCPC", SC_RCPC}, {"SC_LAPO", SC_LAPO}, {"SC_RAPC", SC_RAPC}, - {"FN_MO13", FN_MO13}, - {"FN_MO23", FN_MO23}, - {"MACRO00", MACRO00}, - {"MACRO01", MACRO01}, - {"MACRO02", MACRO02}, - {"MACRO03", MACRO03}, - {"MACRO04", MACRO04}, - {"MACRO05", MACRO05}, - {"MACRO06", MACRO06}, - {"MACRO07", MACRO07}, - {"MACRO08", MACRO08}, - {"MACRO09", MACRO09}, - {"MACRO10", MACRO10}, - {"MACRO11", MACRO11}, - {"MACRO12", MACRO12}, - {"MACRO13", MACRO13}, - {"MACRO14", MACRO14}, - {"MACRO15", MACRO15}, - {"USER00", USER00}, - {"USER01", USER01}, - {"USER02", USER02}, - {"USER03", USER03}, - {"USER04", USER04}, - {"USER05", USER05}, - {"USER06", USER06}, - {"USER07", USER07}, - {"USER08", USER08}, - {"USER09", USER09}, - {"USER10", USER10}, - {"USER11", USER11}, - {"USER12", USER12}, - {"USER13", USER13}, - {"USER14", USER14}, - {"USER15", USER15} + {"TL_LOWR", TL_LOWR}, + {"TL_UPPR", TL_UPPR}, + {"QK_MACRO_0", QK_MACRO_0}, + {"QK_MACRO_1", QK_MACRO_1}, + {"QK_MACRO_2", QK_MACRO_2}, + {"QK_MACRO_3", QK_MACRO_3}, + {"QK_MACRO_4", QK_MACRO_4}, + {"QK_MACRO_5", QK_MACRO_5}, + {"QK_MACRO_6", QK_MACRO_6}, + {"QK_MACRO_7", QK_MACRO_7}, + {"QK_MACRO_8", QK_MACRO_8}, + {"QK_MACRO_9", QK_MACRO_9}, + {"QK_MACRO_10", QK_MACRO_10}, + {"QK_MACRO_11", QK_MACRO_11}, + {"QK_MACRO_12", QK_MACRO_12}, + {"QK_MACRO_13", QK_MACRO_13}, + {"QK_MACRO_14", QK_MACRO_14}, + {"QK_MACRO_15", QK_MACRO_15}, + {"QK_KB_0", QK_KB_0}, + {"QK_KB_1", QK_KB_1}, + {"QK_KB_2", QK_KB_2}, + {"QK_KB_3", QK_KB_3}, + {"QK_KB_4", QK_KB_4}, + {"QK_KB_5", QK_KB_5}, + {"QK_KB_6", QK_KB_6}, + {"QK_KB_7", QK_KB_7}, + {"QK_KB_8", QK_KB_8}, + {"QK_KB_9", QK_KB_9}, + {"QK_KB_10", QK_KB_10}, + {"QK_KB_11", QK_KB_11}, + {"QK_KB_12", QK_KB_12}, + {"QK_KB_13", QK_KB_13}, + {"QK_KB_14", QK_KB_14}, + {"QK_KB_15", QK_KB_15} }; diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c index c8391bff21..5e5fef6456 100644 --- a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c +++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c @@ -18,7 +18,7 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - KC_00 = USER00, + KC_00 = QK_KB_0, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c index ef86c4b0b7..eb523ebe50 100644 --- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c +++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c @@ -18,7 +18,7 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - KC_00 = USER00, + KC_00 = QK_KB_0, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/takashicompany/radialex/keymaps/via/keymap.c b/keyboards/takashicompany/radialex/keymaps/via/keymap.c index de23d306eb..5ce5ccccdf 100644 --- a/keyboards/takashicompany/radialex/keymaps/via/keymap.c +++ b/keyboards/takashicompany/radialex/keymaps/via/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#define RADIALEX USER00 +#define RADIALEX QK_KB_0 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index 49d421e934..de6a889577 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -126,7 +126,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } switch(keycode) { - case USER00: + case QK_KB_0: if (record->event.pressed) { spongebob_mode ^= 1; } diff --git a/keyboards/w1_at/keymaps/via/keymap.c b/keyboards/w1_at/keymaps/via/keymap.c index 2c6cf0f018..ce3b6aa4bd 100644 --- a/keyboards/w1_at/keymaps/via/keymap.c +++ b/keyboards/w1_at/keymaps/via/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H enum custom_keycodes { - KC_P00 = USER00 + KC_P00 = QK_KB_0 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c index 27dc90f721..4bb827cf3a 100644 --- a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c @@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR), // Fn1 Layer [1] = LAYOUT_60_hhkb( diff --git a/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c index 5316207f44..0bff6f5ee8 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, _______, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, _______, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - _______, _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + _______, _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), diff --git a/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c index 37f9bc94db..6a28f19f2a 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, _______, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, _______, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - _______, _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + _______, _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c index 16814efd7a..86d93b82a1 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c +++ b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c @@ -15,31 +15,3 @@ */ #include "rama_works_m50_ax.h" - -#ifndef VIA_ENABLE -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case FN_MO13: - if (record->event.pressed) { - layer_on(1); - update_tri_layer(1, 2, 3); - } else { - layer_off(1); - update_tri_layer(1, 2, 3); - } - return false; - break; - case FN_MO23: - if (record->event.pressed) { - layer_on(2); - update_tri_layer(1, 2, 3); - } else { - layer_off(2); - update_tri_layer(1, 2, 3); - } - return false; - break; - } - return process_record_user(keycode, record); -} -#endif // VIA_ENABLE \ No newline at end of file diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c index c3ff625388..e869a9a070 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR), // Fn1 Layer [1] = LAYOUT_60_hhkb( diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c index c3ff625388..e869a9a070 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR), // Fn1 Layer [1] = LAYOUT_60_hhkb( diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c index c3ff625388..e869a9a070 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR), // Fn1 Layer [1] = LAYOUT_60_hhkb( diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c index c3a0886d8b..5b61116415 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c @@ -10,8 +10,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3,TD(SSHT), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(LBRC), KC_RBRC, KC_BSPC, CTRL_C_UP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCLN), TD(QUOT), KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LALT, KC_LGUI, KC_SPC, KC_RALT, FN_MO23), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TL_UPPR), // Fn1 Layer [1] = LAYOUT_60_hhkb( diff --git a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c index 53f63edd6c..c5517c8924 100644 --- a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO), // Fn1 Layer [1] = LAYOUT_all( diff --git a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c index 53f63edd6c..c5517c8924 100644 --- a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO), // Fn1 Layer [1] = LAYOUT_all( diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c index 7d43075b34..10b5ee1009 100644 --- a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO), // Fn1 Layer [1] = LAYOUT_all( diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c index 7d43075b34..10b5ee1009 100644 --- a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO), // Fn1 Layer [1] = LAYOUT_all( diff --git a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c index c1fdd18f35..5e598a763f 100644 --- a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c @@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_RCTL), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_RCTL), [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, diff --git a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c index c1fdd18f35..5e598a763f 100644 --- a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c @@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_RCTL), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_RCTL), [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c index 3f89066a6c..92c43c794d 100644 --- a/keyboards/wilba_tech/wt_main.c +++ b/keyboards/wilba_tech/wt_main.c @@ -89,29 +89,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) process_record_backlight(keycode, record); #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED - switch (keycode) { - case FN_MO13: - if (record->event.pressed) { - layer_on(1); - update_tri_layer(1, 2, 3); - } else { - layer_off(1); - update_tri_layer(1, 2, 3); - } - return false; - break; - case FN_MO23: - if (record->event.pressed) { - layer_on(2); - update_tri_layer(1, 2, 3); - } else { - layer_off(2); - update_tri_layer(1, 2, 3); - } - return false; - break; - } - return process_record_user(keycode, record); } @@ -173,6 +150,14 @@ void via_custom_value_command_kb(uint8_t *data, uint8_t length) { // DO NOT call raw_hid_send(data,length) here, let caller do this } + +void via_set_device_indication(uint8_t value) +{ +#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED + backlight_device_indication(value); +#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED +} + #endif // VIA_ENABLE // diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c index 0fc6e346a1..c79fc02cd9 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.c +++ b/keyboards/wilba_tech/wt_mono_backlight.c @@ -184,13 +184,13 @@ defined(MONO_BACKLIGHT_WT80_A) IS31FL3736_mono_set_brightness(16, 255); } #endif -#if defined(MONO_BACKLIGHT_WT80_A) +#if defined(MONO_BACKLIGHT_WT80_A) if ( host_keyboard_led_state().scroll_lock ) { // SW7,CS7 = (6*8+6) = 54 IS31FL3736_mono_set_brightness(54, 255); } #endif -#if defined(MONO_BACKLIGHT_WT75_C) +#if defined(MONO_BACKLIGHT_WT75_C) if ( host_keyboard_led_state().scroll_lock ) { // SW7,CS8 = (6*8+7) = 55 IS31FL3736_mono_set_brightness(55, 255); @@ -471,3 +471,14 @@ void backlight_brightness_decrease(void) g_config.brightness = decrement( g_config.brightness, 8, 0, 255 ); backlight_config_save(); } + +void backlight_device_indication(uint8_t value) +{ + static uint8_t current_effect = 0; + static uint8_t alternate_effect = 0; + if ( value == 0 ) { + current_effect = g_config.effect; + alternate_effect = g_config.effect > 0 ? 0 : 1; + } + g_config.effect = value % 2 == 0 ? alternate_effect : current_effect; +} diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h index 88183fd847..9bf76b44bb 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.h +++ b/keyboards/wilba_tech/wt_mono_backlight.h @@ -76,3 +76,4 @@ void backlight_effect_speed_decrease(void); void backlight_brightness_increase(void); void backlight_brightness_decrease(void); +void backlight_device_indication(uint8_t value); diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index c82f86304c..1cd00ae41f 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -2554,9 +2554,7 @@ static void gpt_backlight_timer_task(GPTDriver *gptp) if ( ! suspend_backlight ) { -#if !defined(RGB_BACKLIGHT_M6_B) && !defined(RGB_BACKLIGHT_M10_C) backlight_effect_indicators(); -#endif } } @@ -3426,3 +3424,14 @@ void backlight_debug_led( bool state ) } } #endif // defined(RGB_DEBUGGING_ONLY) + +void backlight_device_indication(uint8_t value) +{ + static uint8_t current_effect = 0; + static uint8_t alternate_effect = 0; + if ( value == 0 ) { + current_effect = g_config.effect; + alternate_effect = g_config.effect > 0 ? 0 : 1; + } + g_config.effect = value % 2 == 0 ? alternate_effect : current_effect; +} diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h index 2114789213..6fb2ee2122 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.h +++ b/keyboards/wilba_tech/wt_rgb_backlight.h @@ -112,3 +112,4 @@ void backlight_color_2_sat_decrease(void); void backlight_test_led( uint8_t index, bool red, bool green, bool blue ); void backlight_debug_led(bool state); +void backlight_device_indication(uint8_t value); diff --git a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h index 5a43649535..b8c23c4b07 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h +++ b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h @@ -15,20 +15,19 @@ */ #pragma once -// This is hardcoded at 0x5F00 so it's well after keycode value SAFE_RANGE enum wt_rgb_backlight_keycodes { - BR_INC = 0x5F00, // backlight brightness increase - BR_DEC, // backlight brightness decrease - EF_INC, // backlight effect increase - EF_DEC, // backlight effect decrease - ES_INC, - ES_DEC, - H1_INC, - H1_DEC, - S1_INC, - S1_DEC, - H2_INC, - H2_DEC, - S2_INC, - S2_DEC + BR_INC = QK_KB_0, // brightness increase + BR_DEC, // brightness decrease + EF_INC, // effect increase + EF_DEC, // effect decrease + ES_INC, // effect speed increase + ES_DEC, // effect speed decrease + H1_INC, // color 1 hue increase + H1_DEC, // color 1 hue decrease + S1_INC, // color 1 saturation increase + S1_DEC, // color 1 saturation decrease + H2_INC, // color 2 hue increase + H2_DEC, // color 2 hue decrease + S2_INC, // color 2 saturation increase + S2_DEC // color 2 saturation decrease }; diff --git a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c index 6c290fcdeb..ad204d5c38 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c +++ b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, FN_MO23, KC_RCTL), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, TL_UPPR, KC_RCTL), // Fn1 Layer [1] = LAYOUT_60_ansi_split_bs_rshift( diff --git a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c index f75fb4a57a..c7352fc469 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO13, FN_MO23, KC_RCTL), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL), // Fn1 Layer [1] = LAYOUT_60_ansi( diff --git a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c index 0bfc63911e..c45ebd98ec 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c +++ b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, - KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR, + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR), // Fn1 Layer [1] = LAYOUT_60_hhkb( diff --git a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c index 9c4faeae48..292f248377 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c +++ b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO13, FN_MO23, KC_RCTL), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL), // Fn1 Layer [1] = LAYOUT_60_iso( diff --git a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c index 4232225310..898d80eaee 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c +++ b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_CAFN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENFN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSUP, FN_MO13, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSUP, TL_LOWR, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_TRNS, KC_RGLT, KC_RGDN, KC_RCRT), // Fn1 Layer diff --git a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c index 889f94ebe1..58e4dc679c 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO13, FN_MO23, KC_RCTL), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL), // Fn1 Layer [1] = LAYOUT_60_all( diff --git a/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c index 9a91b12f28..cd90454655 100644 --- a/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT), // Fn1 Layer [1] = LAYOUT_65_normie( diff --git a/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c index 35698065dc..f031a97526 100644 --- a/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c +++ b/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LGUI, KC_LALT, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LGUI, KC_LALT, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT), // Fn1 Layer [1] = LAYOUT_65_all( diff --git a/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c index 35698065dc..f031a97526 100644 --- a/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LGUI, KC_LALT, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LGUI, KC_LALT, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT), // Fn1 Layer [1] = LAYOUT_65_all( diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c index a8e9dbb2ab..a1abd7b5e2 100644 --- a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c +++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(LBRC), KC_RBRC, KC_BSLS, TD(END_HOME), CTRL_C_UP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCLN), TD(QUOT), KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LALT, KC_LCMD, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LALT, KC_LCMD, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT), // Fn1 Layer [1] = LAYOUT_65_normie( diff --git a/keyboards/work_louder/micro/keymaps/via/keymap.c b/keyboards/work_louder/micro/keymaps/via/keymap.c index 8cc41e1e50..514aae2aa0 100644 --- a/keyboards/work_louder/micro/keymaps/via/keymap.c +++ b/keyboards/work_louder/micro/keymaps/via/keymap.c @@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - USER00, USER01, USER03, USER05, - XXXXXXX, USER02, USER04, USER06, + QK_KB_0, QK_KB_1, QK_KB_3, QK_KB_5, + XXXXXXX, QK_KB_2, QK_KB_4, QK_KB_6, XXXXXXX, XXXXXXX, XXXXXXX, TO(0) ) }; @@ -53,7 +53,7 @@ work_louder_config_t work_louder_config; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case USER09: + case QK_KB_9: if (record->event.pressed) { work_louder_config.led_level++; if (work_louder_config.led_level > 4) { diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h index 9a5cda0fc6..8940cddefc 100644 --- a/keyboards/work_louder/rgb_functions.h +++ b/keyboards/work_louder/rgb_functions.h @@ -46,31 +46,31 @@ # endif #else # ifndef RGB_MATRIX_TOGGLE -# define RGB_MATRIX_TOGGLE USER00 +# define RGB_MATRIX_TOGGLE QK_KB_0 # endif # ifndef RGB_MATRIX_MODE_INC -# define RGB_MATRIX_MODE_INC USER01 +# define RGB_MATRIX_MODE_INC QK_KB_1 # endif # ifndef RGB_MATRIX_MODE_DEC -# define RGB_MATRIX_MODE_DEC USER02 +# define RGB_MATRIX_MODE_DEC QK_KB_2 # endif # ifndef RGB_MATRIX_HUE_INC -# define RGB_MATRIX_HUE_INC USER03 +# define RGB_MATRIX_HUE_INC QK_KB_3 # endif # ifndef RGB_MATRIX_HUE_DEC -# define RGB_MATRIX_HUE_DEC USER04 +# define RGB_MATRIX_HUE_DEC QK_KB_4 # endif # ifndef RGB_MATRIX_SAT_INC -# define RGB_MATRIX_SAT_INC USER05 +# define RGB_MATRIX_SAT_INC QK_KB_5 # endif # ifndef RGB_MATRIX_SAT_DEC -# define RGB_MATRIX_SAT_DEC USER06 +# define RGB_MATRIX_SAT_DEC QK_KB_6 # endif # ifndef RGB_MATRIX_VAL_INC -# define RGB_MATRIX_VAL_INC USER07 +# define RGB_MATRIX_VAL_INC QK_KB_7 # endif # ifndef RGB_MATRIX_VAL_DEC -# define RGB_MATRIX_VAL_DEC USER08 +# define RGB_MATRIX_VAL_DEC QK_KB_8 # endif #endif diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c index 17321a773b..08df414e88 100644 --- a/keyboards/work_louder/work_board/keymaps/via/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c @@ -22,13 +22,13 @@ enum tap_dances { ENC_TAP, }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, USER09, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, QK_KB_9, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, MO(3), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT @@ -99,10 +99,10 @@ typedef union { work_louder_config_t work_louder_config; bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (keycode == USER09) { + if (keycode == QK_KB_9) { preprocess_tap_dance(TD(ENC_TAP), record); return process_tap_dance(TD(ENC_TAP), record); - } else if (keycode == USER10 && record->event.pressed) { + } else if (keycode == QK_KB_10 && record->event.pressed) { work_louder_config.led_level ^= true; eeconfig_update_user(work_louder_config.raw); layer_state_set_kb(layer_state); diff --git a/keyboards/xelus/la_plus/la_plus.h b/keyboards/xelus/la_plus/la_plus.h index f19b79237f..b3030c7cf4 100755 --- a/keyboards/xelus/la_plus/la_plus.h +++ b/keyboards/xelus/la_plus/la_plus.h @@ -42,9 +42,5 @@ typedef union { } keyboard_config_t; enum la_plus_keycodes { -#ifdef VIA_ENABLE - STARTUP_ANIMATION_CONFIG = USER00, -#else - STARTUP_ANIMATION_CONFIG = SAFE_RANGE, -#endif + STARTUP_ANIMATION_CONFIG = QK_KB_0, }; diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c index d664eb5a03..c7261a3fb8 100644 --- a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c +++ b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c @@ -10,8 +10,8 @@ enum layer_number { _ADJUST, }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/quantum/keycodes.h b/quantum/keycodes.h index ec51459272..dfebd22044 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -721,7 +721,70 @@ enum qk_keycode_defines { QK_AUTOCORRECT_TOGGLE = 0x7C76, QK_TRI_LAYER_LOWER = 0x7C77, QK_TRI_LAYER_UPPER = 0x7C78, - SAFE_RANGE = 0x7E00, + QK_KB_0 = 0x7E00, + QK_KB_1 = 0x7E01, + QK_KB_2 = 0x7E02, + QK_KB_3 = 0x7E03, + QK_KB_4 = 0x7E04, + QK_KB_5 = 0x7E05, + QK_KB_6 = 0x7E06, + QK_KB_7 = 0x7E07, + QK_KB_8 = 0x7E08, + QK_KB_9 = 0x7E09, + QK_KB_10 = 0x7E0A, + QK_KB_11 = 0x7E0B, + QK_KB_12 = 0x7E0C, + QK_KB_13 = 0x7E0D, + QK_KB_14 = 0x7E0E, + QK_KB_15 = 0x7E0F, + QK_KB_16 = 0x7E10, + QK_KB_17 = 0x7E11, + QK_KB_18 = 0x7E12, + QK_KB_19 = 0x7E13, + QK_KB_20 = 0x7E14, + QK_KB_21 = 0x7E15, + QK_KB_22 = 0x7E16, + QK_KB_23 = 0x7E17, + QK_KB_24 = 0x7E18, + QK_KB_25 = 0x7E19, + QK_KB_26 = 0x7E1A, + QK_KB_27 = 0x7E1B, + QK_KB_28 = 0x7E1C, + QK_KB_29 = 0x7E1D, + QK_KB_30 = 0x7E1E, + QK_KB_31 = 0x7E1F, + QK_USER_0 = 0x7F00, + QK_USER_1 = 0x7F01, + QK_USER_2 = 0x7F02, + QK_USER_3 = 0x7F03, + QK_USER_4 = 0x7F04, + QK_USER_5 = 0x7F05, + QK_USER_6 = 0x7F06, + QK_USER_7 = 0x7F07, + QK_USER_8 = 0x7F08, + QK_USER_9 = 0x7F09, + QK_USER_10 = 0x7F0A, + QK_USER_11 = 0x7F0B, + QK_USER_12 = 0x7F0C, + QK_USER_13 = 0x7F0D, + QK_USER_14 = 0x7F0E, + QK_USER_15 = 0x7F0F, + QK_USER_16 = 0x7F10, + QK_USER_17 = 0x7F11, + QK_USER_18 = 0x7F12, + QK_USER_19 = 0x7F13, + QK_USER_20 = 0x7F14, + QK_USER_21 = 0x7F15, + QK_USER_22 = 0x7F16, + QK_USER_23 = 0x7F17, + QK_USER_24 = 0x7F18, + QK_USER_25 = 0x7F19, + QK_USER_26 = 0x7F1A, + QK_USER_27 = 0x7F1B, + QK_USER_28 = 0x7F1C, + QK_USER_29 = 0x7F1D, + QK_USER_30 = 0x7F1E, + QK_USER_31 = 0x7F1F, // Alias XXXXXXX = KC_NO, @@ -1351,3 +1414,5 @@ enum qk_keycode_defines { #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_TRI_LAYER_UPPER) +#define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31) +#define IS_USER_KEYCODE(code) ((code) >= QK_USER_0 && (code) <= QK_USER_31) diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 9933d5c989..fd737da717 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -33,6 +33,8 @@ #define QK_RSFT 0x1200 #define QK_RALT 0x1400 #define QK_RGUI 0x1800 + +#define SAFE_RANGE QK_KB // clang-format on // Generic decoding for the whole QK_MODS range diff --git a/quantum/via.c b/quantum/via.c index 8cb6eb5fc6..c54e37a175 100644 --- a/quantum/via.c +++ b/quantum/via.c @@ -153,38 +153,13 @@ __attribute__((weak)) void via_set_device_indication(uint8_t value) { bool process_record_via(uint16_t keycode, keyrecord_t *record) { // Handle macros if (record->event.pressed) { - if (keycode >= MACRO00 && keycode <= MACRO15) { - uint8_t id = keycode - MACRO00; + if (keycode >= QK_MACRO && keycode <= QK_MACRO_MAX) { + uint8_t id = keycode - QK_MACRO; dynamic_keymap_macro_send(id); return false; } } - // TODO: ideally this would be generalized and refactored into - // QMK core as advanced keycodes, until then, the simple case - // can be available here to keyboards using VIA - switch (keycode) { - case FN_MO13: - if (record->event.pressed) { - layer_on(1); - update_tri_layer(1, 2, 3); - } else { - layer_off(1); - update_tri_layer(1, 2, 3); - } - return false; - break; - case FN_MO23: - if (record->event.pressed) { - layer_on(2); - update_tri_layer(1, 2, 3); - } else { - layer_off(2); - update_tri_layer(1, 2, 3); - } - return false; - break; - } return true; } @@ -303,25 +278,22 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { break; } case id_switch_matrix_state: { -// Round up to the nearest number of bytes required to hold row state. -// Multiply by number of rows to get the required size in bytes. -// Guard against this being too big for the HID message. -#if (((MATRIX_COLS + 7) / 8) * MATRIX_ROWS <= 28) - uint8_t i = 1; - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - matrix_row_t value = matrix_get_row(row); -# if (MATRIX_COLS > 24) + uint8_t offset = command_data[1]; + uint8_t rows = 28 / ((MATRIX_COLS + 7) / 8); + uint8_t i = 2; + for (uint8_t row = 0; row < rows && row + offset < MATRIX_ROWS; row++) { + matrix_row_t value = matrix_get_row(row + offset); +#if (MATRIX_COLS > 24) command_data[i++] = (value >> 24) & 0xFF; -# endif -# if (MATRIX_COLS > 16) +#endif +#if (MATRIX_COLS > 16) command_data[i++] = (value >> 16) & 0xFF; -# endif -# if (MATRIX_COLS > 8) +#endif +#if (MATRIX_COLS > 8) command_data[i++] = (value >> 8) & 0xFF; -# endif +#endif command_data[i++] = value & 0xFF; } -#endif break; } case id_firmware_version: { diff --git a/quantum/via.h b/quantum/via.h index eca0733525..ab4eb05028 100644 --- a/quantum/via.h +++ b/quantum/via.h @@ -58,7 +58,7 @@ // This is changed only when the command IDs change, // so VIA Configurator can detect compatible firmware. -#define VIA_PROTOCOL_VERSION 0x000B +#define VIA_PROTOCOL_VERSION 0x000C // This is a version number for the firmware for the keyboard. // It can be used to ensure the VIA keyboard definition and the firmware @@ -135,46 +135,6 @@ enum via_qmk_audio_value { id_qmk_audio_clicky_enable = 2, }; -enum via_keycodes { - FN_MO13 = QK_MACRO, - FN_MO23, - MACRO00, - MACRO01, - MACRO02, - MACRO03, - MACRO04, - MACRO05, - MACRO06, - MACRO07, - MACRO08, - MACRO09, - MACRO10, - MACRO11, - MACRO12, - MACRO13, - MACRO14, - MACRO15, -}; - -enum user_keycodes { - USER00 = QK_USER, - USER01, - USER02, - USER03, - USER04, - USER05, - USER06, - USER07, - USER08, - USER09, - USER10, - USER11, - USER12, - USER13, - USER14, - USER15, -}; - // Can be called in an overriding via_init_kb() to test if keyboard level code usage of // EEPROM is invalid and use/save defaults. bool via_eeprom_is_valid(void); diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 3aa97f4e0d..d21630c01b 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -663,5 +663,68 @@ std::map KEYCODE_ID_TABLE = { {QK_AUTOCORRECT_TOGGLE, "QK_AUTOCORRECT_TOGGLE"}, {QK_TRI_LAYER_LOWER, "QK_TRI_LAYER_LOWER"}, {QK_TRI_LAYER_UPPER, "QK_TRI_LAYER_UPPER"}, - {SAFE_RANGE, "SAFE_RANGE"}, + {QK_KB_0, "QK_KB_0"}, + {QK_KB_1, "QK_KB_1"}, + {QK_KB_2, "QK_KB_2"}, + {QK_KB_3, "QK_KB_3"}, + {QK_KB_4, "QK_KB_4"}, + {QK_KB_5, "QK_KB_5"}, + {QK_KB_6, "QK_KB_6"}, + {QK_KB_7, "QK_KB_7"}, + {QK_KB_8, "QK_KB_8"}, + {QK_KB_9, "QK_KB_9"}, + {QK_KB_10, "QK_KB_10"}, + {QK_KB_11, "QK_KB_11"}, + {QK_KB_12, "QK_KB_12"}, + {QK_KB_13, "QK_KB_13"}, + {QK_KB_14, "QK_KB_14"}, + {QK_KB_15, "QK_KB_15"}, + {QK_KB_16, "QK_KB_16"}, + {QK_KB_17, "QK_KB_17"}, + {QK_KB_18, "QK_KB_18"}, + {QK_KB_19, "QK_KB_19"}, + {QK_KB_20, "QK_KB_20"}, + {QK_KB_21, "QK_KB_21"}, + {QK_KB_22, "QK_KB_22"}, + {QK_KB_23, "QK_KB_23"}, + {QK_KB_24, "QK_KB_24"}, + {QK_KB_25, "QK_KB_25"}, + {QK_KB_26, "QK_KB_26"}, + {QK_KB_27, "QK_KB_27"}, + {QK_KB_28, "QK_KB_28"}, + {QK_KB_29, "QK_KB_29"}, + {QK_KB_30, "QK_KB_30"}, + {QK_KB_31, "QK_KB_31"}, + {QK_USER_0, "QK_USER_0"}, + {QK_USER_1, "QK_USER_1"}, + {QK_USER_2, "QK_USER_2"}, + {QK_USER_3, "QK_USER_3"}, + {QK_USER_4, "QK_USER_4"}, + {QK_USER_5, "QK_USER_5"}, + {QK_USER_6, "QK_USER_6"}, + {QK_USER_7, "QK_USER_7"}, + {QK_USER_8, "QK_USER_8"}, + {QK_USER_9, "QK_USER_9"}, + {QK_USER_10, "QK_USER_10"}, + {QK_USER_11, "QK_USER_11"}, + {QK_USER_12, "QK_USER_12"}, + {QK_USER_13, "QK_USER_13"}, + {QK_USER_14, "QK_USER_14"}, + {QK_USER_15, "QK_USER_15"}, + {QK_USER_16, "QK_USER_16"}, + {QK_USER_17, "QK_USER_17"}, + {QK_USER_18, "QK_USER_18"}, + {QK_USER_19, "QK_USER_19"}, + {QK_USER_20, "QK_USER_20"}, + {QK_USER_21, "QK_USER_21"}, + {QK_USER_22, "QK_USER_22"}, + {QK_USER_23, "QK_USER_23"}, + {QK_USER_24, "QK_USER_24"}, + {QK_USER_25, "QK_USER_25"}, + {QK_USER_26, "QK_USER_26"}, + {QK_USER_27, "QK_USER_27"}, + {QK_USER_28, "QK_USER_28"}, + {QK_USER_29, "QK_USER_29"}, + {QK_USER_30, "QK_USER_30"}, + {QK_USER_31, "QK_USER_31"}, }; diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h index 23dabdd883..04d640b1ea 100644 --- a/users/talljoe/talljoe.h +++ b/users/talljoe/talljoe.h @@ -123,7 +123,7 @@ enum layers { #define H2_DEC KC_NO #define S2_INC KC_NO #define S2_DEC KC_NO - #define FN_MO13 KC_NO + #define TL_LOWR KC_NO #define FN_MO2 KC_NO #endif -- cgit v1.3.1 From 9f2cd9119f18deb824ef7840c69f97c635b485cd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 22:50:09 +0000 Subject: Reallocate user/kb keycode ranges (#19907) --- data/constants/keycodes/keycodes_0.0.2.hjson | 9 +++ data/constants/keycodes/keycodes_0.0.2_user.hjson | 64 ++++++++++---------- lib/python/qmk/json_schema.py | 3 + lib/python/qmk/keycodes.py | 1 + quantum/keycodes.h | 74 +++++++++++------------ 5 files changed, 82 insertions(+), 69 deletions(-) (limited to 'data') diff --git a/data/constants/keycodes/keycodes_0.0.2.hjson b/data/constants/keycodes/keycodes_0.0.2.hjson index 650235e647..dc789eca50 100644 --- a/data/constants/keycodes/keycodes_0.0.2.hjson +++ b/data/constants/keycodes/keycodes_0.0.2.hjson @@ -1,5 +1,14 @@ { "ranges": { + "0x7E00/0x00FF": "!delete!", + "0x7F00/0x00FF": "!delete!", + + "0x7E00/0x003F": { + "define": "QK_KB" + }, + "0x7E40/0x01BF": { + "define": "QK_USER" + }, "0x8000/0X3FFF": { "define": "QK_UNICODEMAP" }, diff --git a/data/constants/keycodes/keycodes_0.0.2_user.hjson b/data/constants/keycodes/keycodes_0.0.2_user.hjson index b41731b1be..42392dc649 100644 --- a/data/constants/keycodes/keycodes_0.0.2_user.hjson +++ b/data/constants/keycodes/keycodes_0.0.2_user.hjson @@ -1,130 +1,130 @@ { "keycodes": { - "0x7F00": { + "0x7E40": { "group": "user", "key": "QK_USER_0", }, - "0x7F01": { + "0x7E41": { "group": "user", "key": "QK_USER_1", }, - "0x7F02": { + "0x7E42": { "group": "user", "key": "QK_USER_2", }, - "0x7F03": { + "0x7E43": { "group": "user", "key": "QK_USER_3", }, - "0x7F04": { + "0x7E44": { "group": "user", "key": "QK_USER_4", }, - "0x7F05": { + "0x7E45": { "group": "user", "key": "QK_USER_5", }, - "0x7F06": { + "0x7E46": { "group": "user", "key": "QK_USER_6", }, - "0x7F07": { + "0x7E47": { "group": "user", "key": "QK_USER_7", }, - "0x7F08": { + "0x7E48": { "group": "user", "key": "QK_USER_8", }, - "0x7F09": { + "0x7E49": { "group": "user", "key": "QK_USER_9", }, - "0x7F0A": { + "0x7E4A": { "group": "user", "key": "QK_USER_10", }, - "0x7F0B": { + "0x7E4B": { "group": "user", "key": "QK_USER_11", }, - "0x7F0C": { + "0x7E4C": { "group": "user", "key": "QK_USER_12", }, - "0x7F0D": { + "0x7E4D": { "group": "user", "key": "QK_USER_13", }, - "0x7F0E": { + "0x7E4E": { "group": "user", "key": "QK_USER_14", }, - "0x7F0F": { + "0x7E4F": { "group": "user", "key": "QK_USER_15", }, - "0x7F10": { + "0x7E50": { "group": "user", "key": "QK_USER_16", }, - "0x7F11": { + "0x7E51": { "group": "user", "key": "QK_USER_17", }, - "0x7F12": { + "0x7E52": { "group": "user", "key": "QK_USER_18", }, - "0x7F13": { + "0x7E53": { "group": "user", "key": "QK_USER_19", }, - "0x7F14": { + "0x7E54": { "group": "user", "key": "QK_USER_20", }, - "0x7F15": { + "0x7E55": { "group": "user", "key": "QK_USER_21", }, - "0x7F16": { + "0x7E56": { "group": "user", "key": "QK_USER_22", }, - "0x7F17": { + "0x7E57": { "group": "user", "key": "QK_USER_23", }, - "0x7F18": { + "0x7E58": { "group": "user", "key": "QK_USER_24", }, - "0x7F19": { + "0x7E59": { "group": "user", "key": "QK_USER_25", }, - "0x7F1A": { + "0x7E5A": { "group": "user", "key": "QK_USER_26", }, - "0x7F1B": { + "0x7E5B": { "group": "user", "key": "QK_USER_27", }, - "0x7F1C": { + "0x7E5C": { "group": "user", "key": "QK_USER_28", }, - "0x7F1D": { + "0x7E5D": { "group": "user", "key": "QK_USER_29", }, - "0x7F1E": { + "0x7E5E": { "group": "user", "key": "QK_USER_30", }, - "0x7F1F": { + "0x7E5F": { "group": "user", "key": "QK_USER_31", }, diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py index c886a0d868..b00df749cc 100644 --- a/lib/python/qmk/json_schema.py +++ b/lib/python/qmk/json_schema.py @@ -107,6 +107,7 @@ def deep_update(origdict, newdict): def merge_ordered_dicts(dicts): """Merges nested OrderedDict objects resulting from reading a hjson file. Later input dicts overrides earlier dicts for plain values. + If any value is "!delete!", the existing value will be removed from its parent. Arrays will be appended. If the first entry of an array is "!reset!", the contents of the array will be cleared and replaced with RHS. Dictionaries will be recursively merged. If any entry is "!reset!", the contents of the dictionary will be cleared and replaced with RHS. """ @@ -125,6 +126,8 @@ def merge_ordered_dicts(dicts): target[k] = v[1:] else: target[k] = target[k] + v + elif v == "!delete!" and isinstance(target, (OrderedDict, dict)): + del target[k] else: target[k] = v diff --git a/lib/python/qmk/keycodes.py b/lib/python/qmk/keycodes.py index d2f2492829..966930547c 100644 --- a/lib/python/qmk/keycodes.py +++ b/lib/python/qmk/keycodes.py @@ -90,6 +90,7 @@ def load_spec(version, lang=None): # Sort? spec['keycodes'] = dict(sorted(spec.get('keycodes', {}).items())) + spec['ranges'] = dict(sorted(spec.get('ranges', {}).items())) # Validate? _validate(spec) diff --git a/quantum/keycodes.h b/quantum/keycodes.h index dfebd22044..34b13c29af 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -77,13 +77,13 @@ enum qk_keycode_ranges { QK_QUANTUM = 0x7C00, QK_QUANTUM_MAX = 0x7DFF, QK_KB = 0x7E00, - QK_KB_MAX = 0x7EFF, - QK_USER = 0x7F00, + QK_KB_MAX = 0x7E3F, + QK_USER = 0x7E40, QK_USER_MAX = 0x7FFF, - QK_UNICODE = 0x8000, - QK_UNICODE_MAX = 0xFFFF, QK_UNICODEMAP = 0x8000, QK_UNICODEMAP_MAX = 0xBFFF, + QK_UNICODE = 0x8000, + QK_UNICODE_MAX = 0xFFFF, QK_UNICODEMAP_PAIR = 0xC000, QK_UNICODEMAP_PAIR_MAX = 0xFFFF, }; @@ -753,38 +753,38 @@ enum qk_keycode_defines { QK_KB_29 = 0x7E1D, QK_KB_30 = 0x7E1E, QK_KB_31 = 0x7E1F, - QK_USER_0 = 0x7F00, - QK_USER_1 = 0x7F01, - QK_USER_2 = 0x7F02, - QK_USER_3 = 0x7F03, - QK_USER_4 = 0x7F04, - QK_USER_5 = 0x7F05, - QK_USER_6 = 0x7F06, - QK_USER_7 = 0x7F07, - QK_USER_8 = 0x7F08, - QK_USER_9 = 0x7F09, - QK_USER_10 = 0x7F0A, - QK_USER_11 = 0x7F0B, - QK_USER_12 = 0x7F0C, - QK_USER_13 = 0x7F0D, - QK_USER_14 = 0x7F0E, - QK_USER_15 = 0x7F0F, - QK_USER_16 = 0x7F10, - QK_USER_17 = 0x7F11, - QK_USER_18 = 0x7F12, - QK_USER_19 = 0x7F13, - QK_USER_20 = 0x7F14, - QK_USER_21 = 0x7F15, - QK_USER_22 = 0x7F16, - QK_USER_23 = 0x7F17, - QK_USER_24 = 0x7F18, - QK_USER_25 = 0x7F19, - QK_USER_26 = 0x7F1A, - QK_USER_27 = 0x7F1B, - QK_USER_28 = 0x7F1C, - QK_USER_29 = 0x7F1D, - QK_USER_30 = 0x7F1E, - QK_USER_31 = 0x7F1F, + QK_USER_0 = 0x7E40, + QK_USER_1 = 0x7E41, + QK_USER_2 = 0x7E42, + QK_USER_3 = 0x7E43, + QK_USER_4 = 0x7E44, + QK_USER_5 = 0x7E45, + QK_USER_6 = 0x7E46, + QK_USER_7 = 0x7E47, + QK_USER_8 = 0x7E48, + QK_USER_9 = 0x7E49, + QK_USER_10 = 0x7E4A, + QK_USER_11 = 0x7E4B, + QK_USER_12 = 0x7E4C, + QK_USER_13 = 0x7E4D, + QK_USER_14 = 0x7E4E, + QK_USER_15 = 0x7E4F, + QK_USER_16 = 0x7E50, + QK_USER_17 = 0x7E51, + QK_USER_18 = 0x7E52, + QK_USER_19 = 0x7E53, + QK_USER_20 = 0x7E54, + QK_USER_21 = 0x7E55, + QK_USER_22 = 0x7E56, + QK_USER_23 = 0x7E57, + QK_USER_24 = 0x7E58, + QK_USER_25 = 0x7E59, + QK_USER_26 = 0x7E5A, + QK_USER_27 = 0x7E5B, + QK_USER_28 = 0x7E5C, + QK_USER_29 = 0x7E5D, + QK_USER_30 = 0x7E5E, + QK_USER_31 = 0x7E5F, // Alias XXXXXXX = KC_NO, @@ -1391,8 +1391,8 @@ enum qk_keycode_defines { #define IS_QK_QUANTUM(code) ((code) >= QK_QUANTUM && (code) <= QK_QUANTUM_MAX) #define IS_QK_KB(code) ((code) >= QK_KB && (code) <= QK_KB_MAX) #define IS_QK_USER(code) ((code) >= QK_USER && (code) <= QK_USER_MAX) -#define IS_QK_UNICODE(code) ((code) >= QK_UNICODE && (code) <= QK_UNICODE_MAX) #define IS_QK_UNICODEMAP(code) ((code) >= QK_UNICODEMAP && (code) <= QK_UNICODEMAP_MAX) +#define IS_QK_UNICODE(code) ((code) >= QK_UNICODE && (code) <= QK_UNICODE_MAX) #define IS_QK_UNICODEMAP_PAIR(code) ((code) >= QK_UNICODEMAP_PAIR && (code) <= QK_UNICODEMAP_PAIR_MAX) // Group Helpers -- cgit v1.3.1 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 + data/schemas/keyboard.jsonschema | 7 ++++++- keyboards/0xcb/1337/config.h | 4 ---- keyboards/0xcb/1337/info.json | 5 +++++ keyboards/1upkeyboards/1up60hse/config.h | 4 ---- keyboards/1upkeyboards/1up60hse/info.json | 5 +++++ keyboards/1upkeyboards/1up60hte/config.h | 2 -- keyboards/1upkeyboards/1up60hte/info.json | 3 +++ keyboards/1upkeyboards/1up60rgb/config.h | 5 ----- keyboards/1upkeyboards/1up60rgb/info.json | 4 ++++ keyboards/25keys/aleth42/rev1/config.h | 4 ---- keyboards/25keys/aleth42/rev1/info.json | 5 +++++ keyboards/40percentclub/gherkin/config.h | 2 -- keyboards/40percentclub/gherkin/info.json | 3 +++ keyboards/40percentclub/luddite/config.h | 5 ----- keyboards/40percentclub/luddite/info.json | 4 ++++ keyboards/40percentclub/mf68/config.h | 3 --- keyboards/40percentclub/mf68/info.json | 4 ++++ keyboards/40percentclub/nori/config.h | 2 -- keyboards/40percentclub/nori/info.json | 3 +++ keyboards/40percentclub/sixpack/config.h | 22 --------------------- keyboards/40percentclub/sixpack/info.json | 4 +++- keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 4 ---- keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 5 +++++ keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk | 1 - keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 4 ---- keyboards/4pplet/eagle_viper_rep/rev_b/info.json | 5 +++++ keyboards/8pack/config.h | 2 -- keyboards/8pack/info.json | 3 ++- keyboards/abstract/ellipse/rev1/config.h | 3 --- keyboards/abstract/ellipse/rev1/info.json | 4 ++++ keyboards/acekeyboard/titan60/config.h | 3 --- keyboards/acekeyboard/titan60/info.json | 4 ++++ keyboards/acheron/athena/alpha/config.h | 3 --- keyboards/acheron/athena/alpha/info.json | 5 ++++- keyboards/acheron/athena/alpha/rules.mk | 1 - keyboards/acheron/athena/beta/config.h | 3 --- keyboards/acheron/athena/beta/info.json | 5 +++++ keyboards/acheron/athena/beta/rules.mk | 1 - keyboards/acheron/austin/config.h | 3 --- keyboards/acheron/austin/info.json | 5 +++++ keyboards/acheron/elongate/delta/config.h | 4 ---- keyboards/acheron/elongate/delta/info.json | 3 +++ keyboards/acheron/shark/alpha/config.h | 1 - keyboards/acheron/shark/alpha/info.json | 3 +++ keyboards/acheron/shark/beta/config.h | 3 --- keyboards/acheron/shark/beta/info.json | 5 +++++ keyboards/acheron/shark/beta/rules.mk | 1 - keyboards/adelheid/config.h | 2 -- keyboards/adelheid/info.json | 3 +++ keyboards/aeboards/ext65/rev2/config.h | 4 ---- keyboards/aeboards/ext65/rev2/info.json | 5 +++++ keyboards/ai03/equinox/config.h | 4 ---- keyboards/ai03/equinox/rev0/config.h | 5 ----- keyboards/ai03/equinox/rev0/info.json | 5 +++++ keyboards/ai03/equinox/rev1/info.json | 5 +++++ keyboards/ai03/orbit/config.h | 2 -- keyboards/ai03/orbit/info.json | 3 +++ keyboards/ai03/polaris/config.h | 4 ---- keyboards/ai03/polaris/info.json | 5 +++++ keyboards/al1/config.h | 3 --- keyboards/al1/info.json | 4 ++++ keyboards/alf/dc60/config.h | 4 ---- keyboards/alf/dc60/info.json | 5 +++++ keyboards/alf/x11/config.h | 3 --- keyboards/alf/x11/info.json | 4 ++++ keyboards/alf/x2/config.h | 2 -- keyboards/alf/x2/info.json | 3 +++ keyboards/amjkeyboard/amj40/config.h | 6 ------ keyboards/amjkeyboard/amj40/info.json | 4 ++++ keyboards/amjkeyboard/amj60/config.h | 4 ---- keyboards/amjkeyboard/amj60/info.json | 5 +++++ keyboards/amjkeyboard/amj66/config.h | 3 --- keyboards/amjkeyboard/amj66/info.json | 4 ++++ keyboards/amjkeyboard/amj84/config.h | 3 --- keyboards/amjkeyboard/amj84/info.json | 4 ++++ keyboards/amjkeyboard/amjpad/config.h | 6 ------ keyboards/amjkeyboard/amjpad/info.json | 4 ++++ keyboards/anavi/macropad8/config.h | 2 -- keyboards/anavi/macropad8/info.json | 12 +++++++---- keyboards/ares/config.h | 2 -- keyboards/ares/info.json | 3 +++ keyboards/atomic/config.h | 2 -- keyboards/atomic/info.json | 3 +++ keyboards/atxkb/1894/config.h | 4 ---- keyboards/atxkb/1894/info.json | 5 +++++ keyboards/b_sides/rev41lp/config.h | 3 --- keyboards/b_sides/rev41lp/info.json | 2 ++ keyboards/baguette/config.h | 4 ---- keyboards/baguette/info.json | 5 +++++ keyboards/bear_face/config.h | 2 -- keyboards/bear_face/info.json | 3 +++ keyboards/bfake/config.h | 2 -- keyboards/bfake/info.json | 3 +++ keyboards/bioi/f60/config.h | 4 ---- keyboards/bioi/f60/info.json | 5 +++++ keyboards/bioi/g60/config.h | 4 ---- keyboards/bioi/g60/info.json | 4 ++++ keyboards/bioi/g60ble/config.h | 5 ----- keyboards/bioi/g60ble/info.json | 4 ++++ keyboards/bioi/morgan65/config.h | 4 ---- keyboards/bioi/morgan65/info.json | 4 ++++ keyboards/bioi/s65/config.h | 5 ----- keyboards/bioi/s65/info.json | 4 ++++ keyboards/boston/config.h | 3 --- keyboards/boston/info.json | 5 +++++ keyboards/bt66tech/bt66tech60/config.h | 3 --- keyboards/bt66tech/bt66tech60/info.json | 5 +++++ keyboards/cablecardesigns/cypher/rev6/config.h | 5 ----- keyboards/cablecardesigns/cypher/rev6/info.json | 5 +++++ keyboards/cannonkeys/an_c/config.h | 3 --- keyboards/cannonkeys/an_c/info.json | 5 +++++ keyboards/cannonkeys/chimera65/config.h | 3 --- keyboards/cannonkeys/chimera65/info.json | 5 +++++ keyboards/cannonkeys/cloudline/config.h | 3 --- keyboards/cannonkeys/cloudline/info.json | 5 +++++ keyboards/cannonkeys/crin/config.h | 3 --- keyboards/cannonkeys/crin/info.json | 5 +++++ keyboards/cannonkeys/db60/config.h | 3 --- keyboards/cannonkeys/db60/info.json | 5 +++++ keyboards/cannonkeys/devastatingtkl/config.h | 4 ---- keyboards/cannonkeys/devastatingtkl/info.json | 5 +++++ keyboards/cannonkeys/instant60/config.h | 3 --- keyboards/cannonkeys/instant60/info.json | 5 +++++ keyboards/cannonkeys/instant65/config.h | 3 --- keyboards/cannonkeys/instant65/info.json | 5 +++++ keyboards/cannonkeys/iron165/config.h | 3 --- keyboards/cannonkeys/iron165/info.json | 5 +++++ keyboards/cannonkeys/malicious_ergo/config.h | 3 --- keyboards/cannonkeys/malicious_ergo/info.json | 5 +++++ keyboards/cannonkeys/obliterated75/config.h | 3 --- keyboards/cannonkeys/obliterated75/info.json | 5 +++++ keyboards/cannonkeys/onyx/config.h | 4 ---- keyboards/cannonkeys/onyx/info.json | 5 +++++ keyboards/cannonkeys/ortho48/config.h | 3 --- keyboards/cannonkeys/ortho48/info.json | 5 +++++ keyboards/cannonkeys/ortho60/config.h | 3 --- keyboards/cannonkeys/ortho60/info.json | 5 +++++ keyboards/cannonkeys/ortho75/config.h | 3 --- keyboards/cannonkeys/ortho75/info.json | 5 +++++ keyboards/cannonkeys/practice60/config.h | 3 --- keyboards/cannonkeys/practice60/info.json | 5 +++++ keyboards/cannonkeys/practice65/config.h | 3 --- keyboards/cannonkeys/practice65/info.json | 5 +++++ keyboards/cannonkeys/rekt1800/config.h | 3 --- keyboards/cannonkeys/rekt1800/info.json | 5 +++++ keyboards/cannonkeys/sagittarius/config.h | 3 --- keyboards/cannonkeys/sagittarius/info.json | 5 +++++ keyboards/cannonkeys/satisfaction75/config.h | 4 ---- keyboards/cannonkeys/satisfaction75/info.json | 4 ++++ keyboards/cannonkeys/savage65/config.h | 3 --- keyboards/cannonkeys/savage65/info.json | 5 +++++ keyboards/cannonkeys/tmov2/config.h | 3 --- keyboards/cannonkeys/tmov2/info.json | 5 +++++ keyboards/cannonkeys/tsukuyomi/config.h | 3 --- keyboards/cannonkeys/tsukuyomi/info.json | 5 +++++ keyboards/cannonkeys/vicious40/config.h | 3 --- keyboards/cannonkeys/vicious40/info.json | 5 +++++ keyboards/capsunlocked/cu24/config.h | 5 ----- keyboards/capsunlocked/cu24/info.json | 5 +++++ keyboards/capsunlocked/cu75/config.h | 1 - keyboards/capsunlocked/cu75/info.json | 4 ++++ keyboards/capsunlocked/cu75/rules.mk | 5 ----- keyboards/cest73/tkm/config.h | 3 --- keyboards/cest73/tkm/info.json | 3 +++ keyboards/checkerboards/nop60/config.h | 4 ---- keyboards/checkerboards/nop60/info.json | 5 +++++ keyboards/checkerboards/quark_plus/config.h | 5 ----- keyboards/checkerboards/quark_plus/info.json | 5 +++++ keyboards/checkerboards/quark_plus/rules.mk | 1 - keyboards/checkerboards/snop60/config.h | 5 ----- keyboards/checkerboards/snop60/info.json | 5 +++++ keyboards/checkerboards/snop60/rules.mk | 1 - keyboards/cherrybstudio/cb87/config.h | 1 - keyboards/cherrybstudio/cb87/info.json | 3 +++ keyboards/cherrybstudio/cb87v2/config.h | 2 -- keyboards/cherrybstudio/cb87v2/info.json | 3 +++ keyboards/ck60i/config.h | 3 --- keyboards/ck60i/info.json | 5 +++++ keyboards/ck60i/rules.mk | 1 - keyboards/ckeys/obelus/config.h | 2 -- keyboards/ckeys/obelus/info.json | 3 +++ keyboards/ckeys/washington/config.h | 3 --- keyboards/ckeys/washington/info.json | 4 ++++ keyboards/clueboard/17/info.json | 3 +++ keyboards/clueboard/17/rules.mk | 2 -- keyboards/clueboard/60/config.h | 23 ---------------------- keyboards/clueboard/60/info.json | 3 +++ keyboards/clueboard/66/rev2/config.h | 5 ----- keyboards/clueboard/66/rev2/info.json | 4 ++++ keyboards/clueboard/66/rev2/rules.mk | 2 -- keyboards/clueboard/66/rev3/config.h | 5 ----- keyboards/clueboard/66/rev3/info.json | 4 ++++ keyboards/clueboard/66/rev3/rules.mk | 1 - keyboards/clueboard/66_hotswap/prototype/config.h | 4 ---- keyboards/clueboard/66_hotswap/prototype/info.json | 4 ++++ keyboards/clueboard/66_hotswap/prototype/rules.mk | 2 -- keyboards/clueboard/card/config.h | 3 --- keyboards/clueboard/card/info.json | 4 ++++ keyboards/clueboard/card/rules.mk | 2 -- keyboards/coarse/cordillera/config.h | 3 --- keyboards/coarse/cordillera/info.json | 5 +++++ keyboards/copenhagen_click/click_pad_v1/config.h | 3 --- keyboards/copenhagen_click/click_pad_v1/info.json | 4 ++++ keyboards/custommk/evo70/config.h | 4 ---- keyboards/custommk/evo70/info.json | 5 ++++- keyboards/cx60/config.h | 6 ------ keyboards/cx60/info.json | 4 ++++ keyboards/db/db63/config.h | 2 -- keyboards/db/db63/info.json | 3 +++ keyboards/deng/djam/config.h | 3 --- keyboards/deng/djam/info.json | 4 ++++ keyboards/deng/djam/rules.mk | 1 - keyboards/deng/thirty/config.h | 6 ------ keyboards/deng/thirty/info.json | 3 +++ keyboards/deng/thirty/rules.mk | 1 - keyboards/do60/config.h | 4 ---- keyboards/do60/info.json | 4 ++++ keyboards/donutcables/budget96/config.h | 2 -- keyboards/donutcables/budget96/info.json | 3 +++ keyboards/doro67/multi/config.h | 3 --- keyboards/doro67/multi/info.json | 4 ++++ keyboards/dtisaac/dtisaac01/config.h | 3 --- keyboards/dtisaac/dtisaac01/info.json | 4 ++++ keyboards/duck/eagle_viper/v2/info.json | 3 +++ keyboards/duck/eagle_viper/v2/rules.mk | 1 - keyboards/duck/jetfire/config.h | 2 -- keyboards/duck/jetfire/info.json | 4 ++++ keyboards/duck/jetfire/rules.mk | 1 - keyboards/duck/lightsaver/config.h | 2 -- keyboards/duck/lightsaver/info.json | 4 ++++ keyboards/duck/lightsaver/rules.mk | 1 - keyboards/duck/octagon/v1/config.h | 2 -- keyboards/duck/octagon/v1/info.json | 4 ++++ keyboards/duck/octagon/v1/rules.mk | 1 - keyboards/duck/octagon/v2/config.h | 2 -- keyboards/duck/octagon/v2/info.json | 4 ++++ keyboards/duck/octagon/v2/rules.mk | 1 - keyboards/duck/orion/v3/config.h | 2 -- keyboards/duck/orion/v3/info.json | 4 +++- keyboards/duck/orion/v3/rules.mk | 1 - keyboards/dz60/config.h | 3 --- keyboards/dz60/info.json | 4 ++++ keyboards/dztech/bocc/config.h | 3 --- keyboards/dztech/bocc/info.json | 4 ++++ keyboards/dztech/dz96/config.h | 3 --- keyboards/dztech/dz96/info.json | 4 ++++ keyboards/ebastler/isometria_75/rev1/config.h | 3 --- keyboards/ebastler/isometria_75/rev1/info.json | 5 +++++ keyboards/efreet/config.h | 3 --- keyboards/efreet/info.json | 4 ++++ keyboards/era/era65/rules.mk | 1 - keyboards/ergotravel/rev1/config.h | 3 --- keyboards/eve/meteor/config.h | 2 -- keyboards/eve/meteor/info.json | 3 +++ keyboards/evil80/config.h | 3 --- keyboards/evil80/info.json | 4 ++++ keyboards/evyd13/atom47/rev2/config.h | 6 ------ keyboards/evyd13/atom47/rev2/info.json | 5 +++++ keyboards/evyd13/atom47/rev3/config.h | 6 ------ keyboards/evyd13/atom47/rev3/info.json | 5 +++++ keyboards/evyd13/wasdat_code/config.h | 4 ---- keyboards/evyd13/wasdat_code/info.json | 5 +++++ keyboards/exclusive/e65/config.h | 5 ----- keyboards/exclusive/e65/info.json | 4 ++++ keyboards/exclusive/e6v2/le/config.h | 6 ------ keyboards/exclusive/e6v2/le/info.json | 3 +++ keyboards/exclusive/e6v2/le_bmc/config.h | 2 -- keyboards/exclusive/e6v2/le_bmc/info.json | 3 +++ keyboards/exclusive/e6v2/oe/config.h | 6 ------ keyboards/exclusive/e6v2/oe/info.json | 3 +++ keyboards/exclusive/e6v2/oe_bmc/config.h | 2 -- keyboards/exclusive/e6v2/oe_bmc/info.json | 3 +++ keyboards/exclusive/e7v1/config.h | 5 ----- keyboards/exclusive/e7v1/info.json | 4 ++++ keyboards/exclusive/e7v1se/config.h | 3 --- keyboards/exclusive/e7v1se/info.json | 4 ++++ keyboards/exclusive/e85/config.h | 4 ---- keyboards/exclusive/e85/hotswap/info.json | 5 +++++ keyboards/exclusive/e85/soldered/info.json | 5 +++++ keyboards/exent/config.h | 2 -- keyboards/exent/info.json | 3 +++ keyboards/eyeohdesigns/babyv/config.h | 2 -- keyboards/eyeohdesigns/babyv/info.json | 3 +++ keyboards/facew/config.h | 2 -- keyboards/facew/info.json | 3 +++ keyboards/flx/virgo/config.h | 3 --- keyboards/flx/virgo/info.json | 4 ++++ keyboards/fortitude60/rev1/config.h | 5 ----- keyboards/fortitude60/rev1/info.json | 4 ++++ keyboards/foxlab/key65/hotswap/config.h | 3 --- keyboards/foxlab/key65/hotswap/info.json | 4 ++++ keyboards/foxlab/key65/universal/config.h | 3 --- keyboards/foxlab/key65/universal/info.json | 4 ++++ keyboards/foxlab/leaf60/hotswap/config.h | 4 ---- keyboards/foxlab/leaf60/hotswap/info.json | 5 +++++ keyboards/foxlab/leaf60/universal/config.h | 3 --- keyboards/foxlab/leaf60/universal/info.json | 4 ++++ keyboards/foxlab/time80/config.h | 2 -- keyboards/foxlab/time80/info.json | 3 +++ keyboards/foxlab/time_re/hotswap/config.h | 2 -- keyboards/foxlab/time_re/hotswap/info.json | 3 +++ keyboards/foxlab/time_re/universal/config.h | 2 -- keyboards/foxlab/time_re/universal/info.json | 3 +++ keyboards/ft/mars65/config.h | 2 -- keyboards/ft/mars65/info.json | 3 +++ keyboards/ft/mars80/config.h | 2 -- keyboards/ft/mars80/info.json | 3 +++ keyboards/geonworks/frogmini/fms/config.h | 2 -- keyboards/geonworks/frogmini/fms/info.json | 4 ++++ keyboards/geonworks/frogmini/fms/rules.mk | 1 - keyboards/gh60/satan/config.h | 6 ------ keyboards/gh60/satan/info.json | 4 ++++ keyboards/gh60/v1p3/config.h | 3 --- keyboards/gh60/v1p3/info.json | 4 ++++ keyboards/gon/nerd60/config.h | 4 ---- keyboards/gon/nerd60/info.json | 3 +++ keyboards/gon/nerdtkl/config.h | 4 ---- keyboards/gon/nerdtkl/info.json | 3 +++ keyboards/gray_studio/cod67/config.h | 5 ----- keyboards/gray_studio/cod67/info.json | 1 + keyboards/gray_studio/hb85/config.h | 2 -- keyboards/gray_studio/hb85/info.json | 3 +++ keyboards/gray_studio/space65/config.h | 4 ---- keyboards/gray_studio/space65/info.json | 5 +++++ keyboards/handwired/aek64/config.h | 4 ---- keyboards/handwired/aek64/info.json | 5 +++++ keyboards/handwired/arrow_pad/config.h | 2 -- keyboards/handwired/arrow_pad/info.json | 3 +++ keyboards/handwired/bdn9_ble/config.h | 3 --- keyboards/handwired/bdn9_ble/info.json | 4 ++++ keyboards/handwired/chiron/config.h | 4 ---- keyboards/handwired/chiron/info.json | 4 ++++ keyboards/handwired/co60/rev1/config.h | 5 ----- keyboards/handwired/co60/rev1/info.json | 4 ++++ keyboards/handwired/co60/rev6/config.h | 6 ------ keyboards/handwired/co60/rev6/info.json | 4 ++++ keyboards/handwired/co60/rev7/config.h | 6 ------ keyboards/handwired/co60/rev7/info.json | 4 ++++ keyboards/handwired/hacked_motospeed/config.h | 2 -- keyboards/handwired/hacked_motospeed/info.json | 3 +++ keyboards/handwired/hnah108/config.h | 4 ---- keyboards/handwired/hnah108/info.json | 5 +++++ keyboards/handwired/jot50/config.h | 4 ---- keyboards/handwired/jot50/info.json | 4 ++++ keyboards/handwired/nozbe_macro/config.h | 2 -- keyboards/handwired/nozbe_macro/info.json | 3 +++ keyboards/handwired/pill60/config.h | 3 --- keyboards/handwired/pill60/info.json | 5 +++++ keyboards/handwired/pill60/rules.mk | 1 - keyboards/handwired/prime_exl/config.h | 3 --- keyboards/handwired/prime_exl/info.json | 4 ++++ keyboards/handwired/riblee_f401/config.h | 3 --- keyboards/handwired/riblee_f401/info.json | 5 +++++ keyboards/handwired/riblee_f401/rules.mk | 1 - keyboards/handwired/steamvan/rev1/config.h | 6 ------ keyboards/handwired/steamvan/rev1/info.json | 4 ++++ keyboards/handwired/tritium_numpad/config.h | 6 ------ keyboards/handwired/tritium_numpad/info.json | 4 ++++ keyboards/heliar/wm1_hotswap/config.h | 2 -- keyboards/heliar/wm1_hotswap/info.json | 3 +++ keyboards/hineybush/h10/config.h | 3 --- keyboards/hineybush/h10/info.json | 4 ++++ keyboards/hineybush/h60/config.h | 3 --- keyboards/hineybush/h60/info.json | 4 ++++ keyboards/hineybush/h65/config.h | 3 --- keyboards/hineybush/h65/info.json | 4 ++++ keyboards/hineybush/h65_hotswap/config.h | 3 --- keyboards/hineybush/h65_hotswap/info.json | 4 ++++ keyboards/hineybush/h660s/config.h | 3 --- keyboards/hineybush/h660s/info.json | 4 ++++ keyboards/hineybush/h75_singa/config.h | 4 ---- keyboards/hineybush/h75_singa/info.json | 4 ++++ keyboards/hineybush/h87a/config.h | 2 -- keyboards/hineybush/h87a/info.json | 3 +++ keyboards/hineybush/h88/config.h | 2 -- keyboards/hineybush/h88/info.json | 3 +++ keyboards/hineybush/hbcp/config.h | 3 --- keyboards/hineybush/hbcp/info.json | 4 ++++ keyboards/hineybush/physix/config.h | 3 --- keyboards/hineybush/physix/info.json | 4 ++++ keyboards/hnahkb/freyr/config.h | 3 --- keyboards/hnahkb/freyr/info.json | 4 ++++ keyboards/hnahkb/stella/config.h | 3 --- keyboards/hnahkb/stella/info.json | 4 ++++ keyboards/hnahkb/vn66/config.h | 4 ---- keyboards/hnahkb/vn66/info.json | 5 +++++ .../horrortroll/chinese_pcb/black_e65/config.h | 6 ------ .../horrortroll/chinese_pcb/black_e65/info.json | 4 ++++ keyboards/hotdox/config.h | 2 -- keyboards/hotdox/info.json | 3 +++ keyboards/idobao/id75/v1/config.h | 3 --- keyboards/idobao/id75/v1/info.json | 4 ++++ keyboards/idobao/id80/v2/config.h | 5 ----- keyboards/idobao/id80/v2/info.json | 4 ++++ keyboards/idobao/id87/v1/config.h | 2 -- keyboards/idobao/id87/v1/info.json | 3 +++ keyboards/idobao/id96/config.h | 6 ------ keyboards/idobao/id96/info.json | 5 +++++ keyboards/idobao/montex/v1/config.h | 2 -- keyboards/idobao/montex/v1/info.json | 3 +++ keyboards/illuminati/is0/config.h | 4 ---- keyboards/illuminati/is0/info.json | 5 +++++ keyboards/ilumkb/primus75/config.h | 5 ----- keyboards/ilumkb/primus75/info.json | 4 ++++ keyboards/ilumkb/volcano660/config.h | 3 --- keyboards/ilumkb/volcano660/info.json | 4 ++++ keyboards/iron180/config.h | 3 --- keyboards/iron180/info.json | 5 +++++ keyboards/iron180/rules.mk | 1 - keyboards/j80/config.h | 2 -- keyboards/j80/info.json | 3 +++ keyboards/jacky_studio/bear_65/config.h | 6 ------ keyboards/jacky_studio/bear_65/rev1/info.json | 3 +++ keyboards/jacky_studio/bear_65/rev2/info.json | 3 +++ keyboards/jacky_studio/s7_elephant/rev2/config.h | 3 --- keyboards/jacky_studio/s7_elephant/rev2/info.json | 4 ++++ keyboards/jae/j01/config.h | 4 ---- keyboards/jae/j01/info.json | 5 +++++ keyboards/jc65/v32a/config.h | 2 -- keyboards/jc65/v32a/info.json | 3 +++ keyboards/jc65/v32u4/config.h | 2 -- keyboards/jc65/v32u4/info.json | 3 +++ keyboards/jd45/config.h | 2 -- keyboards/jd45/info.json | 3 +++ keyboards/jian/nsrev2/config.h | 6 ------ keyboards/jian/nsrev2/info.json | 5 +++++ keyboards/jian/rev1/config.h | 5 ----- keyboards/jian/rev1/info.json | 4 ++++ keyboards/jian/rev2/config.h | 5 ----- keyboards/jian/rev2/info.json | 4 ++++ keyboards/jiran/rev1/config.h | 20 ------------------- keyboards/jiran/rev1/info.json | 6 ++++++ keyboards/kagizaraya/scythe/config.h | 2 -- keyboards/kagizaraya/scythe/info.json | 3 +++ keyboards/kb_elmo/twelvekey/config.h | 4 ---- keyboards/kb_elmo/twelvekey/info.json | 2 ++ keyboards/kbdfans/bella/soldered/config.h | 2 -- keyboards/kbdfans/bella/soldered/info.json | 3 +++ keyboards/kbdfans/kbd19x/config.h | 2 -- keyboards/kbdfans/kbd19x/info.json | 3 +++ keyboards/kbdfans/kbd4x/config.h | 5 +---- keyboards/kbdfans/kbd4x/info.json | 4 ++++ keyboards/kbdfans/kbd66/config.h | 4 ---- keyboards/kbdfans/kbd66/info.json | 4 ++++ keyboards/kbdfans/kbd67/hotswap/config.h | 4 ---- keyboards/kbdfans/kbd67/hotswap/info.json | 4 ++++ keyboards/kbdfans/kbd67/mkii_soldered/config.h | 5 ----- keyboards/kbdfans/kbd67/mkii_soldered/info.json | 4 ++++ keyboards/kbdfans/kbd67/rev1/config.h | 4 ---- keyboards/kbdfans/kbd67/rev1/info.json | 4 ++++ keyboards/kbdfans/kbd67/rev2/config.h | 2 -- keyboards/kbdfans/kbd67/rev2/info.json | 3 +++ keyboards/kbdfans/kbd6x/config.h | 4 ---- keyboards/kbdfans/kbd6x/info.json | 4 ++++ keyboards/kbdfans/kbd75/config.h | 5 ----- keyboards/kbdfans/kbd75/rev1/info.json | 4 ++++ keyboards/kbdfans/kbd75/rev2/info.json | 4 ++++ keyboards/kbdfans/kbd8x/config.h | 4 ---- keyboards/kbdfans/kbd8x/info.json | 4 ++++ keyboards/kbdfans/kbd8x_mk2/config.h | 4 ---- keyboards/kbdfans/kbd8x_mk2/info.json | 4 ++++ keyboards/kbdfans/kbdpad/mk1/config.h | 3 --- keyboards/kbdfans/kbdpad/mk1/info.json | 4 ++++ keyboards/kbdfans/kbdpad/mk2/config.h | 5 ----- keyboards/kbdfans/kbdpad/mk2/info.json | 5 +++++ keyboards/kbdfans/maja_soldered/config.h | 2 -- keyboards/kbdfans/maja_soldered/info.json | 3 +++ keyboards/kbdfans/niu_mini/config.h | 5 ----- keyboards/kbdfans/niu_mini/info.json | 4 ++++ keyboards/kc60/config.h | 4 ---- keyboards/kc60/info.json | 5 +++++ keyboards/kc60se/config.h | 3 --- keyboards/kc60se/info.json | 4 ++++ keyboards/keebio/bdn9/rev1/config.h | 3 --- keyboards/keebio/bdn9/rev1/info.json | 4 ++++ keyboards/keebio/chocopad/config.h | 3 --- keyboards/keebio/chocopad/info.json | 4 ++++ keyboards/keebio/dilly/config.h | 2 -- keyboards/keebio/dilly/info.json | 3 +++ keyboards/keebio/dsp40/rev1/config.h | 2 -- keyboards/keebio/dsp40/rev1/info.json | 4 ++++ keyboards/keebio/ergodicity/config.h | 4 ---- keyboards/keebio/ergodicity/info.json | 5 +++++ keyboards/keebio/foldkb/rev1/config.h | 2 -- keyboards/keebio/foldkb/rev1/info.json | 3 +++ keyboards/keebio/iris/rev1/config.h | 3 --- keyboards/keebio/iris/rev1/info.json | 4 ++++ keyboards/keebio/iris/rev1_led/config.h | 3 --- keyboards/keebio/iris/rev1_led/info.json | 4 ++++ keyboards/keebio/iris/rev2/config.h | 3 --- keyboards/keebio/iris/rev2/info.json | 4 ++++ keyboards/keebio/iris/rev3/config.h | 3 --- keyboards/keebio/iris/rev3/info.json | 4 ++++ keyboards/keebio/iris/rev4/config.h | 3 --- keyboards/keebio/iris/rev4/info.json | 4 ++++ keyboards/keebio/iris/rev5/config.h | 2 -- keyboards/keebio/iris/rev5/info.json | 4 ++++ keyboards/keebio/kbo5000/rev1/config.h | 1 - keyboards/keebio/kbo5000/rev1/info.json | 3 +++ keyboards/keebio/levinson/rev1/config.h | 4 ---- keyboards/keebio/levinson/rev1/info.json | 4 ++++ keyboards/keebio/levinson/rev2/config.h | 4 ---- keyboards/keebio/levinson/rev2/info.json | 4 ++++ keyboards/keebio/levinson/rev3/config.h | 4 ---- keyboards/keebio/levinson/rev3/info.json | 4 ++++ keyboards/keebio/nyquist/rev2/config.h | 4 ---- keyboards/keebio/nyquist/rev2/info.json | 4 ++++ keyboards/keebio/nyquist/rev3/config.h | 4 ---- keyboards/keebio/nyquist/rev3/info.json | 4 ++++ keyboards/keebio/quefrency/rev2/config.h | 1 - keyboards/keebio/quefrency/rev2/info.json | 3 +++ keyboards/keebio/quefrency/rev3/config.h | 1 - keyboards/keebio/quefrency/rev3/info.json | 3 +++ keyboards/keebio/rorschach/rev1/config.h | 3 --- keyboards/keebio/rorschach/rev1/info.json | 4 ++++ keyboards/keebio/tragicforce68/config.h | 4 ---- keyboards/keebio/tragicforce68/info.json | 5 +++++ keyboards/keebio/viterbi/rev2/config.h | 4 ---- keyboards/keebio/viterbi/rev2/info.json | 4 ++++ keyboards/keebio/wavelet/config.h | 4 ---- keyboards/keebio/wavelet/info.json | 4 ++++ keyboards/keebsforall/coarse60/config.h | 3 --- keyboards/keebsforall/coarse60/info.json | 5 +++++ keyboards/keebwerk/nano_slider/config.h | 3 --- keyboards/keebwerk/nano_slider/info.json | 4 ++++ keyboards/kegen/gboy/config.h | 5 ----- keyboards/kegen/gboy/info.json | 4 ++++ keyboards/kira75/config.h | 3 --- keyboards/kira75/info.json | 4 ++++ keyboards/kira80/config.h | 3 --- keyboards/kira80/info.json | 4 ++++ keyboards/kiwikey/wanderland/config.h | 3 --- keyboards/kiwikey/wanderland/info.json | 4 ++++ keyboards/kmac/info.json | 3 +++ keyboards/kmac/rules.mk | 1 - keyboards/kopibeng/xt65/config.h | 3 --- keyboards/kopibeng/xt65/info.json | 4 ++++ keyboards/kprepublic/bm43a/config.h | 3 --- keyboards/kprepublic/bm43a/info.json | 4 ++++ keyboards/kprepublic/cospad/config.h | 2 -- keyboards/kprepublic/cospad/info.json | 1 + keyboards/kprepublic/jj40/config.h | 4 ---- keyboards/kprepublic/jj40/info.json | 5 +++++ keyboards/kprepublic/jj4x4/config.h | 4 ---- keyboards/kprepublic/jj4x4/info.json | 5 +++++ keyboards/kprepublic/jj50/config.h | 4 ---- keyboards/kprepublic/jj50/info.json | 5 +++++ keyboards/ktec/daisy/config.h | 3 --- keyboards/ktec/daisy/info.json | 4 ++++ keyboards/ktec/staryu/config.h | 2 -- keyboards/ktec/staryu/info.json | 3 ++- .../lazydesigners/dimple/staggered/rev3/config.h | 19 ------------------ .../lazydesigners/dimple/staggered/rev3/info.json | 3 +++ keyboards/lazydesigners/dimpleplus/config.h | 2 -- keyboards/lazydesigners/dimpleplus/info.json | 3 +++ keyboards/lazydesigners/the30/config.h | 2 -- keyboards/lazydesigners/the30/info.json | 3 +++ keyboards/lazydesigners/the40/config.h | 3 --- keyboards/lazydesigners/the40/info.json | 4 ++++ keyboards/lazydesigners/the50/config.h | 5 ----- keyboards/lazydesigners/the50/info.json | 4 ++++ keyboards/lazydesigners/the60/rev1/config.h | 5 ----- keyboards/lazydesigners/the60/rev1/info.json | 4 ++++ keyboards/lazydesigners/the60/rev2/config.h | 4 ---- keyboards/lazydesigners/the60/rev2/info.json | 5 +++++ keyboards/lfkeyboards/lfk65_hs/config.h | 1 - keyboards/lfkeyboards/lfk65_hs/info.json | 3 +++ keyboards/lfkeyboards/lfk78/config.h | 1 - keyboards/lfkeyboards/lfk78/revb/info.json | 4 ++++ keyboards/lfkeyboards/lfk78/revc/info.json | 4 ++++ keyboards/lfkeyboards/lfk78/revj/info.json | 4 ++++ keyboards/lfkeyboards/lfk78/rules.mk | 1 - keyboards/lfkeyboards/lfk87/config.h | 1 - keyboards/lfkeyboards/lfk87/info.json | 4 ++++ keyboards/lfkeyboards/lfk87/rules.mk | 1 - keyboards/lfkeyboards/mini1800/config.h | 1 - keyboards/lfkeyboards/mini1800/info.json | 4 ++++ keyboards/lfkeyboards/mini1800/mini1800.c | 1 - keyboards/lfkeyboards/mini1800/reva/rules.mk | 1 - keyboards/lfkeyboards/mini1800/revc/rules.mk | 1 - keyboards/lfkeyboards/smk65/revb/config.h | 1 - keyboards/lfkeyboards/smk65/revb/info.json | 3 +++ keyboards/linworks/dolice/config.h | 4 ---- keyboards/linworks/dolice/info.json | 4 ++++ keyboards/linworks/fave104/config.h | 4 ---- keyboards/linworks/fave104/info.json | 5 +++++ keyboards/linworks/fave87/config.h | 4 ---- keyboards/linworks/fave87/info.json | 4 ++++ keyboards/linworks/whale75/config.h | 4 ---- keyboards/linworks/whale75/info.json | 5 +++++ keyboards/lz/erghost/config.h | 3 --- keyboards/lz/erghost/info.json | 4 ++++ keyboards/m10a/config.h | 4 ---- keyboards/m10a/info.json | 4 ++++ keyboards/machkeyboards/mach3/config.h | 5 ----- keyboards/machkeyboards/mach3/info.json | 5 +++++ keyboards/machkeyboards/mach3/rules.mk | 1 - keyboards/maple_computing/christmas_tree/config.h | 2 -- keyboards/maple_computing/christmas_tree/info.json | 3 +++ keyboards/maple_computing/ivy/config.h | 2 -- keyboards/maple_computing/ivy/rev1/info.json | 3 +++ keyboards/maple_computing/jnao/config.h | 2 -- keyboards/maple_computing/jnao/info.json | 3 +++ .../maple_computing/lets_split_eh/eh/config.h | 2 -- .../maple_computing/lets_split_eh/eh/info.json | 3 +++ keyboards/massdrop/thekey/config.h | 2 -- keyboards/massdrop/thekey/info.json | 3 +++ keyboards/mechbrewery/mb65s/config.h | 2 -- keyboards/mechkeys/acr60/config.h | 3 --- keyboards/mechkeys/acr60/info.json | 4 ++++ keyboards/mechkeys/alu84/config.h | 3 --- keyboards/mechkeys/alu84/info.json | 4 ++++ keyboards/mechkeys/espectro/config.h | 3 --- keyboards/mechkeys/espectro/info.json | 4 ++++ keyboards/mechkeys/mechmini/v1/config.h | 2 -- keyboards/mechkeys/mechmini/v1/info.json | 3 +++ keyboards/mechkeys/mechmini/v2/config.h | 2 -- keyboards/mechkeys/mechmini/v2/info.json | 3 +++ keyboards/mechkeys/mk60/config.h | 4 ---- keyboards/mechkeys/mk60/info.json | 5 +++++ .../mechlovin/adelais/standard_led/arm/config.h | 2 -- .../mechlovin/adelais/standard_led/arm/info.json | 4 ++++ .../adelais/standard_led/avr/rev1/config.h | 3 --- .../adelais/standard_led/avr/rev1/info.json | 4 ++++ keyboards/mechlovin/delphine/mono_led/config.h | 4 ---- keyboards/mechlovin/delphine/mono_led/info.json | 3 +++ keyboards/mechlovin/hannah65/config.h | 2 -- keyboards/mechlovin/hannah65/info.json | 4 ++++ keyboards/mechlovin/hannah910/config.h | 4 ---- keyboards/mechlovin/hannah910/rev1/info.json | 4 ++++ keyboards/mechlovin/hannah910/rev2/info.json | 4 ++++ keyboards/mechlovin/hannah910/rev3/info.json | 4 ++++ keyboards/mechlovin/hex4b/rev1/config.h | 4 ---- keyboards/mechlovin/hex4b/rev1/info.json | 5 +++++ keyboards/mechlovin/hex4b/rev2/config.h | 3 --- keyboards/mechlovin/hex4b/rev2/info.json | 5 +++++ keyboards/mechlovin/hex6c/config.h | 2 -- keyboards/mechlovin/hex6c/info.json | 4 ++++ keyboards/mechlovin/infinity87/rev1/config.h | 2 -- keyboards/mechlovin/infinity87/rev1/info.json | 4 ++++ keyboards/mechlovin/infinity87/rev2/config.h | 3 --- keyboards/mechlovin/infinity87/rev2/info.json | 4 ++++ keyboards/mechlovin/infinity88/config.h | 2 -- keyboards/mechlovin/infinity88/info.json | 4 ++++ keyboards/mechlovin/infinityce/config.h | 3 --- keyboards/mechlovin/infinityce/info.json | 4 ++++ keyboards/mechlovin/kanu/config.h | 4 ---- keyboards/mechlovin/kanu/info.json | 4 ++++ keyboards/mechlovin/mechlovin9/rev1/config.h | 4 +--- keyboards/mechlovin/mechlovin9/rev1/info.json | 4 ++++ keyboards/mechlovin/mechlovin9/rev2/config.h | 3 --- keyboards/mechlovin/mechlovin9/rev2/info.json | 4 ++++ keyboards/mechlovin/olly/bb/config.h | 3 --- keyboards/mechlovin/olly/bb/info.json | 4 ++++ keyboards/mechlovin/olly/jf/config.h | 3 --- keyboards/mechlovin/olly/jf/info.json | 4 ++++ keyboards/mechlovin/pisces/config.h | 2 -- keyboards/mechlovin/pisces/info.json | 3 +++ keyboards/mechlovin/serratus/config.h | 3 --- keyboards/mechlovin/serratus/info.json | 4 ++++ keyboards/mechlovin/tmkl/config.h | 2 -- keyboards/mechlovin/tmkl/info.json | 4 ++++ keyboards/mehkee96/config.h | 2 -- keyboards/mehkee96/info.json | 3 +++ keyboards/melgeek/mj6xy/rev3/config.h | 6 ------ keyboards/melgeek/mj6xy/rev3/info.json | 7 +++++++ keyboards/melgeek/mj6xy/rev3/rules.mk | 1 - keyboards/meme/config.h | 3 --- keyboards/meme/info.json | 4 ++++ keyboards/merge/iso_macro/config.h | 1 - keyboards/merge/iso_macro/info.json | 3 +++ keyboards/merge/uma/config.h | 2 -- keyboards/merge/uma/info.json | 3 +++ keyboards/metamechs/timberwolf/config.h | 4 ---- keyboards/metamechs/timberwolf/info.json | 4 ++++ keyboards/metamechs/timberwolf/rules.mk | 2 -- keyboards/mntre/config.h | 1 - keyboards/mntre/info.json | 1 + keyboards/mntre/rules.mk | 2 -- keyboards/mode/m75s/config.h | 3 --- keyboards/mode/m75s/info.json | 5 +++++ keyboards/mokey/ginkgo65/config.h | 5 ----- keyboards/mokey/ginkgo65/info.json | 3 ++- keyboards/mokey/ginkgo65hot/config.h | 5 ----- keyboards/mokey/ginkgo65hot/info.json | 6 ++++++ keyboards/monarch/config.h | 4 ---- keyboards/monarch/info.json | 5 +++++ keyboards/monarch/rules.mk | 2 -- keyboards/monstargear/xo87/solderable/config.h | 2 -- keyboards/monstargear/xo87/solderable/info.json | 4 ++++ keyboards/monstargear/xo87/solderable/rules.mk | 1 - keyboards/moon/config.h | 3 --- keyboards/moon/info.json | 3 +++ keyboards/mt/blocked65/config.h | 3 --- keyboards/mt/blocked65/info.json | 4 ++++ keyboards/mt/mt40/config.h | 2 -- keyboards/mt/mt40/info.json | 3 +++ keyboards/mt/mt980/config.h | 2 -- keyboards/mt/mt980/info.json | 3 +++ keyboards/mt/ncr80/solder/config.h | 4 ---- keyboards/mt/ncr80/solder/info.json | 4 ++++ keyboards/mt/split75/config.h | 2 -- keyboards/mt/split75/info.json | 3 +++ keyboards/ncc1701kb/config.h | 4 ---- keyboards/ncc1701kb/info.json | 4 ++++ keyboards/neito/config.h | 3 --- keyboards/neito/info.json | 2 ++ keyboards/neokeys/g67/soldered/config.h | 4 ---- keyboards/neokeys/g67/soldered/info.json | 5 +++++ keyboards/nix_studio/oxalys80/config.h | 2 -- keyboards/nix_studio/oxalys80/info.json | 3 +++ keyboards/nopunin10did/jabberwocky/v2/config.h | 2 -- keyboards/nopunin10did/jabberwocky/v2/info.json | 4 +++- keyboards/nopunin10did/jabberwocky/v2/rules.mk | 1 - keyboards/novelkeys/novelpad/config.h | 3 --- keyboards/novelkeys/novelpad/info.json | 4 ++++ keyboards/noxary/220/config.h | 3 --- keyboards/noxary/220/info.json | 4 ++++ keyboards/noxary/260/config.h | 3 --- keyboards/noxary/260/info.json | 4 ++++ keyboards/noxary/268/config.h | 2 -- keyboards/noxary/268/info.json | 3 +++ keyboards/noxary/268_2/config.h | 2 -- keyboards/noxary/268_2/info.json | 3 +++ keyboards/noxary/268_2_rgb/config.h | 2 -- keyboards/noxary/268_2_rgb/info.json | 3 +++ keyboards/noxary/280/config.h | 3 --- keyboards/noxary/280/info.json | 4 ++++ keyboards/noxary/x268/config.h | 2 -- keyboards/noxary/x268/info.json | 3 +++ keyboards/oddforge/vea/config.h | 2 -- keyboards/oddforge/vea/info.json | 3 +++ keyboards/ok60/config.h | 4 ---- keyboards/ok60/info.json | 4 ++++ keyboards/omkbd/ergodash/mini/config.h | 5 ----- keyboards/omkbd/ergodash/mini/info.json | 4 ++++ keyboards/omkbd/ergodash/rev1/config.h | 5 ----- keyboards/omkbd/ergodash/rev1/info.json | 4 ++++ keyboards/orange75/config.h | 2 -- keyboards/orange75/info.json | 3 +++ keyboards/org60/config.h | 4 ---- keyboards/org60/info.json | 4 ++++ keyboards/panc60/config.h | 2 -- keyboards/panc60/info.json | 3 +++ keyboards/pearl/config.h | 2 -- keyboards/pearl/info.json | 3 +++ keyboards/percent/booster/config.h | 2 -- keyboards/percent/booster/info.json | 3 +++ keyboards/percent/canoe/config.h | 2 -- keyboards/percent/canoe/info.json | 3 +++ keyboards/percent/skog/config.h | 3 --- keyboards/percent/skog/info.json | 4 ++++ keyboards/percent/skog_lite/config.h | 2 -- keyboards/percent/skog_lite/info.json | 3 +++ keyboards/planck/config.h | 2 -- keyboards/planck/light/config.h | 4 ---- keyboards/planck/light/info.json | 3 +++ keyboards/planck/rev1/info.json | 3 +++ keyboards/planck/rev2/info.json | 3 +++ keyboards/planck/rev3/info.json | 3 +++ keyboards/planck/rev4/info.json | 3 +++ keyboards/planck/rev5/info.json | 3 +++ keyboards/playkbtw/ca66/config.h | 2 -- keyboards/playkbtw/ca66/info.json | 3 +++ keyboards/playkbtw/helen80/config.h | 2 -- keyboards/playkbtw/pk60/config.h | 5 ----- keyboards/playkbtw/pk60/info.json | 4 ++++ keyboards/plut0nium/0x3e/config.h | 7 ------- keyboards/plut0nium/0x3e/info.json | 5 +++++ keyboards/poker87c/config.h | 2 -- keyboards/poker87c/info.json | 3 +++ keyboards/poker87d/config.h | 2 -- keyboards/poker87d/info.json | 3 +++ keyboards/polycarbdiet/s20/config.h | 3 --- keyboards/polycarbdiet/s20/info.json | 4 ++++ keyboards/pom_keyboards/tnln95/config.h | 4 ---- keyboards/pom_keyboards/tnln95/info.json | 5 +++++ keyboards/preonic/config.h | 2 -- keyboards/preonic/rev1/info.json | 3 +++ keyboards/preonic/rev2/info.json | 3 +++ keyboards/primekb/prime_e/std/config.h | 22 --------------------- keyboards/primekb/prime_e/std/info.json | 4 ++++ keyboards/primekb/prime_l/v1/config.h | 4 ---- keyboards/primekb/prime_l/v1/info.json | 4 ++++ keyboards/primekb/prime_m/config.h | 4 ---- keyboards/primekb/prime_m/info.json | 4 ++++ keyboards/primekb/prime_o/config.h | 4 ---- keyboards/primekb/prime_o/info.json | 4 ++++ keyboards/primekb/prime_r/config.h | 5 ----- keyboards/primekb/prime_r/info.json | 4 ++++ keyboards/projectkb/alice/info.json | 5 +++++ keyboards/projectkb/alice/rev1/config.h | 3 --- keyboards/projectkb/alice/rev2/config.h | 3 --- keyboards/prototypist/allison/config.h | 4 ---- keyboards/prototypist/allison/info.json | 5 +++++ keyboards/prototypist/allison_numpad/config.h | 4 ---- keyboards/prototypist/allison_numpad/info.json | 5 +++++ keyboards/prototypist/j01/config.h | 3 --- keyboards/prototypist/j01/info.json | 4 ++++ keyboards/quad_h/lb75/config.h | 3 --- keyboards/quad_h/lb75/info.json | 4 ++++ keyboards/redscarf_i/config.h | 3 --- keyboards/redscarf_i/info.json | 3 +++ keyboards/redscarf_iiplus/verb/config.h | 2 -- keyboards/redscarf_iiplus/verb/info.json | 3 +++ keyboards/redscarf_iiplus/verc/config.h | 2 -- keyboards/redscarf_iiplus/verc/info.json | 3 +++ keyboards/redscarf_iiplus/verd/config.h | 2 -- keyboards/redscarf_iiplus/verd/info.json | 3 +++ keyboards/rmi_kb/wete/v1/config.h | 4 ---- keyboards/rmi_kb/wete/v1/info.json | 5 +++++ keyboards/ryloo_studio/m0110/config.h | 5 ----- keyboards/ryloo_studio/m0110/info.json | 4 ++++ keyboards/sam/s80/config.h | 2 -- keyboards/sam/s80/info.json | 3 +++ keyboards/sandwich/keeb68/config.h | 4 ---- keyboards/sandwich/keeb68/info.json | 5 +++++ keyboards/sentraq/number_pad/config.h | 2 -- keyboards/sentraq/number_pad/info.json | 3 +++ keyboards/sentraq/s60_x/default/config.h | 5 ----- keyboards/sentraq/s60_x/default/info.json | 4 ++++ keyboards/sentraq/s60_x/rgb/config.h | 5 ----- keyboards/sentraq/s60_x/rgb/info.json | 4 ++++ keyboards/sentraq/s65_plus/config.h | 2 -- keyboards/sentraq/s65_plus/info.json | 3 +++ keyboards/sentraq/s65_x/config.h | 4 ---- keyboards/sentraq/s65_x/info.json | 5 +++++ keyboards/singa/config.h | 2 -- keyboards/singa/info.json | 3 +++ keyboards/skeletn87/hotswap/config.h | 4 ---- keyboards/skeletn87/hotswap/info.json | 5 +++++ keyboards/skeletn87/soldered/config.h | 4 ---- keyboards/skeletn87/soldered/info.json | 5 +++++ keyboards/smithrune/iron165r2/f072/config.h | 3 --- keyboards/smithrune/iron165r2/f072/info.json | 5 +++++ keyboards/smithrune/iron165r2/f072/rules.mk | 1 - keyboards/smithrune/iron165r2/f411/config.h | 3 --- keyboards/smithrune/iron165r2/f411/info.json | 5 +++++ keyboards/smithrune/iron165r2/f411/rules.mk | 1 - keyboards/smithrune/iron180/config.h | 3 --- keyboards/smithrune/iron180/info.json | 5 +++++ keyboards/sowbug/68keys/config.h | 5 ----- keyboards/sowbug/ansi_tkl/config.h | 6 ------ keyboards/specskeys/config.h | 3 --- keyboards/specskeys/info.json | 4 ++++ keyboards/spiderisland/split78/config.h | 3 --- keyboards/spiderisland/split78/info.json | 4 ++++ keyboards/subatomic/config.h | 2 -- keyboards/subatomic/info.json | 3 +++ keyboards/switchplate/southpaw_65/config.h | 3 --- keyboards/switchplate/southpaw_65/info.json | 4 ++++ keyboards/switchplate/southpaw_fullsize/config.h | 2 -- keyboards/switchplate/southpaw_fullsize/info.json | 3 +++ keyboards/switchplate/switchplate910/config.h | 2 -- keyboards/switchplate/switchplate910/info.json | 3 +++ keyboards/sx60/config.h | 2 -- keyboards/sx60/info.json | 3 +++ keyboards/tada68/config.h | 5 ----- keyboards/tada68/info.json | 5 +++++ keyboards/team0110/p1800fl/config.h | 4 ---- keyboards/team0110/p1800fl/info.json | 5 +++++ keyboards/tgr/910/config.h | 2 -- keyboards/tgr/910/info.json | 3 +++ keyboards/tgr/910ce/config.h | 2 -- keyboards/tgr/910ce/info.json | 3 +++ keyboards/tgr/alice/config.h | 2 -- keyboards/tgr/alice/info.json | 3 +++ keyboards/tgr/jane/v2/config.h | 2 -- keyboards/tgr/jane/v2/info.json | 3 +++ keyboards/tgr/jane/v2ce/config.h | 2 -- keyboards/tgr/jane/v2ce/info.json | 3 +++ keyboards/tgr/tris/config.h | 2 -- keyboards/tgr/tris/info.json | 3 +++ keyboards/thevankeyboards/bananasplit/config.h | 3 --- keyboards/thevankeyboards/bananasplit/info.json | 3 +++ keyboards/tkc/california/config.h | 5 ----- keyboards/tkc/california/info.json | 4 ++++ keyboards/tkc/m0lly/config.h | 4 ---- keyboards/tkc/m0lly/info.json | 4 ++++ keyboards/tkc/osav2/config.h | 3 --- keyboards/tkc/osav2/info.json | 4 ++++ keyboards/tkc/tkc1800/config.h | 3 --- keyboards/tkc/tkc1800/info.json | 4 ++++ keyboards/tkc/tkl_ab87/config.h | 4 ---- keyboards/tkc/tkl_ab87/info.json | 4 ++++ keyboards/tmo50/config.h | 3 --- keyboards/tmo50/info.json | 4 ++++ keyboards/tokyokeyboard/alix40/config.h | 6 ------ keyboards/tokyokeyboard/alix40/info.json | 5 +++++ keyboards/tokyokeyboard/tokyo60/config.h | 5 ----- keyboards/tokyokeyboard/tokyo60/info.json | 4 ++++ keyboards/tr60w/config.h | 2 -- keyboards/tr60w/info.json | 3 +++ keyboards/treasure/type9/config.h | 3 --- keyboards/treasure/type9/info.json | 4 ++++ keyboards/treasure/type9s2/config.h | 2 -- keyboards/treasure/type9s2/info.json | 3 +++ keyboards/tzarc/djinn/config.h | 1 - keyboards/tzarc/djinn/info.json | 3 ++- keyboards/tzarc/djinn/rules.mk | 2 -- keyboards/ubest/vn/config.h | 2 -- keyboards/ubest/vn/info.json | 3 +++ keyboards/uk78/config.h | 2 -- keyboards/uk78/info.json | 3 +++ keyboards/unikeyboard/diverge3/config.h | 4 ---- keyboards/unikeyboard/diverge3/info.json | 5 +++++ keyboards/unikeyboard/felix/config.h | 3 --- keyboards/unikeyboard/felix/info.json | 4 ++++ keyboards/unikorn/config.h | 2 -- keyboards/unikorn/info.json | 3 +++ keyboards/utd80/config.h | 3 --- keyboards/utd80/info.json | 4 ++++ keyboards/v60_type_r/config.h | 2 -- keyboards/v60_type_r/info.json | 1 + keyboards/waldo/config.h | 3 --- keyboards/waldo/info.json | 4 ++++ keyboards/walletburner/neuron/config.h | 2 -- keyboards/westfoxtrot/aanzee/config.h | 4 ---- keyboards/westfoxtrot/aanzee/info.json | 5 +++++ keyboards/westfoxtrot/cypher/rev1/config.h | 4 ---- keyboards/westfoxtrot/cypher/rev1/info.json | 5 +++++ keyboards/westfoxtrot/cypher/rev5/config.h | 8 -------- keyboards/westfoxtrot/cypher/rev5/info.json | 5 +++++ keyboards/wilba_tech/rama_works_m10_b/config.h | 2 -- keyboards/wilba_tech/rama_works_m10_b/info.json | 3 +++ keyboards/winkeyless/b87/config.h | 2 -- keyboards/winkeyless/b87/info.json | 3 +++ keyboards/winkeyless/bface/config.h | 2 -- keyboards/winkeyless/bface/info.json | 3 +++ keyboards/winkeyless/bmini/config.h | 2 -- keyboards/winkeyless/bmini/info.json | 3 +++ keyboards/winkeyless/bminiex/config.h | 3 --- keyboards/winkeyless/bminiex/info.json | 4 ++++ keyboards/wolf/sabre/config.h | 2 -- keyboards/wolf/sabre/info.json | 3 +++ keyboards/wolf/sabre/rules.mk | 1 - keyboards/wolf/ts60/config.h | 3 --- keyboards/wolf/ts60/info.json | 4 ++++ keyboards/woodkeys/meira/config.h | 3 --- keyboards/woodkeys/meira/info.json | 4 ++++ keyboards/woodkeys/meira/meira.c | 1 - keyboards/woodkeys/meira/rules.mk | 1 - keyboards/x16/config.h | 3 --- keyboards/x16/info.json | 4 ++++ keyboards/xiudi/xd004/info.json | 4 ++++ keyboards/xiudi/xd004/v1/config.h | 5 ----- keyboards/xiudi/xd60/rev2/config.h | 4 ---- keyboards/xiudi/xd60/rev2/info.json | 2 ++ keyboards/xiudi/xd60/rev3/config.h | 4 ---- keyboards/xiudi/xd60/rev3/info.json | 2 ++ keyboards/xiudi/xd68/config.h | 4 ---- keyboards/xiudi/xd68/info.json | 3 +++ keyboards/xiudi/xd75/config.h | 3 --- keyboards/xiudi/xd75/info.json | 2 ++ keyboards/xiudi/xd84/config.h | 3 --- keyboards/xiudi/xd84/info.json | 2 ++ keyboards/xiudi/xd84pro/config.h | 3 --- keyboards/xiudi/xd84pro/info.json | 2 ++ keyboards/xiudi/xd87/config.h | 2 -- keyboards/xiudi/xd87/info.json | 1 + keyboards/xiudi/xd96/config.h | 3 --- keyboards/xiudi/xd96/info.json | 4 ++++ keyboards/ydkb/chili/config.h | 3 --- keyboards/ydkb/chili/info.json | 4 ++++ keyboards/ydkb/grape/config.h | 3 --- keyboards/ydkb/grape/info.json | 4 ++++ keyboards/ymdk/bface/config.h | 3 --- keyboards/ymdk/bface/info.json | 4 ++++ keyboards/ymdk/melody96/config.h | 5 ----- keyboards/ymdk/melody96/info.json | 4 ++++ keyboards/ymdk/np21/config.h | 4 ---- keyboards/ymdk/np21/info.json | 5 +++++ keyboards/ymdk/np24/u4rgb6/config.h | 5 ----- keyboards/ymdk/np24/u4rgb6/info.json | 4 ++++ keyboards/ymdk/wings/config.h | 3 --- keyboards/ymdk/wings/info.json | 4 ++++ keyboards/ymdk/wingshs/config.h | 3 --- keyboards/ymdk/wingshs/info.json | 4 ++++ keyboards/ymdk/yd60mq/config.h | 5 ----- keyboards/ymdk/yd60mq/info.json | 4 ++++ keyboards/ymdk/ym68/config.h | 4 ---- keyboards/ymdk/ym68/info.json | 5 +++++ keyboards/ymdk/ymd21/v2/config.h | 3 --- keyboards/ymdk/ymd21/v2/info.json | 4 ++++ keyboards/ymdk/ymd40/v2/config.h | 3 --- keyboards/ymdk/ymd40/v2/info.json | 4 ++++ keyboards/ymdk/ymd67/config.h | 5 ----- keyboards/ymdk/ymd67/info.json | 4 ++++ keyboards/ymdk/ymd75/config.h | 3 --- keyboards/ymdk/ymd75/rev1/config.h | 1 - keyboards/ymdk/ymd75/rev1/info.json | 4 ++++ keyboards/ymdk/ymd75/rev2/config.h | 1 - keyboards/ymdk/ymd75/rev2/info.json | 4 ++++ keyboards/ymdk/ymd75/rev3/config.h | 1 - keyboards/ymdk/ymd75/rev3/info.json | 4 ++++ keyboards/ymdk/ymd96/config.h | 4 ---- keyboards/ymdk/ymd96/info.json | 5 +++++ keyboards/zj68/config.h | 5 ----- keyboards/zj68/info.json | 4 ++++ keyboards/zoo/wampus/config.h | 4 ---- keyboards/zoo/wampus/info.json | 4 ++++ 1003 files changed, 1873 insertions(+), 1684 deletions(-) delete mode 100644 keyboards/40percentclub/sixpack/config.h delete mode 100644 keyboards/clueboard/60/config.h delete mode 100644 keyboards/jiran/rev1/config.h create mode 100644 keyboards/jiran/rev1/info.json delete mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/config.h create mode 100644 keyboards/melgeek/mj6xy/rev3/info.json delete mode 100644 keyboards/mokey/ginkgo65/config.h delete mode 100644 keyboards/primekb/prime_e/std/config.h (limited to 'data') 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"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 95387ba367..6f4f9c82ac 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -108,6 +108,10 @@ "type": "object", "additionalProperties": false, "properties": { + "driver": { + "type": "string", + "enum": ["pwm", "software", "timer", "custom"] + }, "breathing": {"type": "boolean"}, "breathing_period": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "levels": { @@ -118,7 +122,8 @@ "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, - "on_state": {"$ref": "qmk.definitions.v1#/bit"} + "on_state": {"$ref": "qmk.definitions.v1#/bit"}, + "as_caps_lock": {"type": "boolean"} } }, "bluetooth": { diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 5b576cc0c5..b7cbf3b757 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -23,10 +23,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { F6 } #define ENCODERS_PAD_B { F5 } -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 7 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index d37fc515f7..95170ee873 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -8,6 +8,11 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 7, + "breathing": true + }, "qmk_lufa_bootloader": { "led": "B0" }, diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index 9baa65da42..b58eef1085 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json index 53df29c726..07f35c7340 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/info.json @@ -8,6 +8,11 @@ "pid": "0x6873", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h index e3b1dfd896..ff5f010cbe 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json index 3e2c34d259..98a9082989 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/info.json @@ -8,6 +8,9 @@ "pid": "0x6874", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h index ded1ca7ccc..806f23075f 100644 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ b/keyboards/1upkeyboards/1up60rgb/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 64dc9e9cd3..57a0143544 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -8,6 +8,10 @@ "pid": "0x7267", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"], diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index fe28b50352..afce07dbc9 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/rev1/config.h @@ -28,10 +28,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { B5, F5 } #define ENCODERS_PAD_B { B6, F6 } -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 8 - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index dab37baf04..7d3baad862 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 8, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h index 18724c8966..3d6c38ec80 100644 --- a/keyboards/40percentclub/gherkin/config.h +++ b/keyboards/40percentclub/gherkin/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index c93e8734e8..ee85708f19 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h index 4028b0cf1a..2848c7a32c 100644 --- a/keyboards/40percentclub/luddite/config.h +++ b/keyboards/40percentclub/luddite/config.h @@ -7,11 +7,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 4 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json index 704b30479b..948ef091bd 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/info.json @@ -8,6 +8,10 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "backlight": { + "pin": "B5", + "levels": 4 + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["60_ansi"], diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h index 0daccc09ab..0a07934e75 100644 --- a/keyboards/40percentclub/mf68/config.h +++ b/keyboards/40percentclub/mf68/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json index 89df2e1958..2c8a4c92d6 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/info.json @@ -8,6 +8,10 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["68_ansi"], diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h index 490dcf629a..6bdf5db350 100644 --- a/keyboards/40percentclub/nori/config.h +++ b/keyboards/40percentclub/nori/config.h @@ -33,8 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - // enable RGB underglow #define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index 5bb4a0bf08..fa12a8ef03 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -8,6 +8,9 @@ "pid": "0x0A0C", "device_version": "4.4.4" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h deleted file mode 100644 index acf61f0017..0000000000 --- a/keyboards/40percentclub/sixpack/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 - -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 2 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 . -*/ - -#pragma once - -/* Backlight */ -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 6 diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json index 65f16021dd..f0ba7f1aff 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/info.json @@ -9,7 +9,9 @@ "device_version": "10.0.1" }, "backlight": { - "pins": ["F4", "F5"] + "pins": ["F4", "F5"], + "levels": 6, + "breathing": true }, "indicators": { "caps_lock": "B0", diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index ac93743ec6..3d480a1e93 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -20,13 +20,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} #define DIODE_DIRECTION COL2ROW -/* In switch leds */ -#define BACKLIGHT_PIN A3 #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 4 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 10 -#define BACKLIGHT_BREATHING TRUE /* Underglow */ #define RGB_DI_PIN A7 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index b896f02ad9..8748b32480 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "backlight": { + "pin": "A3", + "levels": 10, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk index 70dd3e445a..8b5bef208b 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = yes WS2812_DRIVER = spi diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index 5e1d995a68..eed3b708c4 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -20,13 +20,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} #define DIODE_DIRECTION COL2ROW -/* In switch leds */ -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Underglow */ #define RGBLED_NUM 16 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index e6ac536f43..7ced2cf40c 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -8,6 +8,11 @@ "pid": "0x0010", "device_version": "0.0.2" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "B1", "num_lock": "B12", diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h index 5be5e67374..fe5d7a4982 100644 --- a/keyboards/8pack/config.h +++ b/keyboards/8pack/config.h @@ -6,8 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_LEVELS 8 - // ws2812 options #define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 8 // number of LEDs diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index 2c7a34d487..3e6b556fae 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -8,7 +8,8 @@ "pid": "0x2171" }, "backlight": { - "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "levels": 8 }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h index 61a157c01e..46e0cacce4 100644 --- a/keyboards/abstract/ellipse/rev1/config.h +++ b/keyboards/abstract/ellipse/rev1/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 15 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 3 diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json index 664cae1902..fe1939d2b6 100644 --- a/keyboards/abstract/ellipse/rev1/info.json +++ b/keyboards/abstract/ellipse/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 15 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h index 14a74da619..07378f5e3d 100644 --- a/keyboards/acekeyboard/titan60/config.h +++ b/keyboards/acekeyboard/titan60/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN D0 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json index 17747b5cb1..00629035c0 100644 --- a/keyboards/acekeyboard/titan60/info.json +++ b/keyboards/acekeyboard/titan60/info.json @@ -8,6 +8,10 @@ "pid": "0x5449", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index fd6f74bf35..e99fb83328 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -26,12 +26,9 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 34 diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index bf335285ae..2ebf2da8de 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -5,7 +5,10 @@ "device_version": "0.0.1" }, "backlight": { - "on_state": 0 + "pin": "A6", + "levels": 20, + "on_state": 0, + "breathing": true }, "indicators": { "caps_lock": "A10" diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk index 962a27694f..3d622c2216 100644 --- a/keyboards/acheron/athena/alpha/rules.mk +++ b/keyboards/acheron/athena/alpha/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index a3a1a3b25c..7fbc624522 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -26,12 +26,9 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B0 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 34 diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 51c335a850..dd8e766f90 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "backlight": { + "pin": "B0", + "levels": 20, + "breathing": true + }, "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk index 962a27694f..3d622c2216 100644 --- a/keyboards/acheron/athena/beta/rules.mk +++ b/keyboards/acheron/athena/beta/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index 210e4182a5..ce12edfd33 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index 3f76e22f0c..dad488df8f 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -8,6 +8,11 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 6766f62ef5..0ceba36100 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -23,13 +23,9 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_DEFAULT_LEVEL 10 #define RGB_DI_PIN B15 #define RGBLED_NUM 16 diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index 6a5318b777..f5f87333eb 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.2" }, "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true, "breathing_period": 3 }, "processor": "STM32F072", diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index cadd2d825d..dba9b3f41d 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -44,7 +44,6 @@ B0, which is unconnected on the PCB /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B0 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 0db6134e0b..5b235cc387 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,9 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "backlight": { + "pin": "B0" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 633f76289f..161b9b1558 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -25,12 +25,9 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 24 diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 615e9a91b9..0dcb286e97 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index b4a94395c6..fd436cc258 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -BACKLIGHT_DRIVER = pwm LTO_ENABLE = no ENCODER_ENABLE = yes diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h index fa7e2cbb86..e22e250f85 100644 --- a/keyboards/adelheid/config.h +++ b/keyboards/adelheid/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN C6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json index b8684e37ac..19970b27cf 100644 --- a/keyboards/adelheid/info.json +++ b/keyboards/adelheid/info.json @@ -8,6 +8,9 @@ "pid": "0xAD78", "device_version": "0.0.2" }, + "backlight": { + "pin": "C6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h index 364b919179..8f5625e2eb 100644 --- a/keyboards/aeboards/ext65/rev2/config.h +++ b/keyboards/aeboards/ext65/rev2/config.h @@ -50,12 +50,8 @@ #define I2C1_TIMINGR_SCLL 9U // LED defines -#define BACKLIGHT_PIN B5 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING - #define SLEEP_LED_GPT_DRIVER GPTD1 diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json index 7fbe7c2847..2939dc89ea 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -7,6 +7,11 @@ "pid": "0xA652", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index f838baddd6..32065a4740 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ai03/equinox/rev0/config.h b/keyboards/ai03/equinox/rev0/config.h index be599c1225..78c6fb8fcd 100644 --- a/keyboards/ai03/equinox/rev0/config.h +++ b/keyboards/ai03/equinox/rev0/config.h @@ -20,8 +20,3 @@ along with this program. If not, see . // Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins #undef MATRIX_COL_PINS #define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 } - -// This directs backlight code to use a disconnected pin, so the firwmare still has -// backlight code and VIA support even though it doesn't do anything. -#undef BACKLIGHT_PIN -#define BACKLIGHT_PIN D1 \ No newline at end of file diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json index dd190d18ee..d76623777e 100644 --- a/keyboards/ai03/equinox/rev0/info.json +++ b/keyboards/ai03/equinox/rev0/info.json @@ -1,4 +1,9 @@ { + "backlight": { + "pin": "D1", + "levels": 5, + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu" } diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json index dd190d18ee..19cd40d140 100644 --- a/keyboards/ai03/equinox/rev1/info.json +++ b/keyboards/ai03/equinox/rev1/info.json @@ -1,4 +1,9 @@ { + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu" } diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h index 8d4a1fdd59..85d4ae5bfe 100644 --- a/keyboards/ai03/orbit/config.h +++ b/keyboards/ai03/orbit/config.h @@ -43,8 +43,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index c6cd6407c4..840fb1fc20 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "backlight": { + "pin": "B7" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h index 9c360a190f..871f4bc8db 100644 --- a/keyboards/ai03/polaris/config.h +++ b/keyboards/ai03/polaris/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json index 64fb65aaee..ae0fcb927d 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h index 9d66d61e08..32c7bcbd2a 100644 --- a/keyboards/al1/config.h +++ b/keyboards/al1/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 } #define SN74X154_E1_PIN D3 -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index fe23911145..5149373e48 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json @@ -8,6 +8,10 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "B7", "num_lock": "D0", diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 4ae0863425..e81b6a2010 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index a93d76a38d..faf199d8a0 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index cbf4338da4..04ebe0c657 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLED_NUM 28 diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index 5d4fdc69a6..8b3ae6f2ba 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "C6", "num_lock": "E6", diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 00524ace43..374873d5d5 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -26,8 +26,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index 30630b3188..5e0b3087a8 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -12,6 +12,9 @@ "caps_lock": "B2", "on_state": 0 }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h index 01e94f7651..bdefff8c4f 100755 --- a/keyboards/amjkeyboard/amj40/config.h +++ b/keyboards/amjkeyboard/amj40/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F4, F5, F6, F7} #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7} -#define BACKLIGHT_PIN B6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -33,10 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 4 - /* Underlight configuration */ diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index 79848d94dc..fe66c34b86 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -8,6 +8,10 @@ "pid": "0x6072", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 825edef631..0a38f73032 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 4 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index 750f7bec99..d624894691 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,11 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4, + "breathing": true + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h index 32508821b7..7271119876 100644 --- a/keyboards/amjkeyboard/amj66/config.h +++ b/keyboards/amjkeyboard/amj66/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index f22677e20a..ed41d4d58c 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -8,6 +8,10 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["66_ansi", "66_iso"], diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h index 8e92b9e599..7aef945e5b 100644 --- a/keyboards/amjkeyboard/amj84/config.h +++ b/keyboards/amjkeyboard/amj84/config.h @@ -20,9 +20,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json index 402dac7a42..20f8fd99b1 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/info.json @@ -8,6 +8,10 @@ "pid": "0x6068", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h index 46f38e6dbb..63e6e899fa 100644 --- a/keyboards/amjkeyboard/amjpad/config.h +++ b/keyboards/amjkeyboard/amjpad/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F7, F6, F5, F4, D5, D0 } #define MATRIX_COL_PINS { F1, F0, E6, C7 } -#define BACKLIGHT_PIN B6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -33,10 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 4 - /* Underlight configuration */ diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 60e80d0bdd..7a22d14639 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "num_lock": "D6", "on_state": 0 diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h index 526f673ab9..fce7328718 100644 --- a/keyboards/anavi/macropad8/config.h +++ b/keyboards/anavi/macropad8/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define BACKLIGHT_PIN D7 -#define BACKLIGHT_BREATHING #define RGBLIGHT_SLEEP diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index b152a7c1f1..b52ca5a176 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -4,10 +4,14 @@ "url": "", "maintainer": "leon-anavi", "usb": { - "vid": "0xCEEB", - "pid": "0x0001", - "device_version": "0.0.1" - }, + "vid": "0xCEEB", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "backlight": { + "pin": "D7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h index 608d112e6d..3d384af9ea 100644 --- a/keyboards/ares/config.h +++ b/keyboards/ares/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index 0bcbf7a4d4..391c7a8125 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h index 4efba85159..9c50c21e3f 100644 --- a/keyboards/atomic/config.h +++ b/keyboards/atomic/config.h @@ -31,8 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D5, B5, B6, C6 } #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json index a4c0c18bf2..95f5088995 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/info.json @@ -7,6 +7,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h index b3f56e7c24..e4f44cdfce 100644 --- a/keyboards/atxkb/1894/config.h +++ b/keyboards/atxkb/1894/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json index d3966d5185..fef98bcacf 100644 --- a/keyboards/atxkb/1894/info.json +++ b/keyboards/atxkb/1894/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/config.h index c843c89eef..0b644bec4a 100644 --- a/keyboards/b_sides/rev41lp/config.h +++ b/keyboards/b_sides/rev41lp/config.h @@ -22,6 +22,3 @@ along with this program. If not, see . #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json index 9b1a1c9e9c..c0a5fd3365 100644 --- a/keyboards/b_sides/rev41lp/info.json +++ b/keyboards/b_sides/rev41lp/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "B6", + "levels": 7, "max_brightness": 150 }, "processor": "atmega32u4", diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h index a0f3eebe0c..c4bc59fe7c 100644 --- a/keyboards/baguette/config.h +++ b/keyboards/baguette/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json index b89b92aff4..2714366c0e 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/info.json @@ -8,6 +8,11 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h index b80baa8040..82349297dd 100644 --- a/keyboards/bear_face/config.h +++ b/keyboards/bear_face/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json index 39f16ab6c9..f6f666d77f 100644 --- a/keyboards/bear_face/info.json +++ b/keyboards/bear_face/info.json @@ -8,6 +8,9 @@ "vid": "0xFEED", "pid": "0x09F5" }, + "backlight": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h index 264c8a552c..768b1b3551 100644 --- a/keyboards/bfake/config.h +++ b/keyboards/bfake/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json index f390102e21..fe457cb6d1 100644 --- a/keyboards/bfake/info.json +++ b/keyboards/bfake/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 3cfee0a389..32e179e918 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 8 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B1 #ifdef RGB_DI_PIN # define RGBLED_NUM 5 diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 1e95671f5d..65c59db2b4 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,11 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 8, + "breathing": true + }, "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index f6bffcf14f..d3172d1812 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -32,10 +32,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E6, B0, F1, F5, F4 } #define MATRIX_COL_PINS { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 } -/* Backlight Setup */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 12 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index bdc8e9b596..16b09ca00c 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -8,6 +8,10 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index e642b04c7c..eb20ed7515 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -10,11 +10,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 8 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index d8ef72cbb8..cca5ed456f 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,10 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 1fb1d149c0..6d609e0185 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -32,10 +32,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E6, C6, F4, B2, D4 } #define MATRIX_COL_PINS { F5, F6, F7, C7, B0, B7, B5, D5, B4, D7, D6, D1, D0, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 12 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index c71f000e2f..1a822b2113 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -8,6 +8,10 @@ "pid": "0x6581", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 4a98749258..6556560112 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -32,11 +32,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D2, D0, D1, F7, D6 } #define MATRIX_COL_PINS { F1, B3, F4, F5, F6, E6, C7, B2, B1, C6, B6, B5, B4, D7, D4, D5 } - -/* Backlight Setup */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 12 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index 8de355ee4b..b80b37b2ea 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -8,6 +8,10 @@ "pid": "0x5365", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h index 7b3249e881..6dddf137f7 100644 --- a/keyboards/boston/config.h +++ b/keyboards/boston/config.h @@ -22,12 +22,9 @@ { B5, B6, A7, B0, B1, B2, A4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json index 87980602ba..40cc21008c 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/info.json @@ -8,6 +8,11 @@ "pid": "0x4176", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "A1", "num_lock": "A0", diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h index 982e69a32b..c5007ffbbb 100644 --- a/keyboards/bt66tech/bt66tech60/config.h +++ b/keyboards/bt66tech/bt66tech60/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json index d3c6d1c4e9..91b824b6a4 100644 --- a/keyboards/bt66tech/bt66tech60/info.json +++ b/keyboards/bt66tech/bt66tech60/info.json @@ -8,6 +8,11 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["60_ansi"], diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h index 1b8b2d671b..dc8c82f7b0 100644 --- a/keyboards/cablecardesigns/cypher/rev6/config.h +++ b/keyboards/cablecardesigns/cypher/rev6/config.h @@ -9,16 +9,11 @@ /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN D0 - #define RGB_DI_PIN D5 #ifdef RGB_DI_PIN #define RGBLED_NUM 3 diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json index 6f3d97443f..4fc447236e 100644 --- a/keyboards/cablecardesigns/cypher/rev6/info.json +++ b/keyboards/cablecardesigns/cypher/rev6/info.json @@ -6,6 +6,11 @@ "pid": "0xAA99", "device_version": "0.0.2" }, + "backlight": { + "pin": "D0", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h index de54b4ddeb..a6b9872268 100644 --- a/keyboards/cannonkeys/an_c/config.h +++ b/keyboards/cannonkeys/an_c/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json index e3c6fb0b6a..0517bb09d3 100644 --- a/keyboards/cannonkeys/an_c/info.json +++ b/keyboards/cannonkeys/an_c/info.json @@ -8,6 +8,11 @@ "pid": "0xA00C", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_tsangan_hhkb"], diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h index b3037d9378..26e04106ab 100644 --- a/keyboards/cannonkeys/chimera65/config.h +++ b/keyboards/cannonkeys/chimera65/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A13, A14, A15, C13, B8 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/info.json index 5e182b470c..cdd07c3459 100644 --- a/keyboards/cannonkeys/chimera65/info.json +++ b/keyboards/cannonkeys/chimera65/info.json @@ -8,6 +8,11 @@ "pid": "0xC024", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h index 5442ee192f..d7c7052163 100644 --- a/keyboards/cannonkeys/cloudline/config.h +++ b/keyboards/cannonkeys/cloudline/config.h @@ -7,12 +7,9 @@ #define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index 86d126255d..d5d8b817ea 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "B9", "scroll_lock": "F0", diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h index 5cd5613378..c275e78f23 100644 --- a/keyboards/cannonkeys/crin/config.h +++ b/keyboards/cannonkeys/crin/config.h @@ -22,12 +22,9 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index 372eab0d48..6c6afa0f89 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "F1", "on_state": 0 diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h index ff2dcf70f2..9e034e7c12 100644 --- a/keyboards/cannonkeys/db60/config.h +++ b/keyboards/cannonkeys/db60/config.h @@ -22,12 +22,9 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index d6c11eb08b..5f4a94d367 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -6,6 +6,11 @@ "vid": "0xCA04", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu" } diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h index 2865ecebb9..cd6fa15243 100644 --- a/keyboards/cannonkeys/devastatingtkl/config.h +++ b/keyboards/cannonkeys/devastatingtkl/config.h @@ -21,13 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index 6d4172e7b2..557b53817b 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -8,6 +8,11 @@ "pid": "0xDE57", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h index 8f72638604..8e7158765d 100644 --- a/keyboards/cannonkeys/instant60/config.h +++ b/keyboards/cannonkeys/instant60/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json index 2ad358727b..56f5126d0d 100644 --- a/keyboards/cannonkeys/instant60/info.json +++ b/keyboards/cannonkeys/instant60/info.json @@ -8,6 +8,11 @@ "pid": "0x1600", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_tsangan_hhkb"], diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h index efa1e26fbb..5afccde3a7 100644 --- a/keyboards/cannonkeys/instant65/config.h +++ b/keyboards/cannonkeys/instant65/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json index 27ae86b94c..eedb9bd5c7 100644 --- a/keyboards/cannonkeys/instant65/info.json +++ b/keyboards/cannonkeys/instant65/info.json @@ -8,6 +8,11 @@ "pid": "0x1565", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h index 773aa16496..eb7011b349 100644 --- a/keyboards/cannonkeys/iron165/config.h +++ b/keyboards/cannonkeys/iron165/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/info.json index bd552f0938..b0ad19785c 100644 --- a/keyboards/cannonkeys/iron165/info.json +++ b/keyboards/cannonkeys/iron165/info.json @@ -8,6 +8,11 @@ "pid": "0x5165", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h index a3ab4d6e0d..57fa0cf7c3 100644 --- a/keyboards/cannonkeys/malicious_ergo/config.h +++ b/keyboards/cannonkeys/malicious_ergo/config.h @@ -23,12 +23,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index d9979a3462..9058e07878 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -8,6 +8,11 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "A8", "num_lock": "A9", diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h index d590606d28..6d2ab14c6b 100644 --- a/keyboards/cannonkeys/obliterated75/config.h +++ b/keyboards/cannonkeys/obliterated75/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index b4be81c835..30ea22bd74 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -8,6 +8,11 @@ "pid": "0x0B75", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h index 4ff492449b..3c95a53960 100644 --- a/keyboards/cannonkeys/onyx/config.h +++ b/keyboards/cannonkeys/onyx/config.h @@ -21,13 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json index c2708cc4eb..a4e1a69c9c 100644 --- a/keyboards/cannonkeys/onyx/info.json +++ b/keyboards/cannonkeys/onyx/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h index 87000ef0b9..5c864541c7 100644 --- a/keyboards/cannonkeys/ortho48/config.h +++ b/keyboards/cannonkeys/ortho48/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B12, C13, A2, A1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json index 0e022d240c..ba7f1dbdd4 100644 --- a/keyboards/cannonkeys/ortho48/info.json +++ b/keyboards/cannonkeys/ortho48/info.json @@ -8,6 +8,11 @@ "pid": "0x4F48", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index 0e86aa6851..f9c6596a9f 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 7db3ee9f04..8426955dae 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -8,6 +8,11 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h index a69a445b15..021c4f38b6 100644 --- a/keyboards/cannonkeys/ortho75/config.h +++ b/keyboards/cannonkeys/ortho75/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B12, C13, A2, A1, A3 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING #define ENCODERS_PAD_A { B9 } #define ENCODERS_PAD_B { B8 } diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json index c529181e4f..31465c47c0 100644 --- a/keyboards/cannonkeys/ortho75/info.json +++ b/keyboards/cannonkeys/ortho75/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["ortho_5x15"], diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h index fb301ef701..287b1484e9 100644 --- a/keyboards/cannonkeys/practice60/config.h +++ b/keyboards/cannonkeys/practice60/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json index 16ec3a2a91..a25485038b 100644 --- a/keyboards/cannonkeys/practice60/info.json +++ b/keyboards/cannonkeys/practice60/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["60_ansi"], diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h index b38638add4..ac3f193da9 100644 --- a/keyboards/cannonkeys/practice65/config.h +++ b/keyboards/cannonkeys/practice65/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B4, B11, B1, B7, B6 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json index de009fc870..17e548a825 100644 --- a/keyboards/cannonkeys/practice65/info.json +++ b/keyboards/cannonkeys/practice65/info.json @@ -8,6 +8,11 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h index 7c0745ceb8..37d156feb9 100644 --- a/keyboards/cannonkeys/rekt1800/config.h +++ b/keyboards/cannonkeys/rekt1800/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C13, C14, A0, A1, A2, B11 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json index 2a98bb85e7..e68f214427 100644 --- a/keyboards/cannonkeys/rekt1800/info.json +++ b/keyboards/cannonkeys/rekt1800/info.json @@ -8,6 +8,11 @@ "pid": "0x2377", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h index 9aed1f45bd..5edf9fdeb9 100644 --- a/keyboards/cannonkeys/sagittarius/config.h +++ b/keyboards/cannonkeys/sagittarius/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json index 76b52ab4bd..2b25ee6b98 100644 --- a/keyboards/cannonkeys/sagittarius/info.json +++ b/keyboards/cannonkeys/sagittarius/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "B3", "num_lock": "B4", diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h index 55dd8386dc..c2c20e1771 100644 --- a/keyboards/cannonkeys/satisfaction75/config.h +++ b/keyboards/cannonkeys/satisfaction75/config.h @@ -32,10 +32,6 @@ along with this program. If not, see . #define ENCODER_RESOLUTION 2 -//LEDS A6, RGB B15 -#define BACKLIGHT_LEVELS 24 -#define BACKLIGHT_BREATHING - // I2C config #define I2C_DRIVER I2CD1 #define I2C1_SCL_PIN B6 diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json index 44c96b3f3e..dd157defba 100644 --- a/keyboards/cannonkeys/satisfaction75/info.json +++ b/keyboards/cannonkeys/satisfaction75/info.json @@ -8,6 +8,10 @@ "pid": "0x57F5", "device_version": "0.0.1" }, + "backlight": { + "levels": 24, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu" } diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h index 416929afc7..79414a9a78 100644 --- a/keyboards/cannonkeys/savage65/config.h +++ b/keyboards/cannonkeys/savage65/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json index 5d7630c0af..1aa34de891 100644 --- a/keyboards/cannonkeys/savage65/info.json +++ b/keyboards/cannonkeys/savage65/info.json @@ -8,6 +8,11 @@ "pid": "0x5A65", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"], diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h index 9cdd3834fc..8722ba8d54 100644 --- a/keyboards/cannonkeys/tmov2/config.h +++ b/keyboards/cannonkeys/tmov2/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A10, A9, A8, B12 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json index d2309f2681..bdb6cd7453 100644 --- a/keyboards/cannonkeys/tmov2/info.json +++ b/keyboards/cannonkeys/tmov2/info.json @@ -8,6 +8,11 @@ "pid": "0x70F2", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h index 2c07e1d504..8987acd837 100644 --- a/keyboards/cannonkeys/tsukuyomi/config.h +++ b/keyboards/cannonkeys/tsukuyomi/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json index d1a7f4d6ba..fb5b22e5b7 100644 --- a/keyboards/cannonkeys/tsukuyomi/info.json +++ b/keyboards/cannonkeys/tsukuyomi/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h index 87a002728e..d989d427ff 100644 --- a/keyboards/cannonkeys/vicious40/config.h +++ b/keyboards/cannonkeys/vicious40/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A15, B3, B4, B5 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json index 32dc1fff4a..384343b8e9 100644 --- a/keyboards/cannonkeys/vicious40/info.json +++ b/keyboards/cannonkeys/vicious40/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h index 7576a85d51..65f64c2f09 100644 --- a/keyboards/capsunlocked/cu24/config.h +++ b/keyboards/capsunlocked/cu24/config.h @@ -33,11 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* Backlight */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* RGB Glow */ #define RGB_DI_PIN F4 // The pin the LED strip is connected to #define RGBLED_NUM 5 // Number of LEDs in your strip diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json index 03e87e6da6..ea361a2bf4 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h index f8cf3f0ffa..52dff09103 100644 --- a/keyboards/capsunlocked/cu75/config.h +++ b/keyboards/capsunlocked/cu75/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json index c6a6fe8be8..7f4eb623ac 100644 --- a/keyboards/capsunlocked/cu75/info.json +++ b/keyboards/capsunlocked/cu75/info.json @@ -8,6 +8,10 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk index e48941c949..cf757fc166 100644 --- a/keyboards/capsunlocked/cu75/rules.mk +++ b/keyboards/capsunlocked/cu75/rules.mk @@ -1,8 +1,3 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_DRIVER = custom - # TODO: These boards need to be converted to RGB Matrix VPATH += keyboards/lfkeyboards SRC = TWIlib.c issi.c lighting.c diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h index 5deae07fc6..062d3434eb 100644 --- a/keyboards/cest73/tkm/config.h +++ b/keyboards/cest73/tkm/config.h @@ -25,9 +25,6 @@ //NOTE: if D6 pin shows any issues in exploatation the LED on the Teensy is to be removed -//TODO change the E6 pin to either B5, B6, B7 or C6 to utilize hardware PWM on a future PCB revision -#define BACKLIGHT_PIN E6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json index 671cc27d52..6054f24467 100644 --- a/keyboards/cest73/tkm/info.json +++ b/keyboards/cest73/tkm/info.json @@ -8,6 +8,9 @@ "pid": "0xAA55", "device_version": "0.0.1" }, + "backlight": { + "pin": "E6" + }, "indicators": { "caps_lock": "F5", "num_lock": "F6", diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h index 23ef41da4c..adf72e2f65 100644 --- a/keyboards/checkerboards/nop60/config.h +++ b/keyboards/checkerboards/nop60/config.h @@ -25,11 +25,7 @@ Copyright 2021 Nathan Spears /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Switch LED Backlighting */ -#define BACKLIGHT_PIN D1 #define BACKLIGHT_PWM_DRIVER PWMD3 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING // ws2812 options #define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json index 4ed4b82cb5..96467b7702 100644 --- a/keyboards/checkerboards/nop60/info.json +++ b/keyboards/checkerboards/nop60/info.json @@ -8,6 +8,11 @@ "pid": "0x1416", "device_version": "0.0.1" }, + "backlight": { + "pin": "D1", + "levels": 6, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h index 004fc8a177..b44a42406b 100644 --- a/keyboards/checkerboards/quark_plus/config.h +++ b/keyboards/checkerboards/quark_plus/config.h @@ -30,11 +30,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Switch LED Backlighting */ -#define BACKLIGHT_PIN C4 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING - // ws2812 options #define RGB_DI_PIN C5 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json index 6685b84224..6c40827e74 100644 --- a/keyboards/checkerboards/quark_plus/info.json +++ b/keyboards/checkerboards/quark_plus/info.json @@ -8,6 +8,11 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "backlight": { + "pin": "C4", + "levels": 6, + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/checkerboards/quark_plus/rules.mk b/keyboards/checkerboards/quark_plus/rules.mk index 10772de547..c10c82105d 100644 --- a/keyboards/checkerboards/quark_plus/rules.mk +++ b/keyboards/checkerboards/quark_plus/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm # Valid driver values are pwm, software, custom or no RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable rotary encoder diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h index d9b5194a0b..92f1cd72e8 100644 --- a/keyboards/checkerboards/snop60/config.h +++ b/keyboards/checkerboards/snop60/config.h @@ -25,11 +25,6 @@ Copyright 2022 Nathan Spears /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Switch LED Backlighting */ -#define BACKLIGHT_PIN D1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING - // ws2812 options #define RGB_DI_PIN B1 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json index 8866a2728e..b3e9645465 100644 --- a/keyboards/checkerboards/snop60/info.json +++ b/keyboards/checkerboards/snop60/info.json @@ -8,6 +8,11 @@ "pid": "0x2416", "device_version": "0.0.1" }, + "backlight": { + "pin": "D1", + "levels": 6, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/checkerboards/snop60/rules.mk b/keyboards/checkerboards/snop60/rules.mk index 851dd43d3b..d24c9861b4 100644 --- a/keyboards/checkerboards/snop60/rules.mk +++ b/keyboards/checkerboards/snop60/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm # Valid driver values are pwm, software, custom or no RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENBALE = yes # Enable Rotary Encoders diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h index e587304caf..f78600ed04 100644 --- a/keyboards/cherrybstudio/cb87/config.h +++ b/keyboards/cherrybstudio/cb87/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json index 3af7eff96d..09a4fe132a 100644 --- a/keyboards/cherrybstudio/cb87/info.json +++ b/keyboards/cherrybstudio/cb87/info.json @@ -8,6 +8,9 @@ "pid": "0x8787", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "F0", "scroll_lock": "F4", diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h index a221188ccb..55b8bc4bee 100644 --- a/keyboards/cherrybstudio/cb87v2/config.h +++ b/keyboards/cherrybstudio/cb87v2/config.h @@ -31,8 +31,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 3cb29e13d0..45aea95248 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -8,6 +8,9 @@ "pid": "0x8788", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "F0", "scroll_lock": "F4", diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h index f298022e35..b847eb42d7 100644 --- a/keyboards/ck60i/config.h +++ b/keyboards/ck60i/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B9 , C13, A3 , B14, A8} #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json index 87b22f29eb..5ebf94953e 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/info.json @@ -8,6 +8,11 @@ "pid": "0x6049", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/ck60i/rules.mk b/keyboards/ck60i/rules.mk index 2e8924f3c3..e505cf44b4 100644 --- a/keyboards/ck60i/rules.mk +++ b/keyboards/ck60i/rules.mk @@ -9,7 +9,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BACKLIGHT_DRIVER = pwm ENCODER_ENABLE = yes # Enter lower-power sleep mode when on the ChibiOS idle thread diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h index b031888d4a..1bc6def7fd 100644 --- a/keyboards/ckeys/obelus/config.h +++ b/keyboards/ckeys/obelus/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ckeys/obelus/info.json b/keyboards/ckeys/obelus/info.json index 36d31c14bd..9697e3a9dd 100644 --- a/keyboards/ckeys/obelus/info.json +++ b/keyboards/ckeys/obelus/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h index 0ee05a5dbf..0461020f09 100644 --- a/keyboards/ckeys/washington/config.h +++ b/keyboards/ckeys/washington/config.h @@ -35,9 +35,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { D4 } #define ENCODERS_PAD_B { C6 } -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json index 6c364dff1c..59e427a0b0 100644 --- a/keyboards/ckeys/washington/info.json +++ b/keyboards/ckeys/washington/info.json @@ -8,6 +8,10 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json index 33b888b059..a8e933d028 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/info.json @@ -46,6 +46,9 @@ "pid": "0x2312", "vid": "0xC1ED" }, + "backlight": { + "driver": "custom" + }, "layout_aliases": { "LAYOUT": "LAYOUT_numpad_5x4" }, diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk index d2e52d56b5..e69de29bb2 100644 --- a/keyboards/clueboard/17/rules.mk +++ b/keyboards/clueboard/17/rules.mk @@ -1,2 +0,0 @@ -# Build Options -BACKLIGHT_DRIVER = custom diff --git a/keyboards/clueboard/60/config.h b/keyboards/clueboard/60/config.h deleted file mode 100644 index c675044b37..0000000000 --- a/keyboards/clueboard/60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2017 skully - * - * 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 2 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 . - */ - -#pragma once - - -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 1 diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json index 16f94644c9..d89253fa3e 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/info.json @@ -29,6 +29,9 @@ "pid": "0x2350", "vid": "0xC1ED" }, + "backlight": { + "levels": 1 + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso"], "layout_aliases": { "LAYOUT": "LAYOUT_all" diff --git a/keyboards/clueboard/66/rev2/config.h b/keyboards/clueboard/66/rev2/config.h index 192275f9f3..88d5112c8c 100644 --- a/keyboards/clueboard/66/rev2/config.h +++ b/keyboards/clueboard/66/rev2/config.h @@ -1,10 +1,5 @@ #pragma once - -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 1 - /* Underlight configuration */ #define RGBLIGHT_EFFECT_BREATHE_CENTER 1 diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json index 2a9948f5b4..5945c2c833 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/info.json @@ -50,6 +50,10 @@ "pid": "0x2320", "vid": "0xC1ED" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "community_layouts": ["66_ansi", "66_iso"], "layout_aliases": { "LAYOUT": "LAYOUT_all" diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk index d2e52d56b5..e69de29bb2 100644 --- a/keyboards/clueboard/66/rev2/rules.mk +++ b/keyboards/clueboard/66/rev2/rules.mk @@ -1,2 +0,0 @@ -# Build Options -BACKLIGHT_DRIVER = custom diff --git a/keyboards/clueboard/66/rev3/config.h b/keyboards/clueboard/66/rev3/config.h index f84eb9da3e..eb584f096f 100644 --- a/keyboards/clueboard/66/rev3/config.h +++ b/keyboards/clueboard/66/rev3/config.h @@ -1,10 +1,5 @@ #pragma once - -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 1 - #define RGBLIGHT_EFFECT_BREATHE_CENTER 1 #define RGBLIGHT_EFFECT_BREATHE_MAX 200 #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 666*2 diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json index 7e99d16fcb..4c0569622c 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/info.json @@ -50,6 +50,10 @@ "pid": "0x2370", "vid": "0xC1ED" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "community_layouts": ["66_ansi", "66_iso"], "layout_aliases": { "LAYOUT": "LAYOUT_all" diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk index 924437d89b..e69de29bb2 100644 --- a/keyboards/clueboard/66/rev3/rules.mk +++ b/keyboards/clueboard/66/rev3/rules.mk @@ -1 +0,0 @@ -BACKLIGHT_DRIVER = custom diff --git a/keyboards/clueboard/66_hotswap/prototype/config.h b/keyboards/clueboard/66_hotswap/prototype/config.h index 84869fb48b..651037af12 100644 --- a/keyboards/clueboard/66_hotswap/prototype/config.h +++ b/keyboards/clueboard/66_hotswap/prototype/config.h @@ -10,10 +10,6 @@ */ #define NO_ACTION_TAPPING -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 1 - /* Underlight configuration */ #define RGBLIGHT_EFFECT_BREATHE_CENTER 1 diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json index c1b14be644..522eda3fba 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/info.json @@ -50,6 +50,10 @@ "pid": "0x2390", "vid": "0xC1ED" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "community_layouts": ["66_ansi"], "layout_aliases": { "LAYOUT": "LAYOUT_all" diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk index 8193682fd3..4da205a168 100644 --- a/keyboards/clueboard/66_hotswap/prototype/rules.mk +++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk @@ -1,3 +1 @@ -BACKLIGHT_DRIVER = custom - LTO_ENABLE = yes diff --git a/keyboards/clueboard/card/config.h b/keyboards/clueboard/card/config.h index 6eba3c1061..6bf5d24045 100644 --- a/keyboards/clueboard/card/config.h +++ b/keyboards/clueboard/card/config.h @@ -17,8 +17,5 @@ along with this program. If not, see . #pragma once - -#define BACKLIGHT_LEVELS 6 - // Enable audio #define AUDIO_PIN C6 diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json index 739d253971..4564768c19 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/info.json @@ -37,6 +37,10 @@ "pid": "0x2330", "vid": "0xC1ED" }, + "backlight": { + "driver": "custom", + "levels": 6 + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk index d2e52d56b5..e69de29bb2 100644 --- a/keyboards/clueboard/card/rules.mk +++ b/keyboards/clueboard/card/rules.mk @@ -1,2 +0,0 @@ -# Build Options -BACKLIGHT_DRIVER = custom diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h index ff96ef5a2a..e251f6f90d 100644 --- a/keyboards/coarse/cordillera/config.h +++ b/keyboards/coarse/cordillera/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json index 3d968ab84d..9d84f0dee3 100644 --- a/keyboards/coarse/cordillera/info.json +++ b/keyboards/coarse/cordillera/info.json @@ -8,6 +8,11 @@ "pid": "0x1401", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "A1", "num_lock": "B0", diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h index 504b47701c..2f30b0bb1c 100755 --- a/keyboards/copenhagen_click/click_pad_v1/config.h +++ b/keyboards/copenhagen_click/click_pad_v1/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json index 757a404d1e..f6abac2e6a 100755 --- a/keyboards/copenhagen_click/click_pad_v1/info.json +++ b/keyboards/copenhagen_click/click_pad_v1/info.json @@ -8,6 +8,10 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/custommk/evo70/config.h b/keyboards/custommk/evo70/config.h index 9f27a458b7..d73f5b1823 100644 --- a/keyboards/custommk/evo70/config.h +++ b/keyboards/custommk/evo70/config.h @@ -19,10 +19,6 @@ #define OLED_UPDATE_INTERVAL 33 -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 17 -#define BACKLIGHT_BREATHING - #define OLED_DISABLE_TIMEOUT #define ENCODERS_PAD_A { C7 } diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index e5d2327518..824edd4277 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -10,7 +10,10 @@ "device_version": "0.0.1" }, "backlight": { - "on_state": 0 + "pin": "B5", + "levels": 17, + "on_state": 0, + "breathing": true }, "processor": "atmega32u4", "bootloader": "qmk-dfu", diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h index 5aaca2af88..5b9aea0a99 100644 --- a/keyboards/cx60/config.h +++ b/keyboards/cx60/config.h @@ -21,12 +21,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F1, F4, F5, F6, E6 } #define MATRIX_COL_PINS { C7, C6, F7, F0, B4, D7, D6, B0, B1, B2, B3, D2, D3, D5 } -/* Backlight Setup */ -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json index e2569465df..c859379563 100644 --- a/keyboards/cx60/info.json +++ b/keyboards/cx60/info.json @@ -8,6 +8,10 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "indicators": { "caps_lock": "B5", "on_state": 0 diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h index 33a06d8a8f..dcf7368b38 100644 --- a/keyboards/db/db63/config.h +++ b/keyboards/db/db63/config.h @@ -33,5 +33,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json index 96693bfb9e..9518ef5a42 100644 --- a/keyboards/db/db63/info.json +++ b/keyboards/db/db63/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index 7aab2373c6..8193eae02f 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -20,9 +20,6 @@ #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 31 diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index dcf209a6d0..abf18685b2 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,10 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk index 0473525d1e..42a6d2bd1b 100644 --- a/keyboards/deng/djam/rules.mk +++ b/keyboards/deng/djam/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index a3462809c1..e80b0d97a4 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -21,12 +21,6 @@ #define MATRIX_COL_PINS { B13, B14, B3, A4, A6 } #define DIODE_DIRECTION COL2ROW -/* Backlight */ -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_PIN B11 -#define BACKLIGHT_LEVELS 5 -#endif - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN B12 diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index d17b1d41dd..0fda78c76d 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.1" }, "backlight": { + "driver": "software", + "pin": "B11", + "levels": 5, "on_state": 0 }, "processor": "STM32F103", diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk index 90bd050f7c..91837f3d45 100644 --- a/keyboards/deng/thirty/rules.mk +++ b/keyboards/deng/thirty/rules.mk @@ -12,7 +12,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = software RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h index de8ef988e4..969d620d93 100644 --- a/keyboards/do60/config.h +++ b/keyboards/do60/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, F4, B4, D7, D6, B3, B0 } -/* Backlight Setup */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json index 1f866dcc1b..86d02df61e 100644 --- a/keyboards/do60/info.json +++ b/keyboards/do60/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 6 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h index 3efc985bc7..d5bf7a17cb 100644 --- a/keyboards/donutcables/budget96/config.h +++ b/keyboards/donutcables/budget96/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json index 13d8e8f831..a8dd3fc32a 100644 --- a/keyboards/donutcables/budget96/info.json +++ b/keyboards/donutcables/budget96/info.json @@ -8,6 +8,9 @@ "pid": "0xB960", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0" diff --git a/keyboards/doro67/multi/config.h b/keyboards/doro67/multi/config.h index e89198ead0..b91f26f044 100644 --- a/keyboards/doro67/multi/config.h +++ b/keyboards/doro67/multi/config.h @@ -15,6 +15,3 @@ #define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json index 12fb141666..b92267d5d9 100644 --- a/keyboards/doro67/multi/info.json +++ b/keyboards/doro67/multi/info.json @@ -8,6 +8,10 @@ "pid": "0x4D4C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 7 + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h index a31aeafdff..aa0f99f104 100644 --- a/keyboards/dtisaac/dtisaac01/config.h +++ b/keyboards/dtisaac/dtisaac01/config.h @@ -33,6 +33,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index 4e06790399..bbbc5ede5d 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -8,6 +8,10 @@ "pid": "0x4973", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "D3", "scroll_lock": "D5", diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json index 614e75c4c9..24821c46e1 100644 --- a/keyboards/duck/eagle_viper/v2/info.json +++ b/keyboards/duck/eagle_viper/v2/info.json @@ -6,6 +6,9 @@ "pid": "0x4556", "device_version": "0.0.2" }, + "backlight": { + "driver": "custom" + }, "bootmagic": { "matrix": [4, 10] }, diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk index ffea1dd731..a2b82ea590 100644 --- a/keyboards/duck/eagle_viper/v2/rules.mk +++ b/keyboards/duck/eagle_viper/v2/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h index 874997ab56..22a5b17901 100644 --- a/keyboards/duck/jetfire/config.h +++ b/keyboards/duck/jetfire/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 1 - #define RGB_DI_PIN D6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json index 3fc7b030ed..50118f3c8e 100644 --- a/keyboards/duck/jetfire/info.json +++ b/keyboards/duck/jetfire/info.json @@ -8,6 +8,10 @@ "pid": "0x4A46", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "bootmagic": { "matrix": [5, 10] }, diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk index bfbd2aa6d7..2689836623 100644 --- a/keyboards/duck/jetfire/rules.mk +++ b/keyboards/duck/jetfire/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h index 1fa9980c8c..6fcad40634 100644 --- a/keyboards/duck/lightsaver/config.h +++ b/keyboards/duck/lightsaver/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 1 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index 3f434820be..b24ac43b0d 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -8,6 +8,10 @@ "pid": "0x4C53", "device_version": "0.0.3" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "bootmagic": { "matrix": [5, 10] }, diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk index 044fb77f5a..2014cb4611 100644 --- a/keyboards/duck/lightsaver/rules.mk +++ b/keyboards/duck/lightsaver/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h index c19aa1f22d..a11234e6b3 100644 --- a/keyboards/duck/octagon/v1/config.h +++ b/keyboards/duck/octagon/v1/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 1 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index 8eaf8fb0d9..f30d533062 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -8,6 +8,10 @@ "pid": "0x4F31", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "bootmagic": { "matrix": [5, 10] }, diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk index 8d7b854ec0..5d79f0af09 100644 --- a/keyboards/duck/octagon/v1/rules.mk +++ b/keyboards/duck/octagon/v1/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h index d1f2971077..7fca9239be 100644 --- a/keyboards/duck/octagon/v2/config.h +++ b/keyboards/duck/octagon/v2/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 1 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index 220196e9fc..90b7489737 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -8,6 +8,10 @@ "pid": "0x4F32", "device_version": "0.0.2" }, + "backlight": { + "driver": "custom", + "levels": 1 + }, "bootmagic": { "matrix": [5, 10] }, diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk index dc181b289d..5e50c2ff8e 100644 --- a/keyboards/duck/octagon/v2/rules.mk +++ b/keyboards/duck/octagon/v2/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h index 6dde204a3b..eda7aec4ec 100644 --- a/keyboards/duck/orion/v3/config.h +++ b/keyboards/duck/orion/v3/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 10 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 7c4c34281c..137c731242 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -9,7 +9,9 @@ "device_version": "0.0.2" }, "backlight": { - "pins": ["B1", "B2", "B3", "E6"] + "driver": "custom", + "pins": ["B1", "B2", "B3", "E6"], + "levels": 10 }, "bootmagic": { "matrix": [4, 10] diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk index d29d166083..49bc32f39b 100644 --- a/keyboards/duck/orion/v3/rules.mk +++ b/keyboards/duck/orion/v3/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h index 06fea4a957..fdac282e3b 100644 --- a/keyboards/dz60/config.h +++ b/keyboards/dz60/config.h @@ -17,9 +17,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json index 31df22895b..37ba71fcdf 100644 --- a/keyboards/dz60/info.json +++ b/keyboards/dz60/info.json @@ -8,6 +8,10 @@ "pid": "0x2260", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index 1f6a6d295c..e93336086c 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -32,9 +32,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 638df11bdb..87073419ab 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -8,6 +8,10 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h index 55b8d12b08..b22fdf5013 100644 --- a/keyboards/dztech/dz96/config.h +++ b/keyboards/dztech/dz96/config.h @@ -23,6 +23,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json index acfe51859e..1119a8f2ab 100644 --- a/keyboards/dztech/dz96/info.json +++ b/keyboards/dztech/dz96/info.json @@ -8,6 +8,10 @@ "pid": "0xDB96", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "num_lock": "B0", diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h index 42cbedbd01..4aa733a06a 100644 --- a/keyboards/ebastler/isometria_75/rev1/config.h +++ b/keyboards/ebastler/isometria_75/rev1/config.h @@ -25,12 +25,9 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW /* Backlight */ -#define BACKLIGHT_PIN A9 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 5 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. /* Underglow */ diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json index 37898f4846..a2a8c4e1d5 100644 --- a/keyboards/ebastler/isometria_75/rev1/info.json +++ b/keyboards/ebastler/isometria_75/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "backlight": { + "pin": "A9", + "levels": 5, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h index 9552da2f6e..437059ef0a 100644 --- a/keyboards/efreet/config.h +++ b/keyboards/efreet/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D0 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json index 4a62e67421..8a971a9c71 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "D0", + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/era/era65/rules.mk b/keyboards/era/era65/rules.mk index 2b03e47e93..e69de29bb2 100644 --- a/keyboards/era/era65/rules.mk +++ b/keyboards/era/era65/rules.mk @@ -1 +0,0 @@ -BACKLIGHT_DRIVER = pwm \ No newline at end of file diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h index e889857165..a24148772b 100644 --- a/keyboards/ergotravel/rev1/config.h +++ b/keyboards/ergotravel/rev1/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h index f5d2d78e87..7ccb9b93df 100644 --- a/keyboards/eve/meteor/config.h +++ b/keyboards/eve/meteor/config.h @@ -23,5 +23,3 @@ along with this program. If not, see . #define MATRIX_COL_PINS { C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0, D7} #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json index ec37d1403e..eff9b8bc4f 100644 --- a/keyboards/eve/meteor/info.json +++ b/keyboards/eve/meteor/info.json @@ -8,6 +8,9 @@ "pid": "0x4D54", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h index 2242ca4176..f4a0747037 100644 --- a/keyboards/evil80/config.h +++ b/keyboards/evil80/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/evil80/info.json b/keyboards/evil80/info.json index 1d11e37ae6..1240ab5d4b 100644 --- a/keyboards/evil80/info.json +++ b/keyboards/evil80/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "indicators": { "caps_lock": "B6", "scroll_lock": "B7" diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h index b057bbdae6..1098e61379 100644 --- a/keyboards/evyd13/atom47/rev2/config.h +++ b/keyboards/evyd13/atom47/rev2/config.h @@ -32,11 +32,5 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - #define RGB_DI_PIN D0 // The pin the LED strip is connected to #define RGBLED_NUM 1 // Number of LEDs in your strip diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 660d92a9a2..9a7ac37f30 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x8E66", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4, + "breathing": true + }, "qmk_lufa_bootloader": { "esc_input": "B7", "esc_output": "D7", diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h index f7cdbe79ba..5cee6379ff 100644 --- a/keyboards/evyd13/atom47/rev3/config.h +++ b/keyboards/evyd13/atom47/rev3/config.h @@ -27,12 +27,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Backlight configuration - */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN F5 // The pin the LED strip is connected to #define RGBLED_NUM 6 // Number of LEDs in your strip #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index a6bcc95458..644a095eca 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x0E6D", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true + }, "qmk_lufa_bootloader": { "esc_input": "B0", "esc_output": "B7", diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h index 98acf00d75..085965b814 100644 --- a/keyboards/evyd13/wasdat_code/config.h +++ b/keyboards/evyd13/wasdat_code/config.h @@ -38,10 +38,6 @@ along with this program. If not, see . #define SN74X138_ADDRESS_PINS { D2, D1, D0 } #define SN74X138_E3_PIN D4 -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json index 94ab350e9c..ab15586484 100644 --- a/keyboards/evyd13/wasdat_code/info.json +++ b/keyboards/evyd13/wasdat_code/info.json @@ -8,6 +8,11 @@ "pid": "0xB00E", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "qmk_lufa_bootloader": { "esc_input": "F0", "esc_output": "E6", diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h index 7ef569f8c2..ef92b06249 100644 --- a/keyboards/exclusive/e65/config.h +++ b/keyboards/exclusive/e65/config.h @@ -26,11 +26,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 6 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json index cee3259107..436faa5f3d 100644 --- a/keyboards/exclusive/e65/info.json +++ b/keyboards/exclusive/e65/info.json @@ -8,6 +8,10 @@ "pid": "0xE605", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 6 + }, "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h index c560e06a75..65bd782b7e 100644 --- a/keyboards/exclusive/e6v2/le/config.h +++ b/keyboards/exclusive/e6v2/le/config.h @@ -40,10 +40,4 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 12 #endif -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 2 -#define BACKLIGHT_BREAHTING -#endif - #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json index ac3a613736..10ad0c9383 100644 --- a/keyboards/exclusive/e6v2/le/info.json +++ b/keyboards/exclusive/e6v2/le/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.2" }, "backlight": { + "pin": "B6", + "levels": 2, + "breathing": true, "breathing_period": 3 }, "indicators": { diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h index 29588aefe9..c9d14bff4d 100644 --- a/keyboards/exclusive/e6v2/le_bmc/config.h +++ b/keyboards/exclusive/e6v2/le_bmc/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json index 5b34e2f413..51afd7c5ad 100644 --- a/keyboards/exclusive/e6v2/le_bmc/info.json +++ b/keyboards/exclusive/e6v2/le_bmc/info.json @@ -7,6 +7,9 @@ "pid": "0xE62D", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h index b43acd5a93..88ec4faa04 100644 --- a/keyboards/exclusive/e6v2/oe/config.h +++ b/keyboards/exclusive/e6v2/oe/config.h @@ -40,10 +40,4 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 12 #endif -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_BREAHTING -#endif - #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json index 70e57d3678..bfa408c556 100644 --- a/keyboards/exclusive/e6v2/oe/info.json +++ b/keyboards/exclusive/e6v2/oe/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.2" }, "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true, "breathing_period": 3 }, "processor": "atmega32u4", diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h index 29588aefe9..c9d14bff4d 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/config.h +++ b/keyboards/exclusive/e6v2/oe_bmc/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json index c5719f48fd..6716f99c98 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/info.json +++ b/keyboards/exclusive/e6v2/oe_bmc/info.json @@ -7,6 +7,9 @@ "pid": "0xE62B", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h index ba94a214a3..46944506a1 100644 --- a/keyboards/exclusive/e7v1/config.h +++ b/keyboards/exclusive/e7v1/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 6 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json index 88a7563b47..d014e6d47c 100644 --- a/keyboards/exclusive/e7v1/info.json +++ b/keyboards/exclusive/e7v1/info.json @@ -8,6 +8,10 @@ "pid": "0xE701", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 6 + }, "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h index 0d83c02c6f..3da5cb8935 100644 --- a/keyboards/exclusive/e7v1se/config.h +++ b/keyboards/exclusive/e7v1se/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index 92acc0c8b3..9994741f24 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/info.json @@ -8,6 +8,10 @@ "pid": "0x7051", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h index 651b210fd6..8d01fe2faf 100644 --- a/keyboards/exclusive/e85/config.h +++ b/keyboards/exclusive/e85/config.h @@ -36,10 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 18 diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json index cd1d07fed5..0065b2b84c 100644 --- a/keyboards/exclusive/e85/hotswap/info.json +++ b/keyboards/exclusive/e85/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xE851", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json index 1ba7d22f73..cda9f689cd 100644 --- a/keyboards/exclusive/e85/soldered/info.json +++ b/keyboards/exclusive/e85/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0xE852", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h index 04b5306333..24941ea169 100644 --- a/keyboards/exent/config.h +++ b/keyboards/exent/config.h @@ -33,8 +33,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/exent/info.json b/keyboards/exent/info.json index 985da4fbc4..9aa80a4a11 100644 --- a/keyboards/exent/info.json +++ b/keyboards/exent/info.json @@ -8,6 +8,9 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h index 8af881e53b..6da702919e 100644 --- a/keyboards/eyeohdesigns/babyv/config.h +++ b/keyboards/eyeohdesigns/babyv/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN B7 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json index 59e7142adb..2a55943c78 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h index 264c8a552c..768b1b3551 100644 --- a/keyboards/facew/config.h +++ b/keyboards/facew/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/facew/info.json b/keyboards/facew/info.json index 28813e660c..6dcc9cb14d 100644 --- a/keyboards/facew/info.json +++ b/keyboards/facew/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0" diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h index 9ffcbc9422..f0c8fe016a 100644 --- a/keyboards/flx/virgo/config.h +++ b/keyboards/flx/virgo/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 0 diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json index c65f9c7c62..3464c98976 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/info.json @@ -8,6 +8,10 @@ "pid": "0x5647", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h index b698d527e6..8bd73e135e 100644 --- a/keyboards/fortitude60/rev1/config.h +++ b/keyboards/fortitude60/rev1/config.h @@ -30,11 +30,6 @@ along with this program. If not, see . #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 500 -#ifdef BACKLIGHT_ENABLE - #define BACKLIGHT_PIN B5 - #define BACKLIGHT_LEVELS 9 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json index 295eee95bd..e2aa377324 100644 --- a/keyboards/fortitude60/rev1/info.json +++ b/keyboards/fortitude60/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x1156", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5", + "levels": 9 + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h index 8a1462ac3b..1b8e4a8fd0 100644 --- a/keyboards/foxlab/key65/hotswap/config.h +++ b/keyboards/foxlab/key65/hotswap/config.h @@ -33,9 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json index 59e75d4538..712897a7f3 100644 --- a/keyboards/foxlab/key65/hotswap/info.json +++ b/keyboards/foxlab/key65/hotswap/info.json @@ -8,6 +8,10 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "indicators": { "scroll_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h index 8a465f7567..159e0cff79 100644 --- a/keyboards/foxlab/key65/universal/config.h +++ b/keyboards/foxlab/key65/universal/config.h @@ -33,9 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json index 1f19916693..a886275ff5 100644 --- a/keyboards/foxlab/key65/universal/info.json +++ b/keyboards/foxlab/key65/universal/info.json @@ -8,6 +8,10 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "indicators": { "scroll_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h index 72a597c85d..ee55e167d6 100644 --- a/keyboards/foxlab/leaf60/hotswap/config.h +++ b/keyboards/foxlab/leaf60/hotswap/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json index 0425a64bfb..43f287ebca 100644 --- a/keyboards/foxlab/leaf60/hotswap/info.json +++ b/keyboards/foxlab/leaf60/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 4, + "breathing": true + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h index 67d4a4dae6..d856375a5d 100644 --- a/keyboards/foxlab/leaf60/universal/config.h +++ b/keyboards/foxlab/leaf60/universal/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json index d1abab386d..c782a6e50f 100644 --- a/keyboards/foxlab/leaf60/universal/info.json +++ b/keyboards/foxlab/leaf60/universal/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h index f6788c28bc..4c41ecf073 100644 --- a/keyboards/foxlab/time80/config.h +++ b/keyboards/foxlab/time80/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 16 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json index 7b8d4603c6..f59a287de2 100644 --- a/keyboards/foxlab/time80/info.json +++ b/keyboards/foxlab/time80/info.json @@ -8,6 +8,9 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h index 357f5accaf..9a8820cfd9 100644 --- a/keyboards/foxlab/time_re/hotswap/config.h +++ b/keyboards/foxlab/time_re/hotswap/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json index 35eeafd2e9..e955aaf4da 100644 --- a/keyboards/foxlab/time_re/hotswap/info.json +++ b/keyboards/foxlab/time_re/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h index 357f5accaf..9a8820cfd9 100644 --- a/keyboards/foxlab/time_re/universal/config.h +++ b/keyboards/foxlab/time_re/universal/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json index 35eeafd2e9..e955aaf4da 100644 --- a/keyboards/foxlab/time_re/universal/info.json +++ b/keyboards/foxlab/time_re/universal/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h index 916b7bbbf7..53f33428df 100644 --- a/keyboards/ft/mars65/config.h +++ b/keyboards/ft/mars65/config.h @@ -19,8 +19,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 24 diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json index c8ce0864cc..1d1dd840d9 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/info.json @@ -8,6 +8,9 @@ "pid": "0x422F", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h index 3b84e918ce..727718e396 100644 --- a/keyboards/ft/mars80/config.h +++ b/keyboards/ft/mars80/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index 1ad63c0aaa..ff451d8bcf 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/geonworks/frogmini/fms/config.h b/keyboards/geonworks/frogmini/fms/config.h index 04850ba9e8..ad9c202933 100644 --- a/keyboards/geonworks/frogmini/fms/config.h +++ b/keyboards/geonworks/frogmini/fms/config.h @@ -25,11 +25,9 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A10 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 20 #define I2C_DRIVER I2CD1 #define I2C_SCL_PIN B6 diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/info.json index 1442ceb8b4..9e51f9226f 100644 --- a/keyboards/geonworks/frogmini/fms/info.json +++ b/keyboards/geonworks/frogmini/fms/info.json @@ -8,6 +8,10 @@ "pid": "0x2D33", "device_version": "0.0.1" }, + "backlight": { + "pin": "A10", + "levels": 20 + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/geonworks/frogmini/fms/rules.mk b/keyboards/geonworks/frogmini/fms/rules.mk index 82ca995e25..d847becc1a 100644 --- a/keyboards/geonworks/frogmini/fms/rules.mk +++ b/keyboards/geonworks/frogmini/fms/rules.mk @@ -13,7 +13,6 @@ LTO_ENABLE = no ENCODER_ENABLE = no BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm EEPROM_DRIVER = i2c diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index ed2951e789..ce76bc8233 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } -#define BACKLIGHT_PIN B6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -33,10 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 4 - /* Underglow configuration */ #define RGB_DI_PIN E2 diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 3a64d5a6ff..88a09cb3f6 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h index ef67180b74..a7d7231e25 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 15 - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json index 052446ea42..4806535fd0 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 15 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_hhkb", "64_ansi"], diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h index bcce53200f..c3762c6388 100644 --- a/keyboards/gon/nerd60/config.h +++ b/keyboards/gon/nerd60/config.h @@ -1,9 +1,5 @@ #pragma once - -/* backlight */ -#define BACKLIGHT_PIN B7 - /* matrix pins */ #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 } diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 1bd845764e..097d4d45c0 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -8,6 +8,9 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "bootmagic": { "matrix": [8, 0] }, diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h index 29bbb513a6..8db20474be 100644 --- a/keyboards/gon/nerdtkl/config.h +++ b/keyboards/gon/nerdtkl/config.h @@ -1,9 +1,5 @@ #pragma once - -/* backlight */ -#define BACKLIGHT_PIN B7 - /* matrix pins */ #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 } #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 } diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index 2381b25d7c..f9e38f0c89 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -8,6 +8,9 @@ "pid": "0x5244", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "bootmagic": { "matrix": [8, 0] }, diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h index 6bb36a7bff..64b58911e3 100644 --- a/keyboards/gray_studio/cod67/config.h +++ b/keyboards/gray_studio/cod67/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* D4 is not a PWM pin, but look at timer assisted software PWM if you want something other than toggle - * https://docs.qmk.fm/#/feature_backlight?id=timer-assisted-pwm-implementation - */ -#define BACKLIGHT_PIN D4 - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index d9d50c9d27..2f8a81d08e 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "D4", "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h index 200728d68f..20dbdb3f50 100644 --- a/keyboards/gray_studio/hb85/config.h +++ b/keyboards/gray_studio/hb85/config.h @@ -32,5 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index 84ce359d80..a8b7641a0b 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -8,6 +8,9 @@ "pid": "0x2000", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h index f8b8370b2b..17a91e8e47 100644 --- a/keyboards/gray_studio/space65/config.h +++ b/keyboards/gray_studio/space65/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index 42af34add6..0689443af5 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json @@ -8,6 +8,11 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h index 886b616c35..e847297296 100644 --- a/keyboards/handwired/aek64/config.h +++ b/keyboards/handwired/aek64/config.h @@ -32,7 +32,3 @@ along with this program. If not, see . /* Enable double tab */ #define TAPPING_TERM 175 - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json index 42349632e2..471208ca41 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h index 9506696646..6861311460 100644 --- a/keyboards/handwired/arrow_pad/config.h +++ b/keyboards/handwired/arrow_pad/config.h @@ -31,8 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } #define MATRIX_COL_PINS { B0, B1, B2, B3 } -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index 9adac5b74d..8451637df5 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/info.json @@ -8,6 +8,9 @@ "pid": "0x4096", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/bdn9_ble/config.h b/keyboards/handwired/bdn9_ble/config.h index 2dc8bb5327..3ed1c2ed30 100644 --- a/keyboards/handwired/bdn9_ble/config.h +++ b/keyboards/handwired/bdn9_ble/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define BACKLIGHT_PIN F6 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index 303e26ba05..4e218e1dd8 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -8,6 +8,10 @@ "pid": "0x1134", "device_version": "1.0.0" }, + "backlight": { + "pin": "F6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h index 578d13a472..d881fecbaa 100644 --- a/keyboards/handwired/chiron/config.h +++ b/keyboards/handwired/chiron/config.h @@ -34,7 +34,3 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 4 - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 - diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index 6cf49275a7..b1590d8ded 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 7 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h index 4d58091ef8..c42a0d5b0c 100644 --- a/keyboards/handwired/co60/rev1/config.h +++ b/keyboards/handwired/co60/rev1/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#ifdef __AVR__ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#endif - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/info.json index d48f322f87..05a7a3a336 100644 --- a/keyboards/handwired/co60/rev1/info.json +++ b/keyboards/handwired/co60/rev1/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "1.0.0" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h index aa7079f247..6f938b06b7 100644 --- a/keyboards/handwired/co60/rev6/config.h +++ b/keyboards/handwired/co60/rev6/config.h @@ -29,9 +29,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* Backlight configuration - * Backlight LEDs on B8 - */ -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING diff --git a/keyboards/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/info.json index 48bc08982b..a189309496 100644 --- a/keyboards/handwired/co60/rev6/info.json +++ b/keyboards/handwired/co60/rev6/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "6.0.0" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index 19ddb6be2c..6647698dfb 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -31,12 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - * Backlight LEDs on B8 - */ -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING - /* RGB underglow configuration */ #define WS2812_SPI SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json index 1c2c38f0fe..67d54fb0fb 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "7.0.0" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h index e5c60800af..2f3caa2b2f 100644 --- a/keyboards/handwired/hacked_motospeed/config.h +++ b/keyboards/handwired/hacked_motospeed/config.h @@ -38,8 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json index e0c8c42566..57b66e3bdf 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/info.json @@ -8,6 +8,9 @@ "pid": "0x0690", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h index 13367a2577..a942bd253d 100644 --- a/keyboards/handwired/hnah108/config.h +++ b/keyboards/handwired/hnah108/config.h @@ -37,10 +37,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { B2 } #define ENCODERS_PAD_B { B3 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 30 // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 257fcf279c..c9dcc020cc 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7", + "levels": 4, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h index 7f9a8c5ab6..4cb70762fb 100644 --- a/keyboards/handwired/jot50/config.h +++ b/keyboards/handwired/jot50/config.h @@ -5,10 +5,6 @@ #define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 } -/* leds */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json index db08eef195..1bcf932946 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h index 7e54b2636f..66b0bf2b75 100644 --- a/keyboards/handwired/nozbe_macro/config.h +++ b/keyboards/handwired/nozbe_macro/config.h @@ -27,8 +27,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json index 27b088958b..162b3a6803 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h index 1544eb0e19..d374143192 100644 --- a/keyboards/handwired/pill60/config.h +++ b/keyboards/handwired/pill60/config.h @@ -18,11 +18,8 @@ #define DIODE_DIRECTION COL2ROW -/* Backlighting include */ -#define BACKLIGHT_PIN B14 #define BACKLIGHT_PWM_DRIVER PWMD5 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 5 /* Encoder */ #define ENCODERS_PAD_A \ diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index bc92cf7585..891196f87b 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -8,6 +8,11 @@ "pid": "0x5444", "device_version": "0.0.1" }, + "backlight": { + "driver": "software", + "pin": "B14", + "levels": 5 + }, "debounce": 1, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk index 57681a7cda..f8bae6b6df 100644 --- a/keyboards/handwired/pill60/rules.mk +++ b/keyboards/handwired/pill60/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = software RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output SLEEP_LED_ENABLE = yes diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h index b08731f0a2..c4d0c8a8a2 100644 --- a/keyboards/handwired/prime_exl/config.h +++ b/keyboards/handwired/prime_exl/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index d8949ec389..e1a3955d5d 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -8,6 +8,10 @@ "pid": "0x6578", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h index 886c1f7fc7..2cee851436 100644 --- a/keyboards/handwired/riblee_f401/config.h +++ b/keyboards/handwired/riblee_f401/config.h @@ -22,9 +22,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A0 -#define BACKLIGHT_LEVELS 5 - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 \ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index ec9c7631af..94cc2c35f2 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "backlight": { + "driver": "software", + "pin": "A0", + "levels": 5 + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401", diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk index 6f9a638f4b..4c2d255a18 100644 --- a/keyboards/handwired/riblee_f401/rules.mk +++ b/keyboards/handwired/riblee_f401/rules.mk @@ -9,6 +9,5 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = software RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index a953888dc8..b52e370419 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/config.h @@ -31,12 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - * Backlight LEDs on B8 - */ -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING - #define WS2812_SPI SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json index ddadbcb97c..ed10d8005b 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h index 21e3abe491..5782f0e058 100644 --- a/keyboards/handwired/tritium_numpad/config.h +++ b/keyboards/handwired/tritium_numpad/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 } #define MATRIX_COL_PINS { F4, F6, B1, B2 } -#define BACKLIGHT_PIN B6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -33,10 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 4 - /* Underlight configuration */ diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index 8dc967df96..b2ca85264e 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "num_lock": "D5", "on_state": 0 diff --git a/keyboards/heliar/wm1_hotswap/config.h b/keyboards/heliar/wm1_hotswap/config.h index e9ddfdcae8..410d9732ef 100644 --- a/keyboards/heliar/wm1_hotswap/config.h +++ b/keyboards/heliar/wm1_hotswap/config.h @@ -31,5 +31,3 @@ #define MATRIX_COL_PINS { D2, B0, B1, B2, D1, D0, C7, C6, B6, B5, B4, F4, F5, F6, F1 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 diff --git a/keyboards/heliar/wm1_hotswap/info.json b/keyboards/heliar/wm1_hotswap/info.json index c6dda77a58..361325953d 100644 --- a/keyboards/heliar/wm1_hotswap/info.json +++ b/keyboards/heliar/wm1_hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0xD070", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h index 13cc31550e..2fc1c25eb6 100644 --- a/keyboards/hineybush/h10/config.h +++ b/keyboards/hineybush/h10/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/hineybush/h10/info.json b/keyboards/hineybush/h10/info.json index d62ce90c6a..e59ba7f3e4 100644 --- a/keyboards/hineybush/h10/info.json +++ b/keyboards/hineybush/h10/info.json @@ -8,6 +8,10 @@ "pid": "0xEBD8", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4", "numpad_6x4"], diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h index 231ad9cbc3..ca8f344793 100644 --- a/keyboards/hineybush/h60/config.h +++ b/keyboards/hineybush/h60/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 12 - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json index e4c62971b2..eece82f5f2 100644 --- a/keyboards/hineybush/h60/info.json +++ b/keyboards/hineybush/h60/info.json @@ -8,6 +8,10 @@ "pid": "0xEBBE", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"], diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h index 33c411b32d..925f0498ca 100644 --- a/keyboards/hineybush/h65/config.h +++ b/keyboards/hineybush/h65/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN # define RGBLED_NUM 17 diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json index 7a6658bf89..e1bebb560c 100644 --- a/keyboards/hineybush/h65/info.json +++ b/keyboards/hineybush/h65/info.json @@ -8,6 +8,10 @@ "pid": "0xE9E4", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "E6" }, diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h index 33c411b32d..925f0498ca 100644 --- a/keyboards/hineybush/h65_hotswap/config.h +++ b/keyboards/hineybush/h65_hotswap/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN # define RGBLED_NUM 17 diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json index c69a6c1491..9eebb77345 100644 --- a/keyboards/hineybush/h65_hotswap/info.json +++ b/keyboards/hineybush/h65_hotswap/info.json @@ -8,6 +8,10 @@ "pid": "0xE8B7", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "E6" }, diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h index d96fbfe078..e8e84f1117 100644 --- a/keyboards/hineybush/h660s/config.h +++ b/keyboards/hineybush/h660s/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json index 880f31c923..d773651ee6 100644 --- a/keyboards/hineybush/h660s/info.json +++ b/keyboards/hineybush/h660s/info.json @@ -8,6 +8,10 @@ "pid": "0xEB1B", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h index 0bfcc3e935..55b920a2b9 100644 --- a/keyboards/hineybush/h75_singa/config.h +++ b/keyboards/hineybush/h75_singa/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json index 6ca317e720..94e8d256fd 100644 --- a/keyboards/hineybush/h75_singa/info.json +++ b/keyboards/hineybush/h75_singa/info.json @@ -8,6 +8,10 @@ "pid": "0xEC9A", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h index 217f69a296..f267f09020 100644 --- a/keyboards/hineybush/h87a/config.h +++ b/keyboards/hineybush/h87a/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json index c24e1082dc..db1fd91d13 100644 --- a/keyboards/hineybush/h87a/info.json +++ b/keyboards/hineybush/h87a/info.json @@ -8,6 +8,9 @@ "pid": "0xECE9", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h index 7d245ed294..9a75238cb3 100644 --- a/keyboards/hineybush/h88/config.h +++ b/keyboards/hineybush/h88/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json index c011d100ae..bd362c74b5 100644 --- a/keyboards/hineybush/h88/info.json +++ b/keyboards/hineybush/h88/info.json @@ -8,6 +8,9 @@ "pid": "0xECA2", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h index 6fbd5c2580..e0eed7f414 100644 --- a/keyboards/hineybush/hbcp/config.h +++ b/keyboards/hineybush/hbcp/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . //EITHERWAY is supported through a custom matrix //#define DIODE_DIRECTION EITHERWAY -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 27 diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json index 8e1b8bbbcc..0e31272ed4 100644 --- a/keyboards/hineybush/hbcp/info.json +++ b/keyboards/hineybush/hbcp/info.json @@ -8,6 +8,10 @@ "pid": "0xECE8", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h index 8c62417078..ee7b90de23 100644 --- a/keyboards/hineybush/physix/config.h +++ b/keyboards/hineybush/physix/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 26 diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json index 828e8fbb4f..b611de62e4 100644 --- a/keyboards/hineybush/physix/info.json +++ b/keyboards/hineybush/physix/info.json @@ -8,6 +8,10 @@ "pid": "0xEC81", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h index 9a2833ebe7..1903af4ff1 100644 --- a/keyboards/hnahkb/freyr/config.h +++ b/keyboards/hnahkb/freyr/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/hnahkb/freyr/info.json b/keyboards/hnahkb/freyr/info.json index 547aabaade..7c946bd78a 100644 --- a/keyboards/hnahkb/freyr/info.json +++ b/keyboards/hnahkb/freyr/info.json @@ -8,6 +8,10 @@ "pid": "0x1895", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "B3", "scroll_lock": "B7", diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h index 2a1ea8a0ff..34c3aafab4 100644 --- a/keyboards/hnahkb/stella/config.h +++ b/keyboards/hnahkb/stella/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLED_NUM 14 diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json index 59465e3be9..593dc47771 100644 --- a/keyboards/hnahkb/stella/info.json +++ b/keyboards/hnahkb/stella/info.json @@ -8,6 +8,10 @@ "pid": "0x0AB7", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "B3", "scroll_lock": "B7", diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h index 780ed729a3..6388d79320 100644 --- a/keyboards/hnahkb/vn66/config.h +++ b/keyboards/hnahkb/vn66/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 4 -#define BACKLIGHT_BREATHING - #define ENCODERS_PAD_A { B0 } #define ENCODERS_PAD_B { B7 } #define ENCODER_RESOLUTION 2 diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json index a85d29b644..6a3f12e65e 100644 --- a/keyboards/hnahkb/vn66/info.json +++ b/keyboards/hnahkb/vn66/info.json @@ -8,6 +8,11 @@ "pid": "0xCA2C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4, + "breathing": true + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h index f058f17f82..9e040808d2 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h +++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h @@ -27,12 +27,6 @@ /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO -#ifdef BACKLIGHT_ENABLE - /* Backlight config */ - #define BACKLIGHT_PIN B6 - #define BACKLIGHT_LEVELS 6 -#endif - #ifdef RGBLIGHT_ENABLE /* RGB Lighting config */ #define RGB_DI_PIN E2 diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json index c1927fc3d1..24fae0c08a 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json +++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json @@ -8,6 +8,10 @@ "pid": "0x7000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6 + }, "indicators": { "caps_lock": "C7" }, diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h index 284f7026e6..ee7b25cf6f 100644 --- a/keyboards/hotdox/config.h +++ b/keyboards/hotdox/config.h @@ -29,8 +29,6 @@ ) #endif -#define BACKLIGHT_PIN B7 - #define LED_BRIGHTNESS_LO 15 #define LED_BRIGHTNESS_HI 255 diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json index 8a67473fb8..2e2352b7ee 100644 --- a/keyboards/hotdox/info.json +++ b/keyboards/hotdox/info.json @@ -7,6 +7,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ergodox"], diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 8185c4f3ff..54f0fc0c7c 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index 16285f6819..a192072701 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -8,6 +8,10 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index 960dcbc9be..d3eb71dc92 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -48,11 +48,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#ifdef BACKLIGHT_ENABLE - #define BACKLIGHT_PIN B6 - #define BACKLIGHT_BREATHING -#endif - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index 0fd9def9de..89b64f3951 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -6,6 +6,10 @@ "vid": "0x6964", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 2d3348e4e7..2f4ebd7744 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index 6d96abf860..ca39654575 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -8,6 +8,9 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "C7" }, diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index ab5d7513db..7f48dc7752 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -26,12 +26,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN - #define BACKLIGHT_LEVELS 7 - #define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 2e09232dae..2046283d8e 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -8,6 +8,11 @@ "pid": "0x0096", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 7, + "breathing": true + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 314d812937..5c612855fb 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -24,8 +24,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index cd4ccc6256..725ddc0c4d 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h index 890452e54e..f7f6409149 100644 --- a/keyboards/illuminati/is0/config.h +++ b/keyboards/illuminati/is0/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json index 04964b0955..1d201e3535 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h index 7516f571e1..5e8abdf2e0 100644 --- a/keyboards/ilumkb/primus75/config.h +++ b/keyboards/ilumkb/primus75/config.h @@ -23,11 +23,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json index ac5f0280a1..9b665dda74 100644 --- a/keyboards/ilumkb/primus75/info.json +++ b/keyboards/ilumkb/primus75/info.json @@ -8,6 +8,10 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "num_lock": "E2", diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h index 4ca91111f1..c63b26264e 100644 --- a/keyboards/ilumkb/volcano660/config.h +++ b/keyboards/ilumkb/volcano660/config.h @@ -32,9 +32,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json index c6eb8bb5c5..9e5ec18b67 100644 --- a/keyboards/ilumkb/volcano660/info.json +++ b/keyboards/ilumkb/volcano660/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h index 2e57ae8470..b47b2ccf50 100644 --- a/keyboards/iron180/config.h +++ b/keyboards/iron180/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/iron180/info.json b/keyboards/iron180/info.json index 3092b2021f..3c7798508f 100644 --- a/keyboards/iron180/info.json +++ b/keyboards/iron180/info.json @@ -8,6 +8,11 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/iron180/rules.mk b/keyboards/iron180/rules.mk index 924e14bfe4..488d0df4b9 100644 --- a/keyboards/iron180/rules.mk +++ b/keyboards/iron180/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = no diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h index 0caaf513c3..47eac652c5 100644 --- a/keyboards/j80/config.h +++ b/keyboards/j80/config.h @@ -22,5 +22,3 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, A0 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json index a802143866..c57e9e3e2a 100644 --- a/keyboards/j80/info.json +++ b/keyboards/j80/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index 2d9015cc4c..0caf635045 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -20,12 +20,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* number of backlight levels */ -#define BACKLIGHT_PIN B6 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json index 82e7d33eb5..ed5768bf32 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -10,6 +10,9 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index 43200ec5d5..147dc2ade4 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -10,6 +10,9 @@ "pid": "0x0428", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index edfc458a2a..1a6e9cea9e 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -33,9 +33,6 @@ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 15 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index 0b63a48b6a..639b5a3897 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -8,6 +8,10 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6", + "levels": 15 + }, "bootmagic": { "matrix": [0, 15] }, diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h index 34acf79062..8afbaabca0 100644 --- a/keyboards/jae/j01/config.h +++ b/keyboards/jae/j01/config.h @@ -35,10 +35,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json index 1f2b843d6f..6f0b5d485d 100644 --- a/keyboards/jae/j01/info.json +++ b/keyboards/jae/j01/info.json @@ -8,6 +8,11 @@ "pid": "0x0143", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 4, + "breathing": true + }, "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h index 4d27750629..62501a05d1 100644 --- a/keyboards/jc65/v32a/config.h +++ b/keyboards/jc65/v32a/config.h @@ -22,8 +22,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json index b03bb73a6e..b9693c8e72 100644 --- a/keyboards/jc65/v32a/info.json +++ b/keyboards/jc65/v32a/info.json @@ -8,6 +8,9 @@ "pid": "0x5679", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h index f7a182895a..eca08d7d92 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -40,6 +40,4 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #endif -#define BACKLIGHT_PIN B6 - #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json index 76adb227c7..e20dccdbfa 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h index 68823699ab..25153db750 100644 --- a/keyboards/jd45/config.h +++ b/keyboards/jd45/config.h @@ -22,8 +22,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F0, F1, F5, B4 } #define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 } -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json index 9113ae7e0d..725431c672 100644 --- a/keyboards/jd45/info.json +++ b/keyboards/jd45/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index eba3f5247b..3e2fa93f31 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -27,12 +27,6 @@ along with this program. If not, see . #define PHYSICAL_LEDS_ENABLE -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_BREATHING //not working with splits right now -#endif - /* ws2812 RGB LED */ #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json index bb64f79e58..74121b2fda 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "2.1.0" }, + "backlight": { + "pin": "C6", + "levels": 5, + "breathing": true + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "D3" diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 4b32d8fc0b..083b235a2e 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -78,11 +78,6 @@ along with this program. If not, see . #define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) #endif // SCROLL_NMOSFET -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 -#endif - /* ws2812 RGB LED */ #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index bcd7c88d69..fc65cb13b8 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "1.0.0" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 061e1185cf..37e8f0458d 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -30,11 +30,6 @@ along with this program. If not, see . #define PHYSICAL_LEDS_ENABLE #define IOS_DEVICE_ENABLE -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 5 -#endif - /* ws2812 RGB LED */ #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index 0e87ca3bb6..642bf83efc 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "2.0.0" }, + "backlight": { + "pin": "C6", + "levels": 5 + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "D3" diff --git a/keyboards/jiran/rev1/config.h b/keyboards/jiran/rev1/config.h deleted file mode 100644 index d676c4b6b0..0000000000 --- a/keyboards/jiran/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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 2 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 . -*/ - -#pragma once -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json new file mode 100644 index 0000000000..830440f4f6 --- /dev/null +++ b/keyboards/jiran/rev1/info.json @@ -0,0 +1,6 @@ +{ + "backlight": { + "pin": "B6", + "levels": 5 + } +} diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h index ba2c696cb9..481d3400dd 100644 --- a/keyboards/kagizaraya/scythe/config.h +++ b/keyboards/kagizaraya/scythe/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGBLIGHT_SPLIT 1 #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index 1df3883ff2..acab68f80b 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -8,6 +8,9 @@ "pid": "0x3941", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/kb_elmo/twelvekey/config.h b/keyboards/kb_elmo/twelvekey/config.h index aae47646bd..19bd22c473 100644 --- a/keyboards/kb_elmo/twelvekey/config.h +++ b/keyboards/kb_elmo/twelvekey/config.h @@ -24,7 +24,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Backlight */ -#define BACKLIGHT_PIN B1 -#define BACKLIGHT_LEVELS 8 diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json index 3155d03b89..0dfc233ff5 100644 --- a/keyboards/kb_elmo/twelvekey/info.json +++ b/keyboards/kb_elmo/twelvekey/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "B1", + "levels": 8, "on_state": 0 }, "processor": "atmega328p", diff --git a/keyboards/kbdfans/bella/soldered/config.h b/keyboards/kbdfans/bella/soldered/config.h index e57f1c261d..cd44097127 100755 --- a/keyboards/kbdfans/bella/soldered/config.h +++ b/keyboards/kbdfans/bella/soldered/config.h @@ -20,7 +20,5 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/kbdfans/bella/soldered/info.json b/keyboards/kbdfans/bella/soldered/info.json index ebe65f8348..a98dfd3712 100644 --- a/keyboards/kbdfans/bella/soldered/info.json +++ b/keyboards/kbdfans/bella/soldered/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 804446cb19..0fd9b10373 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index f7cdb23dfa..9333221c57 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -8,6 +8,9 @@ "pid": "0x0191", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "B0", "num_lock": "B2", diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index a034e81a6e..fd338e9214 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -33,10 +33,7 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif + #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 620855a79f..e8e7168ccc 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h index 761579ba51..3c24eaa645 100644 --- a/keyboards/kbdfans/kbd66/config.h +++ b/keyboards/kbdfans/kbd66/config.h @@ -33,10 +33,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd66/info.json b/keyboards/kbdfans/kbd66/info.json index 3d12131cae..c3824412b9 100644 --- a/keyboards/kbdfans/kbd66/info.json +++ b/keyboards/kbdfans/kbd66/info.json @@ -8,6 +8,10 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index 3bf46dc318..d509761fee 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif #define RGB_DI_PIN B4 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index 25ffaef251..e81600b117 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -8,6 +8,10 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/config.h index 9b25d0a2db..1061f94bc2 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/config.h +++ b/keyboards/kbdfans/kbd67/mkii_soldered/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/info.json index 99fa935900..b439b97736 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json +++ b/keyboards/kbdfans/kbd67/mkii_soldered/info.json @@ -8,6 +8,10 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index 2b306cc41d..0980b80ed3 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index 0c0e80ee2d..f4e5ca006d 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index 0dde4254f9..89bb76ca9f 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index 108d462993..b148eff402 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x6067", "device_version": "0.0.2" }, + "backlight": { + "pin": "B5" + }, "indicators": { "caps_lock": "D4", "on_state": 0 diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 6efda14b8e..823f3c6f35 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif #define RGB_DI_PIN F0 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index 7c64c7e789..1aa4481830 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -8,6 +8,10 @@ "pid": "0x3658", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index e7c27255c9..7b630434d4 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -11,11 +11,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index 4193137ff2..e1cc9ee7bc 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index d76879ded0..a5436f05ac 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -8,6 +8,10 @@ "pid": "0x6061", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index f4e3dc2070..26f5030f4d 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index 53c2c5f17a..400e29bb3f 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "B3", "num_lock": "B1", diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index 58b5ec51ee..c11821425f 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 236aefeb3f..5fb4c7c089 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -8,6 +8,10 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "E6", "scroll_lock": "B2", diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h index 4d987ffdb9..acd78533ee 100644 --- a/keyboards/kbdfans/kbdpad/mk1/config.h +++ b/keyboards/kbdfans/kbdpad/mk1/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index dcd35e62f2..97d4c827a1 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -8,6 +8,10 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "indicators": { "num_lock": "D0" }, diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index 89fd2bd2a5..ffc9d00e5f 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 -#endif #define RGB_DI_PIN B5 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index c82e825551..54657e5c12 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "indicators": { "num_lock": "B4", "on_state": 0 diff --git a/keyboards/kbdfans/maja_soldered/config.h b/keyboards/kbdfans/maja_soldered/config.h index 8bb975f297..bf315f1ee3 100755 --- a/keyboards/kbdfans/maja_soldered/config.h +++ b/keyboards/kbdfans/maja_soldered/config.h @@ -20,8 +20,6 @@ #define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, B0, B1, B2, B3, B7, D2, D3, D5 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json index b6e15112a3..b59d3eae39 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/info.json @@ -8,6 +8,9 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h index 081823c777..bb78066a43 100644 --- a/keyboards/kbdfans/niu_mini/config.h +++ b/keyboards/kbdfans/niu_mini/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN - #define BACKLIGHT_LEVELS 4 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index 7b724cc38d..f381993ad3 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h index 70d0ea513c..fa74b02663 100644 --- a/keyboards/kc60/config.h +++ b/keyboards/kc60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN F5 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json index e1b13f46a0..7783ffee54 100644 --- a/keyboards/kc60/info.json +++ b/keyboards/kc60/info.json @@ -8,6 +8,11 @@ "pid": "0x6FFC", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/kc60se/config.h b/keyboards/kc60se/config.h index f84ace19bf..2640ba6397 100644 --- a/keyboards/kc60se/config.h +++ b/keyboards/kc60se/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/kc60se/info.json b/keyboards/kc60se/info.json index 3815eaf7a3..8779172a97 100644 --- a/keyboards/kc60se/info.json +++ b/keyboards/kc60se/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "F5", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h index d34d9756f9..c9e0a63896 100644 --- a/keyboards/keebio/bdn9/rev1/config.h +++ b/keyboards/keebio/bdn9/rev1/config.h @@ -20,9 +20,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { D0, F6, B6 } #define ENCODERS_PAD_B { D1, F5, F7 } -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 7 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json index e5dea50260..ec52e8ef6b 100644 --- a/keyboards/keebio/bdn9/rev1/info.json +++ b/keyboards/keebio/bdn9/rev1/info.json @@ -4,6 +4,10 @@ "pid": "0x1133", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5", + "levels": 7 + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h index a5cac21f2f..6d28712e8c 100644 --- a/keyboards/keebio/chocopad/config.h +++ b/keyboards/keebio/chocopad/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json index eee4f8170d..9b047cc4fc 100644 --- a/keyboards/keebio/chocopad/info.json +++ b/keyboards/keebio/chocopad/info.json @@ -8,6 +8,10 @@ "pid": "0x1144", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4"], diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h index d84496664b..c10fe13a30 100644 --- a/keyboards/keebio/dilly/config.h +++ b/keyboards/keebio/dilly/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json index b1189b9e62..f69290454a 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/info.json @@ -8,6 +8,9 @@ "pid": "0x113A", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h index 1ec02a68be..9aa38cbe07 100644 --- a/keyboards/keebio/dsp40/rev1/config.h +++ b/keyboards/keebio/dsp40/rev1/config.h @@ -25,11 +25,9 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 7 #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json index f50ee33ed3..5421218a6b 100644 --- a/keyboards/keebio/dsp40/rev1/info.json +++ b/keyboards/keebio/dsp40/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x144C", "device_version": "1.0.0" }, + "backlight": { + "pin": "A6", + "levels": 7 + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h index d20743ed45..c9f49ad1fb 100644 --- a/keyboards/keebio/ergodicity/config.h +++ b/keyboards/keebio/ergodicity/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 7 - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json index 3e5ba3e17c..94203340ce 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/info.json @@ -8,6 +8,11 @@ "pid": "0x125F", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 7, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h index 19fced2c36..002bf3b9a8 100644 --- a/keyboards/keebio/foldkb/rev1/config.h +++ b/keyboards/keebio/foldkb/rev1/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { F5 } #define ENCODERS_PAD_B { F6 } -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json index ee3721bad4..46617db128 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x1258", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h index fcb96a3911..436c47ccac 100644 --- a/keyboards/keebio/iris/rev1/config.h +++ b/keyboards/keebio/iris/rev1/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN D2 -#define BACKLIGHT_LEVELS 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json index 788b92a7b4..736b6006b9 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/info.json @@ -4,6 +4,10 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "backlight": { + "pin": "D2", + "levels": 5 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h index d639957d66..3bd96004be 100644 --- a/keyboards/keebio/iris/rev1_led/config.h +++ b/keyboards/keebio/iris/rev1_led/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json index c58770c3ce..e5d71a70b0 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -4,6 +4,10 @@ "pid": "0x1256", "device_version": "1.1.0" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h index 17f35564b1..71a5e3ad01 100644 --- a/keyboards/keebio/iris/rev2/config.h +++ b/keyboards/keebio/iris/rev2/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json index 1f3d5c7d61..7ac3883bb5 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/info.json @@ -4,6 +4,10 @@ "pid": "0x2256", "device_version": "2.0.0" }, + "backlight": { + "pin": "B5", + "levels": 5 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h index 17dd3d35e4..1834b0573d 100644 --- a/keyboards/keebio/iris/rev3/config.h +++ b/keyboards/keebio/iris/rev3/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN F7 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index f930160d0f..a90be8a1b6 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -4,6 +4,10 @@ "pid": "0x3256", "device_version": "3.0.0" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "qmk_lufa_bootloader": { "esc_input": "D2", "esc_output": "F1", diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h index 35d4d59721..afac7c80ee 100644 --- a/keyboards/keebio/iris/rev4/config.h +++ b/keyboards/keebio/iris/rev4/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN D6 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index 8288b2fdf4..6915619b0f 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -4,6 +4,10 @@ "pid": "0x4256", "device_version": "4.0.0" }, + "backlight": { + "pin": "B5", + "levels": 5 + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F1", diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h index fcfe3b5b68..086bddd8ce 100644 --- a/keyboards/keebio/iris/rev5/config.h +++ b/keyboards/keebio/iris/rev5/config.h @@ -32,8 +32,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 #define BACKLIGHT_DEFAULT_LEVEL 3 /* ws2812 RGB LED */ diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 11b8bed530..c45d09a8df 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -4,6 +4,10 @@ "pid": "0x5256", "device_version": "5.0.0" }, + "backlight": { + "pin": "B5", + "levels": 5 + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F1", diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h index 5705fe7c9a..df4180f9c2 100644 --- a/keyboards/keebio/kbo5000/rev1/config.h +++ b/keyboards/keebio/kbo5000/rev1/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A_RIGHT { D6, C7 } #define ENCODERS_PAD_B_RIGHT { D4, C6 } -#define BACKLIGHT_PIN B5 #define CAPS_LOCK_LED_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json index 54db6d97a5..8d0b9877a1 100644 --- a/keyboards/keebio/kbo5000/rev1/info.json +++ b/keyboards/keebio/kbo5000/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x126A", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h index 3f25206780..c64d1a9e9e 100644 --- a/keyboards/keebio/levinson/rev1/config.h +++ b/keyboards/keebio/levinson/rev1/config.h @@ -34,7 +34,3 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } - -/* Backlight LEDs */ -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json index 82eafa2db4..05416bd138 100644 --- a/keyboards/keebio/levinson/rev1/info.json +++ b/keyboards/keebio/levinson/rev1/info.json @@ -6,5 +6,9 @@ "usb": { "pid": "0x1146", "device_version": "1.0.0" + }, + "backlight": { + "pin": "C6", + "levels": 7 } } diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h index 4419aacc4c..88c38bc9ab 100644 --- a/keyboards/keebio/levinson/rev2/config.h +++ b/keyboards/keebio/levinson/rev2/config.h @@ -34,7 +34,3 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } - -/* Backlight LEDs */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json index 0ef0ca8d5b..dbd0901737 100644 --- a/keyboards/keebio/levinson/rev2/info.json +++ b/keyboards/keebio/levinson/rev2/info.json @@ -6,5 +6,9 @@ "usb": { "pid": "0x2146", "device_version": "2.0.0" + }, + "backlight": { + "pin": "B5", + "levels": 7 } } diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h index 5b2be68b62..be2be855d0 100644 --- a/keyboards/keebio/levinson/rev3/config.h +++ b/keyboards/keebio/levinson/rev3/config.h @@ -37,7 +37,3 @@ along with this program. If not, see . #define RGB_DI_PIN D7 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } - -/* Backlight LEDs */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json index e64545458e..8cc3fa9fb9 100644 --- a/keyboards/keebio/levinson/rev3/info.json +++ b/keyboards/keebio/levinson/rev3/info.json @@ -6,5 +6,9 @@ "usb": { "pid": "0x3146", "device_version": "3.0.0" + }, + "backlight": { + "pin": "B6", + "levels": 7 } } diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h index 08d34cb7f8..267faf45d9 100644 --- a/keyboards/keebio/nyquist/rev2/config.h +++ b/keyboards/keebio/nyquist/rev2/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } -/* Backlight LEDs */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json index a18075f9b1..b47bb7511b 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/info.json @@ -4,6 +4,10 @@ "pid": "0x2156", "device_version": "2.0.0" }, + "backlight": { + "pin": "B6", + "levels": 7 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h index a196522d30..697205027d 100644 --- a/keyboards/keebio/nyquist/rev3/config.h +++ b/keyboards/keebio/nyquist/rev3/config.h @@ -45,10 +45,6 @@ along with this program. If not, see . #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } -/* Backlight LEDs */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 7 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json index 8ed16f832e..e7bd8635ae 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/info.json @@ -4,6 +4,10 @@ "pid": "0x3156", "device_version": "3.0.0" }, + "backlight": { + "pin": "B5", + "levels": 7 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h index c9ffb474ca..3ccae64421 100644 --- a/keyboards/keebio/quefrency/rev2/config.h +++ b/keyboards/keebio/quefrency/rev2/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A_RIGHT { D6 } #define ENCODERS_PAD_B_RIGHT { D4 } -#define BACKLIGHT_PIN B5 #define CAPS_LOCK_LED_PIN B6 /* ws2812 RGB LED */ diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json index 36b4de113f..c5e75b3781 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x2257", "device_version": "2.0.0" }, + "backlight": { + "pin": "B5" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h index c9ffb474ca..3ccae64421 100644 --- a/keyboards/keebio/quefrency/rev3/config.h +++ b/keyboards/keebio/quefrency/rev3/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A_RIGHT { D6 } #define ENCODERS_PAD_B_RIGHT { D4 } -#define BACKLIGHT_PIN B5 #define CAPS_LOCK_LED_PIN B6 /* ws2812 RGB LED */ diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json index b046871182..0fcb867a88 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/info.json @@ -8,6 +8,9 @@ "pid": "0x3357", "device_version": "3.1.0" }, + "backlight": { + "pin": "B5" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h index 77c00e4be9..435ebb2845 100644 --- a/keyboards/keebio/rorschach/rev1/config.h +++ b/keyboards/keebio/rorschach/rev1/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 - /* WS2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index a5e5483c66..88cec27844 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x1246", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5", + "levels": 5 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h index c32f3b5f6c..656be72025 100644 --- a/keyboards/keebio/tragicforce68/config.h +++ b/keyboards/keebio/tragicforce68/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json index e498a1c49a..2be5e4f0c1 100644 --- a/keyboards/keebio/tragicforce68/info.json +++ b/keyboards/keebio/tragicforce68/info.json @@ -8,6 +8,11 @@ "pid": "0x0510", "device_version": "1.0.1" }, + "backlight": { + "pin": "B5", + "levels": 7, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["68_ansi"], diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h index ac6e64539c..898ba3d786 100644 --- a/keyboards/keebio/viterbi/rev2/config.h +++ b/keyboards/keebio/viterbi/rev2/config.h @@ -34,7 +34,3 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 14 #define RGBLED_SPLIT { 7, 7 } - -/* Backlight LEDs */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json index 5282cdd062..dd375f3053 100644 --- a/keyboards/keebio/viterbi/rev2/info.json +++ b/keyboards/keebio/viterbi/rev2/info.json @@ -6,5 +6,9 @@ "usb": { "pid": "0x2157", "device_version": "2.0.0" + }, + "backlight": { + "pin": "B6", + "levels": 7 } } diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h index eff882832a..6866a313d4 100644 --- a/keyboards/keebio/wavelet/config.h +++ b/keyboards/keebio/wavelet/config.h @@ -34,7 +34,3 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs - -/* Backlight LEDs */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json index 8a313f5525..1a1663c4d7 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/info.json @@ -8,6 +8,10 @@ "pid": "0x1046", "device_version": "1.0.0" }, + "backlight": { + "pin": "B5", + "levels": 7 + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h index cd4fb39ae2..0ec73b7874 100644 --- a/keyboards/keebsforall/coarse60/config.h +++ b/keyboards/keebsforall/coarse60/config.h @@ -20,12 +20,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A9, A10, B12, A2, C13 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json index 29a7850fc8..63fa7d5fe8 100644 --- a/keyboards/keebsforall/coarse60/info.json +++ b/keyboards/keebsforall/coarse60/info.json @@ -8,6 +8,11 @@ "pid": "0x5341", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "B10", "num_lock": "B2", diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h index 385e477e7e..f0e1766733 100644 --- a/keyboards/keebwerk/nano_slider/config.h +++ b/keyboards/keebwerk/nano_slider/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN F6 #ifdef RGB_DI_PIN # define RGBLED_NUM 4 diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json index 1d843e1475..bd47ae0a4b 100644 --- a/keyboards/keebwerk/nano_slider/info.json +++ b/keyboards/keebwerk/nano_slider/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h index 18b255aec7..e9ad8c2fee 100644 --- a/keyboards/kegen/gboy/config.h +++ b/keyboards/kegen/gboy/config.h @@ -25,11 +25,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 15 -#endif - #define RGB_DI_PIN D1 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json index f59808bf11..909eb6c568 100644 --- a/keyboards/kegen/gboy/info.json +++ b/keyboards/kegen/gboy/info.json @@ -8,6 +8,10 @@ "pid": "0x6762", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 15 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h index e103fb33a0..6a69df05e7 100644 --- a/keyboards/kira75/config.h +++ b/keyboards/kira75/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json index cf8e9ce698..fa366854b2 100644 --- a/keyboards/kira75/info.json +++ b/keyboards/kira75/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kira80/config.h b/keyboards/kira80/config.h index 169f5add38..28c02ab0a6 100644 --- a/keyboards/kira80/config.h +++ b/keyboards/kira80/config.h @@ -23,6 +23,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING diff --git a/keyboards/kira80/info.json b/keyboards/kira80/info.json index 47cf842b3d..cb40dc0ab8 100644 --- a/keyboards/kira80/info.json +++ b/keyboards/kira80/info.json @@ -8,6 +8,10 @@ "pid": "0xC583", "device_version": "1.0.2" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h index d0df940b99..5332a91304 100644 --- a/keyboards/kiwikey/wanderland/config.h +++ b/keyboards/kiwikey/wanderland/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN F7 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json index 1dfe8fa415..3bab46fb4a 100644 --- a/keyboards/kiwikey/wanderland/info.json +++ b/keyboards/kiwikey/wanderland/info.json @@ -8,6 +8,10 @@ "pid": "0x574C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "B6", "num_lock": "C6", diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json index e22708713a..ddf5361257 100644 --- a/keyboards/kmac/info.json +++ b/keyboards/kmac/info.json @@ -7,6 +7,9 @@ "pid": "0x4143", "device_version": "1.0.4" }, + "backlight": { + "driver": "custom" + }, "indicators": { "caps_lock": "B0", "scroll_lock": "E6", diff --git a/keyboards/kmac/rules.mk b/keyboards/kmac/rules.mk index b1bd80232c..d9aa87a7dc 100644 --- a/keyboards/kmac/rules.mk +++ b/keyboards/kmac/rules.mk @@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Custom matrix file NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output # Project specific files diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h index 991155a8de..e7b6507f53 100644 --- a/keyboards/kopibeng/xt65/config.h +++ b/keyboards/kopibeng/xt65/config.h @@ -33,9 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B1 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN D5 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json index bc8fe61543..5becaacc09 100644 --- a/keyboards/kopibeng/xt65/info.json +++ b/keyboards/kopibeng/xt65/info.json @@ -8,6 +8,10 @@ "pid": "0x0650", "device_version": "0.0.1" }, + "backlight": { + "pin": "B1", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h index 2a4fcf6e36..329615e1d1 100644 --- a/keyboards/kprepublic/bm43a/config.h +++ b/keyboards/kprepublic/bm43a/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json index 545d087128..4e23be7857 100644 --- a/keyboards/kprepublic/bm43a/info.json +++ b/keyboards/kprepublic/bm43a/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h index 0d2d57cc57..b271703558 100644 --- a/keyboards/kprepublic/cospad/config.h +++ b/keyboards/kprepublic/cospad/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F7 - #define RGB_DI_PIN F6 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json index e4cf27945f..ccf1ed42b0 100644 --- a/keyboards/kprepublic/cospad/info.json +++ b/keyboards/kprepublic/cospad/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F7", "on_state": 0 }, "indicators": { diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h index d466209a75..e7c508a232 100644 --- a/keyboards/kprepublic/jj40/config.h +++ b/keyboards/kprepublic/jj40/config.h @@ -21,10 +21,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 12 -#define BACKLIGHT_BREATHING - /* RGB underglow */ // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0. #define RGBLED_NUM 5 diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json index 189ae81ae0..4fb1eb18cc 100644 --- a/keyboards/kprepublic/jj40/info.json +++ b/keyboards/kprepublic/jj40/info.json @@ -8,6 +8,11 @@ "pid": "0x0040", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h index 11b2002003..bb2d842cb8 100644 --- a/keyboards/kprepublic/jj4x4/config.h +++ b/keyboards/kprepublic/jj4x4/config.h @@ -24,10 +24,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 12 -#define BACKLIGHT_BREATHING - /* RGB underglow */ // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0. #define RGBLED_NUM 4 diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json index 4a85eb55f3..734757fa9f 100644 --- a/keyboards/kprepublic/jj4x4/info.json +++ b/keyboards/kprepublic/jj4x4/info.json @@ -8,6 +8,11 @@ "pid": "0x0044", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["ortho_4x4"], diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h index dd67078d56..ef614b1f69 100644 --- a/keyboards/kprepublic/jj50/config.h +++ b/keyboards/kprepublic/jj50/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 12 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json index 5e95520759..126ba09048 100644 --- a/keyboards/kprepublic/jj50/info.json +++ b/keyboards/kprepublic/jj50/info.json @@ -8,6 +8,11 @@ "pid": "0x0050", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layout_aliases": { diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h index e25e645b09..d2103b03c6 100644 --- a/keyboards/ktec/daisy/config.h +++ b/keyboards/ktec/daisy/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D0 -#define BACKLIGHT_LEVELS 6 - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json index 50c5dd78b0..6901774b23 100644 --- a/keyboards/ktec/daisy/info.json +++ b/keyboards/ktec/daisy/info.json @@ -8,6 +8,10 @@ "pid": "0xD7DC", "device_version": "5.0.1" }, + "backlight": { + "pin": "D0", + "levels": 6 + }, "indicators": { "caps_lock": "C6", "on_state": 0 diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h index 1a1b7372e6..23c362c0aa 100755 --- a/keyboards/ktec/staryu/config.h +++ b/keyboards/ktec/staryu/config.h @@ -29,5 +29,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_LIMIT_VAL 200 - -#define BACKLIGHT_LEVELS 10 diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index 21c4e04dd7..02189fecf7 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -9,7 +9,8 @@ "device_version": "2.0.5" }, "backlight": { - "pins": ["C2", "C7", "D5", "D6", "B0"] + "pins": ["C2", "C7", "D5", "D6", "B0"], + "levels": 10 }, "bootmagic": { "matrix": [0, 1] diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/config.h b/keyboards/lazydesigners/dimple/staggered/rev3/config.h deleted file mode 100644 index b6970644b4..0000000000 --- a/keyboards/lazydesigners/dimple/staggered/rev3/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 LAZYDESIGNERS - * - * 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 2 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 . - */ - -#pragma once - -#define BACKLIGHT_PIN B7 diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json index d1e1568035..f703059bd5 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json +++ b/keyboards/lazydesigners/dimple/staggered/rev3/info.json @@ -1,4 +1,7 @@ { + "backlight": { + "pin": "B7" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h index eac7ad0912..9d8dca9693 100644 --- a/keyboards/lazydesigners/dimpleplus/config.h +++ b/keyboards/lazydesigners/dimpleplus/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* RBG underglow */ #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json index c0ed213d58..fd9b7bc44c 100644 --- a/keyboards/lazydesigners/dimpleplus/info.json +++ b/keyboards/lazydesigners/dimpleplus/info.json @@ -8,6 +8,9 @@ "pid": "0x0061", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the30/config.h b/keyboards/lazydesigners/the30/config.h index 665bc53dc4..fcb62244c4 100644 --- a/keyboards/lazydesigners/the30/config.h +++ b/keyboards/lazydesigners/the30/config.h @@ -24,5 +24,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 diff --git a/keyboards/lazydesigners/the30/info.json b/keyboards/lazydesigners/the30/info.json index 20be3649a8..94d5067377 100644 --- a/keyboards/lazydesigners/the30/info.json +++ b/keyboards/lazydesigners/the30/info.json @@ -8,6 +8,9 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h index 36d7905d71..6f625c41bd 100644 --- a/keyboards/lazydesigners/the40/config.h +++ b/keyboards/lazydesigners/the40/config.h @@ -23,9 +23,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json index 6e0bc06db6..009e6fe006 100644 --- a/keyboards/lazydesigners/the40/info.json +++ b/keyboards/lazydesigners/the40/info.json @@ -8,6 +8,10 @@ "pid": "0x0042", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h index c2ca403b83..96b226f6e8 100644 --- a/keyboards/lazydesigners/the50/config.h +++ b/keyboards/lazydesigners/the50/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 6 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index e6243e4add..9a54671b46 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -8,6 +8,10 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the60/rev1/config.h b/keyboards/lazydesigners/the60/rev1/config.h index 847aa16ebf..0845f9db63 100755 --- a/keyboards/lazydesigners/the60/rev1/config.h +++ b/keyboards/lazydesigners/the60/rev1/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 6 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/lazydesigners/the60/rev1/info.json b/keyboards/lazydesigners/the60/rev1/info.json index 5ef3d14aef..179dd59895 100755 --- a/keyboards/lazydesigners/the60/rev1/info.json +++ b/keyboards/lazydesigners/the60/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h index af003113a3..11d38876d3 100755 --- a/keyboards/lazydesigners/the60/rev2/config.h +++ b/keyboards/lazydesigners/the60/rev2/config.h @@ -23,10 +23,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN D1 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json index b91acfa71e..355a8c7bc9 100755 --- a/keyboards/lazydesigners/the60/rev2/info.json +++ b/keyboards/lazydesigners/the60/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0062", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h index 9bec564065..a4b4d931c4 100644 --- a/keyboards/lfkeyboards/lfk65_hs/config.h +++ b/keyboards/lfkeyboards/lfk65_hs/config.h @@ -6,7 +6,6 @@ #define MATRIX_COL_PINS {E6, F4, B7, D5, D3, D2, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4} #define RGBLED_NUM 20 // Number of LEDs -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json index 8973c3fafa..a2aea08829 100644 --- a/keyboards/lfkeyboards/lfk65_hs/info.json +++ b/keyboards/lfkeyboards/lfk65_hs/info.json @@ -8,6 +8,9 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "backlight": { + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h index 4b047f6c1c..3e88fe3d37 100644 --- a/keyboards/lfkeyboards/lfk78/config.h +++ b/keyboards/lfkeyboards/lfk78/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP { 8, 16, 40, 55, 70, 128, 200, 255 } #define TAPPING_TERM 200 diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json index 8ff16c7e54..026ec0d0c5 100644 --- a/keyboards/lfkeyboards/lfk78/revb/info.json +++ b/keyboards/lfkeyboards/lfk78/revb/info.json @@ -8,6 +8,10 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json index 48233f60cd..8867f107e8 100644 --- a/keyboards/lfkeyboards/lfk78/revc/info.json +++ b/keyboards/lfkeyboards/lfk78/revc/info.json @@ -8,6 +8,10 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json index 0d1c355184..320e5f89ec 100644 --- a/keyboards/lfkeyboards/lfk78/revj/info.json +++ b/keyboards/lfkeyboards/lfk78/revj/info.json @@ -8,6 +8,10 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "at90usb646", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk index 1db50d1423..6c0b7f6d8d 100644 --- a/keyboards/lfkeyboards/lfk78/rules.mk +++ b/keyboards/lfkeyboards/lfk78/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lfkeyboards, not qmk base diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h index 51feeb7f6e..3120a184e6 100644 --- a/keyboards/lfkeyboards/lfk87/config.h +++ b/keyboards/lfkeyboards/lfk87/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_LEVELS 10 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN F4 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json index 833eb3261d..9ba48f7b29 100644 --- a/keyboards/lfkeyboards/lfk87/info.json +++ b/keyboards/lfkeyboards/lfk87/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 10 + }, "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk index 32c2a94f2b..9a0fd53343 100644 --- a/keyboards/lfkeyboards/lfk87/rules.mk +++ b/keyboards/lfkeyboards/lfk87/rules.mk @@ -22,7 +22,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = yes # Audio output RGBLIGHT_ENABLE = yes # Enable RGB underlight RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lefkeyboards, not WS2812 diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h index e2e2366044..2d648c4e4d 100644 --- a/keyboards/lfkeyboards/mini1800/config.h +++ b/keyboards/lfkeyboards/mini1800/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_LEVELS 10 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN F4 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json index 703184dc99..6b66ed9774 100644 --- a/keyboards/lfkeyboards/mini1800/info.json +++ b/keyboards/lfkeyboards/mini1800/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 10 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index fb92137be8..f435f55677 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -9,7 +9,6 @@ #include "lighting.h" #include "debug.h" -#define BACKLIGHT_BREATHING #include "quantum.h" uint16_t click_hz = CLICK_HZ; diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk index bb938f99b3..edd26e498d 100644 --- a/keyboards/lfkeyboards/mini1800/reva/rules.mk +++ b/keyboards/lfkeyboards/mini1800/reva/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = yes # Audio output # RGB code is implemented in lfkeyboards, not WS2812 RGBLIGHT_CUSTOM_DRIVER = yes -BACKLIGHT_DRIVER = custom SLEEP_LED_ENABLE = yes ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk index bb938f99b3..edd26e498d 100644 --- a/keyboards/lfkeyboards/mini1800/revc/rules.mk +++ b/keyboards/lfkeyboards/mini1800/revc/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = yes # Audio output # RGB code is implemented in lfkeyboards, not WS2812 RGBLIGHT_CUSTOM_DRIVER = yes -BACKLIGHT_DRIVER = custom SLEEP_LED_ENABLE = yes ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h index 06334113ef..b746d90232 100644 --- a/keyboards/lfkeyboards/smk65/revb/config.h +++ b/keyboards/lfkeyboards/smk65/revb/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json index bf42e51ded..25cbf0f77a 100644 --- a/keyboards/lfkeyboards/smk65/revb/info.json +++ b/keyboards/lfkeyboards/smk65/revb/info.json @@ -2,6 +2,9 @@ "usb": { "pid": "0x565B" }, + "backlight": { + "levels": 8 + }, "processor": "at90usb646", "bootloader": "atmel-dfu" } diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h index 97f8029955..394b953afb 100644 --- a/keyboards/linworks/dolice/config.h +++ b/keyboards/linworks/dolice/config.h @@ -23,7 +23,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Backlight */ -#define BACKLIGHT_PIN B5 // Timer 1 on mega32u4 -#define BACKLIGHT_BREATHING diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index 649dc85d02..1db5f48470 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/info.json @@ -7,6 +7,10 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "indicators": { "caps_lock": "C7", "num_lock": "B6", diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h index d064d7cea4..5d3830ef6c 100644 --- a/keyboards/linworks/fave104/config.h +++ b/keyboards/linworks/fave104/config.h @@ -24,11 +24,7 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Backlight */ -#define BACKLIGHT_PIN A1 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 5 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json index 0eeda7d97d..03beb2ad89 100644 --- a/keyboards/linworks/fave104/info.json +++ b/keyboards/linworks/fave104/info.json @@ -8,6 +8,11 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "backlight": { + "pin": "A1", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "B5", "num_lock": "B6", diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h index 6b553e26a2..37aa1a68fc 100644 --- a/keyboards/linworks/fave87/config.h +++ b/keyboards/linworks/fave87/config.h @@ -24,10 +24,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* Backlight */ -#define BACKLIGHT_PIN B7 // Timer 1 on mega32u4 -#define BACKLIGHT_BREATHING - /* Underglow */ #define RGB_DI_PIN E2 #define RGBLED_NUM 40 diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json index dffb86c8ec..b6ac9b78c1 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/info.json @@ -7,6 +7,10 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h index b2da9c0245..9508aeed57 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -24,13 +24,9 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Backlight */ -#define BACKLIGHT_PIN A10 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 6 -#define BACKLIGHT_LEVELS 5 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. /* Underglow */ diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json index 7de9e12764..24cb27f929 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/info.json @@ -7,6 +7,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "A10", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "A9", "num_lock": "A8", diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h index 96db02dbfd..0f9730066e 100644 --- a/keyboards/lz/erghost/config.h +++ b/keyboards/lz/erghost/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 28 diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json index f5ab6490b9..0ba1055fe3 100644 --- a/keyboards/lz/erghost/info.json +++ b/keyboards/lz/erghost/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "D6", "num_lock": "D7", diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h index 264dc6ddb0..dac3f44a3e 100644 --- a/keyboards/m10a/config.h +++ b/keyboards/m10a/config.h @@ -23,13 +23,9 @@ #define MATRIX_ROW_PINS { B6, F7, F6, D6 } #define MATRIX_COL_PINS { F5, F1, F0 } -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_LEVELS 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/m10a/info.json b/keyboards/m10a/info.json index f039afc9a7..f517d49087 100644 --- a/keyboards/m10a/info.json +++ b/keyboards/m10a/info.json @@ -8,6 +8,10 @@ "pid": "0x00AA", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/machkeyboards/mach3/config.h b/keyboards/machkeyboards/mach3/config.h index 2cb9079a84..ba1628e954 100644 --- a/keyboards/machkeyboards/mach3/config.h +++ b/keyboards/machkeyboards/mach3/config.h @@ -23,8 +23,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* backlight */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json index 77b69b9651..767beb2026 100644 --- a/keyboards/machkeyboards/mach3/info.json +++ b/keyboards/machkeyboards/mach3/info.json @@ -8,6 +8,11 @@ "pid": "0x4D33", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/machkeyboards/mach3/rules.mk b/keyboards/machkeyboards/mach3/rules.mk index 244bc3f763..75c6a286e5 100644 --- a/keyboards/machkeyboards/mach3/rules.mk +++ b/keyboards/machkeyboards/mach3/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output UNICODE_ENABLE = yes -BACKLIGHT_DRIVER = pwm \ No newline at end of file diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h index 11e591dca2..40c2ce1f48 100644 --- a/keyboards/maple_computing/christmas_tree/config.h +++ b/keyboards/maple_computing/christmas_tree/config.h @@ -22,8 +22,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 } #define MATRIX_COL_PINS { D1 } -#define BACKLIGHT_PIN D2 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index 6aa86425a0..d60dabe1df 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -7,6 +7,9 @@ "vid": "0xFEED", "pid": "0x3070" }, + "backlight": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h index 949de97ba8..3192143e77 100644 --- a/keyboards/maple_computing/ivy/config.h +++ b/keyboards/maple_computing/ivy/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN D2 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index 3c028e0ea5..19109ca73f 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x6012", "device_version": "0.0.1" }, + "backlight": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h index 5b645dd5b9..24942e7a51 100644 --- a/keyboards/maple_computing/jnao/config.h +++ b/keyboards/maple_computing/jnao/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 } #define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 } -#define BACKLIGHT_PIN D0 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json index 84fd17bbb2..afa5a8674e 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/info.json @@ -8,6 +8,9 @@ "pid": "0x6017", "device_version": "0.0.1" }, + "backlight": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x12", "ortho_4x12"], diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h index 77afb19b14..55d2428db0 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/eh/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* ws2812 RGB LED */ #define RGB_DI_PIN B2 #define RGBLED_NUM 12 // Number of LEDs (each hand) diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index b22fef655a..4574b10b64 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -8,6 +8,9 @@ "pid": "0xE401", "device_version": "1.0.0" }, + "backlight": { + "pin": "B7" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h index cba49f39f1..0869e77a7a 100644 --- a/keyboards/massdrop/thekey/config.h +++ b/keyboards/massdrop/thekey/config.h @@ -25,8 +25,6 @@ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN B1 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json index c80f4d9373..56fe74729c 100644 --- a/keyboards/massdrop/thekey/info.json +++ b/keyboards/massdrop/thekey/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h index ca56069a1e..7023e30ced 100644 --- a/keyboards/mechbrewery/mb65s/config.h +++ b/keyboards/mechbrewery/mb65s/config.h @@ -24,8 +24,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h index 00cf0b0fb4..493f54b3f7 100644 --- a/keyboards/mechkeys/acr60/config.h +++ b/keyboards/mechkeys/acr60/config.h @@ -24,9 +24,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json index 216d8639a3..816e74a2bb 100644 --- a/keyboards/mechkeys/acr60/info.json +++ b/keyboards/mechkeys/acr60/info.json @@ -8,6 +8,10 @@ "pid": "0xCA60", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h index 00526afb0b..bb3b38500c 100755 --- a/keyboards/mechkeys/alu84/config.h +++ b/keyboards/mechkeys/alu84/config.h @@ -33,9 +33,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) # define RGBLED_NUM 16 diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json index c3cedc651e..aaf9cc7ac1 100644 --- a/keyboards/mechkeys/alu84/info.json +++ b/keyboards/mechkeys/alu84/info.json @@ -8,6 +8,10 @@ "pid": "0xCA75", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h index 5cc77b8bec..b345f44269 100755 --- a/keyboards/mechkeys/espectro/config.h +++ b/keyboards/mechkeys/espectro/config.h @@ -24,9 +24,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json index 6877f1c316..1361065e75 100644 --- a/keyboards/mechkeys/espectro/info.json +++ b/keyboards/mechkeys/espectro/info.json @@ -8,6 +8,10 @@ "pid": "0xCA96", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "B2", "num_lock": "B0", diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h index 76de7a323c..3da5747d2b 100644 --- a/keyboards/mechkeys/mechmini/v1/config.h +++ b/keyboards/mechkeys/mechmini/v1/config.h @@ -22,8 +22,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - /* RGB underglow */ // The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards. // The same pin is used on the JJ40, at least. diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json index d971979c34..751be56e38 100644 --- a/keyboards/mechkeys/mechmini/v1/info.json +++ b/keyboards/mechkeys/mechmini/v1/info.json @@ -8,6 +8,9 @@ "pid": "0xCA40", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h index 9794b87937..c318669851 100755 --- a/keyboards/mechkeys/mechmini/v2/config.h +++ b/keyboards/mechkeys/mechmini/v2/config.h @@ -23,8 +23,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json index bc8a60cd46..58ad7525db 100644 --- a/keyboards/mechkeys/mechmini/v2/info.json +++ b/keyboards/mechkeys/mechmini/v2/info.json @@ -8,6 +8,9 @@ "pid": "0xCA40", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h index 9b39355f47..065c3006c6 100644 --- a/keyboards/mechkeys/mk60/config.h +++ b/keyboards/mechkeys/mk60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 6 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json index b78e144988..42d9c3bd24 100644 --- a/keyboards/mechkeys/mk60/info.json +++ b/keyboards/mechkeys/mk60/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index 90a5cf6575..e1081a9560 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B0 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json index 3835f71f94..a5f20190d1 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -1,5 +1,9 @@ { "keyboard_name": "Adelais", + "backlight": { + "pin": "B0", + "breathing": true + }, "indicators": { "caps_lock": "B2", "num_lock": "C15", diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index 4605d08efb..aac4aae40d 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -31,9 +31,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLED_NUM 23 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json index f571ebab51..73ea66a997 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -3,6 +3,10 @@ "usb": { "pid": "0xAD04" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h index b8b32068c0..b1ef0e072a 100644 --- a/keyboards/mechlovin/delphine/mono_led/config.h +++ b/keyboards/mechlovin/delphine/mono_led/config.h @@ -1,10 +1,6 @@ #pragma once -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_PIN B6 -#endif - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 13 diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json index 2665906b80..ce88a638a9 100644 --- a/keyboards/mechlovin/delphine/mono_led/info.json +++ b/keyboards/mechlovin/delphine/mono_led/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0xDEF1", "device_version": "0.0.1" + }, + "backlight": { + "pin": "B6" } } diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index ed43115e09..e96bc8bc85 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -33,7 +33,5 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD4 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index 8ec49a784e..74ae965fb7 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -1,4 +1,8 @@ { + "backlight": { + "pin": "B8", + "breathing": true + }, "indicators": { "caps_lock": "B9", "on_state": 0 diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index 78ad7b5a1b..be1d769e67 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index 7f61b0e023..ae5f966622 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x9101", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index 76cb6cb8f0..cfb43e786c 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -8,6 +8,10 @@ "pid": "0x9102", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index 7bae7c1579..14219cb9b6 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -8,6 +8,10 @@ "pid": "0x9103", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h index abd2a73e0e..1baf1aa2ea 100644 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ b/keyboards/mechlovin/hex4b/rev1/config.h @@ -31,7 +31,3 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 } #define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 } - -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json index 79bef8e9a7..cec380a91f 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "backlight": { + "pin": "D4", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "D7", "num_lock": "D6", diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index cff2b7f915..c0486dd0b7 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -32,7 +32,4 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 } -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_LEVELS 5 #define BACKLIGHT_PWM_DRIVER PWMD4 -#define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json index 6f5ddff9f7..7d9a2cb40a 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "backlight": { + "pin": "B8", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "B9", "num_lock": "C15", diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h index 55ec2080d8..a2b1b0311b 100644 --- a/keyboards/mechlovin/hex6c/config.h +++ b/keyboards/mechlovin/hex6c/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B0 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json index c076b7198b..e03f75c2b8 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/info.json @@ -8,6 +8,10 @@ "pid": "0x6C01", "device_version": "0.0.1" }, + "backlight": { + "pin": "B0", + "breathing": true + }, "indicators": { "caps_lock": "A4", "num_lock": "A3", diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h index 7de2a2cc79..e03ee6dded 100644 --- a/keyboards/mechlovin/infinity87/rev1/config.h +++ b/keyboards/mechlovin/infinity87/rev1/config.h @@ -19,8 +19,6 @@ #define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 } #define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 } -#define BACKLIGHT_PIN B0 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index 0bcf668f11..be094e09ae 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,4 +1,8 @@ { + "backlight": { + "pin": "B0", + "breathing": true + }, "indicators": { "caps_lock": "A4", "scroll_lock": "A8" diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h index 461c735f48..178374c1e7 100644 --- a/keyboards/mechlovin/infinity87/rev2/config.h +++ b/keyboards/mechlovin/infinity87/rev2/config.h @@ -34,9 +34,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index 548e55f563..d75dd051bc 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -8,6 +8,10 @@ "pid": "0x8702", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "D6", "num_lock": "D7", diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h index 862f954672..11ae35100b 100644 --- a/keyboards/mechlovin/infinity88/config.h +++ b/keyboards/mechlovin/infinity88/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B0 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index 8fd53b54cd..37ccd27537 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/info.json @@ -8,6 +8,10 @@ "pid": "0x8802", "device_version": "0.0.1" }, + "backlight": { + "pin": "B0", + "breathing": true + }, "indicators": { "caps_lock": "A4", "num_lock": "A3" diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h index 0f71af88e7..e0900333cd 100644 --- a/keyboards/mechlovin/infinityce/config.h +++ b/keyboards/mechlovin/infinityce/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLED_NUM 31 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json index 23a34f48a8..1ab5cad305 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/info.json @@ -8,6 +8,10 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h index 6609920740..6a6dc97744 100644 --- a/keyboards/mechlovin/kanu/config.h +++ b/keyboards/mechlovin/kanu/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json index 0f21e4b766..628a78e1a5 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/info.json @@ -8,6 +8,10 @@ "pid": "0x4B4E", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs", "65_iso_blocker"], diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h index eca0a5236b..c5e997d425 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/config.h +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -30,7 +30,5 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 } -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 -#define BACKLIGHT_PWM_CHANNEL 3 \ No newline at end of file +#define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json index c955b37fc2..66b4a3c2ed 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/info.json +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -4,6 +4,10 @@ "pid": "0x6509", "device_version": "0.0.1" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "indicators": { "caps_lock": "B9" }, diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h index aa8c9db9f3..f550a2e39a 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/config.h +++ b/keyboards/mechlovin/mechlovin9/rev2/config.h @@ -29,6 +29,3 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } #define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 } - -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json index 47fdf4973d..c0e94e7638 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/info.json +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -4,6 +4,10 @@ "pid": "0x6509", "device_version": "0.0.2" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "indicators": { "caps_lock": "A7" }, diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h index f58cbef78e..0f9a61426e 100644 --- a/keyboards/mechlovin/olly/bb/config.h +++ b/keyboards/mechlovin/olly/bb/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS {D6, A5, A4, A3, A6} -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B3 #define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index e5a55c5add..887e32d9a5 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json @@ -8,6 +8,10 @@ "pid": "0xD181", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "indicators": { "caps_lock": "B0", "num_lock": "B1", diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h index 7d29b1901e..2b42e66edc 100644 --- a/keyboards/mechlovin/olly/jf/config.h +++ b/keyboards/mechlovin/olly/jf/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B3 #define RGBLED_NUM 27 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index fdfe0dda91..86de2f1bfe 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -8,6 +8,10 @@ "pid": "0xD180", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "indicators": { "caps_lock": "B0", "num_lock": "B1", diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index ea0404eef5..1540505bad 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index f88f37c23c..19246528e7 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json @@ -8,6 +8,9 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "B2" }, diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h index 3e7092190a..abfafffd0d 100644 --- a/keyboards/mechlovin/serratus/config.h +++ b/keyboards/mechlovin/serratus/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json index 98fc8af770..e5125314cb 100644 --- a/keyboards/mechlovin/serratus/info.json +++ b/keyboards/mechlovin/serratus/info.json @@ -8,6 +8,10 @@ "pid": "0x0870", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "indicators": { "caps_lock": "D6", "num_lock": "D7", diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h index 3b4d904706..54cd52de76 100644 --- a/keyboards/mechlovin/tmkl/config.h +++ b/keyboards/mechlovin/tmkl/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json index f49d274979..5cdd06aa12 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/info.json @@ -7,6 +7,10 @@ "pid": "0xC601", "device_version": "0.0.1" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "indicators": { "caps_lock": "B9" }, diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h index 65b809de41..2066e16662 100644 --- a/keyboards/mehkee96/config.h +++ b/keyboards/mehkee96/config.h @@ -5,8 +5,6 @@ #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json index 82f8ef6717..40f4cd71b4 100644 --- a/keyboards/mehkee96/info.json +++ b/keyboards/mehkee96/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0" diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h index aa0e0e6097..a093ab8d37 100755 --- a/keyboards/melgeek/mj6xy/rev3/config.h +++ b/keyboards/melgeek/mj6xy/rev3/config.h @@ -22,14 +22,8 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN C6 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 10 -#endif - #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json new file mode 100644 index 0000000000..ccd7165a72 --- /dev/null +++ b/keyboards/melgeek/mj6xy/rev3/info.json @@ -0,0 +1,7 @@ +{ + "backlight": { + "driver": "software", + "pin": "B7", + "levels": 10 + } +} diff --git a/keyboards/melgeek/mj6xy/rev3/rules.mk b/keyboards/melgeek/mj6xy/rev3/rules.mk index 6559b3778b..51b869696a 100755 --- a/keyboards/melgeek/mj6xy/rev3/rules.mk +++ b/keyboards/melgeek/mj6xy/rev3/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -BACKLIGHT_DRIVER = software diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h index 44ef90ed66..cf96f9f4de 100644 --- a/keyboards/meme/config.h +++ b/keyboards/meme/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/meme/info.json b/keyboards/meme/info.json index 872a9523d1..500c76ebdf 100644 --- a/keyboards/meme/info.json +++ b/keyboards/meme/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h index b662589523..cde82e7341 100644 --- a/keyboards/merge/iso_macro/config.h +++ b/keyboards/merge/iso_macro/config.h @@ -19,7 +19,6 @@ #define MATRIX_ROW_PINS { F4, F5, F6} #define MATRIX_COL_PINS { B4, B5, B6} -#define BACKLIGHT_PIN B7 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json index 3c5f6d6784..123438a5be 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/info.json @@ -8,6 +8,9 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h index 8744fc0fd5..4cbb583321 100644 --- a/keyboards/merge/uma/config.h +++ b/keyboards/merge/uma/config.h @@ -19,8 +19,6 @@ #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } -#define BACKLIGHT_PIN C6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json index 0031f4ae8e..11ccd102a5 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/info.json @@ -8,6 +8,9 @@ "pid": "0x3232", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6" + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h index 7e259d0817..83501eb878 100644 --- a/keyboards/metamechs/timberwolf/config.h +++ b/keyboards/metamechs/timberwolf/config.h @@ -44,10 +44,6 @@ along with this program. If not, see . /* Reverse encoder direction */ // #define ENCODER_DIRECTION_FLIP -/* Backlighting code used for caps lock indicator */ -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 16 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/info.json index 87ee8d48a8..4d6e82eec6 100644 --- a/keyboards/metamechs/timberwolf/info.json +++ b/keyboards/metamechs/timberwolf/info.json @@ -8,6 +8,10 @@ "pid": "0x5754", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 16 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/metamechs/timberwolf/rules.mk b/keyboards/metamechs/timberwolf/rules.mk index 0a9f98774c..247b4e978a 100644 --- a/keyboards/metamechs/timberwolf/rules.mk +++ b/keyboards/metamechs/timberwolf/rules.mk @@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable encoder support LTO_ENABLE = yes - -BACKLIGHT_DRIVER = pwm diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h index 123d66fcdf..54a640366b 100644 --- a/keyboards/mntre/config.h +++ b/keyboards/mntre/config.h @@ -20,7 +20,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 #define BACKLIGHT_CUSTOM_RESOLUTION 0x400 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json index dd26827624..36426c3cc1 100644 --- a/keyboards/mntre/info.json +++ b/keyboards/mntre/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.2" }, "backlight": { + "pin": "B7", "max_brightness": 84 }, "processor": "atmega32u4", diff --git a/keyboards/mntre/rules.mk b/keyboards/mntre/rules.mk index ce8ecc4a9c..a56f94b312 100644 --- a/keyboards/mntre/rules.mk +++ b/keyboards/mntre/rules.mk @@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output OLED_ENABLE = yes -BACKLIGHT_DRIVER = pwm - diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 09e9b7bc73..6c90b66be5 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_CAPS_LOCK #define BACKLIGHT_DEFAULT_LEVEL 20 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json index 58768a1063..f046a8dffd 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -8,6 +8,11 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 20, + "as_caps_lock": true + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mokey/ginkgo65/config.h b/keyboards/mokey/ginkgo65/config.h deleted file mode 100644 index 320718238a..0000000000 --- a/keyboards/mokey/ginkgo65/config.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once -#define BACKLIGHT_CAPS_LOCK diff --git a/keyboards/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/info.json index c081cda703..81e3fe1a38 100644 --- a/keyboards/mokey/ginkgo65/info.json +++ b/keyboards/mokey/ginkgo65/info.json @@ -18,7 +18,8 @@ "backlight": { "pin": "B6", "levels": 6, - "breathing": true + "breathing": true, + "as_caps_lock": true }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h index 148a1ce5c2..c3f836fd12 100644 --- a/keyboards/mokey/ginkgo65hot/config.h +++ b/keyboards/mokey/ginkgo65hot/config.h @@ -17,8 +17,3 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_CAPS_LOCK -#define BACKLIGHT_BREATHING diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json index 9083672c7d..31427c7cb3 100644 --- a/keyboards/mokey/ginkgo65hot/info.json +++ b/keyboards/mokey/ginkgo65hot/info.json @@ -8,6 +8,12 @@ "pid": "0x3366", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6, + "breathing": true, + "as_caps_lock": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/monarch/config.h b/keyboards/monarch/config.h index 7708f0fc16..3f7a66bf06 100644 --- a/keyboards/monarch/config.h +++ b/keyboards/monarch/config.h @@ -26,13 +26,9 @@ along with this program. If not, see . #define ENCODERS_PAD_B { B5 } #define ENCODER_RESOLUTION 1 -//LEDS A6 -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 24 -#define BACKLIGHT_BREATHING #define SLEEP_LED_GPT_DRIVER GPTD1 diff --git a/keyboards/monarch/info.json b/keyboards/monarch/info.json index cb5239e915..c4d1362a5b 100644 --- a/keyboards/monarch/info.json +++ b/keyboards/monarch/info.json @@ -8,6 +8,11 @@ "pid": "0x43C1", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 24, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/monarch/rules.mk b/keyboards/monarch/rules.mk index bed35367eb..5a2c15a821 100644 --- a/keyboards/monarch/rules.mk +++ b/keyboards/monarch/rules.mk @@ -13,7 +13,5 @@ AUDIO_ENABLE = no # Audio output SLEEP_LED_ENABLE = yes ENCODER_ENABLE = yes -BACKLIGHT_DRIVER = pwm - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h index a4cf5c8038..65c76647ab 100644 --- a/keyboards/monstargear/xo87/solderable/config.h +++ b/keyboards/monstargear/xo87/solderable/config.h @@ -19,8 +19,6 @@ #define brightnessMax 8 -#define BACKLIGHT_PIN F0 - #define MATRIX_ROW_PINS { E6,E7,E3,B0,B1,A2} #define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 } diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json index 8a6e4984d6..f3a8ca1657 100644 --- a/keyboards/monstargear/xo87/solderable/info.json +++ b/keyboards/monstargear/xo87/solderable/info.json @@ -8,6 +8,10 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "pin": "F0" + }, "processor": "at90usb646", "bootloader": "lufa-dfu", "layouts": { diff --git a/keyboards/monstargear/xo87/solderable/rules.mk b/keyboards/monstargear/xo87/solderable/rules.mk index f015ea5d01..d845a512bb 100644 --- a/keyboards/monstargear/xo87/solderable/rules.mk +++ b/keyboards/monstargear/xo87/solderable/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -BACKLIGHT_DRIVER = custom diff --git a/keyboards/moon/config.h b/keyboards/moon/config.h index ce262dee84..dda1618522 100644 --- a/keyboards/moon/config.h +++ b/keyboards/moon/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 11 -/* Backlight */ -#define BACKLIGHT_PIN C6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/moon/info.json b/keyboards/moon/info.json index 5ad57b3867..153f6f74a9 100644 --- a/keyboards/moon/info.json +++ b/keyboards/moon/info.json @@ -8,6 +8,9 @@ "pid": "0xFCB8", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6" + }, "indicators": { "caps_lock": "B5", "scroll_lock": "B6" diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h index e2c8b53b73..bd4c880e3b 100644 --- a/keyboards/mt/blocked65/config.h +++ b/keyboards/mt/blocked65/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json index 3a76a3bc61..c16d04cd5b 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h index 61947facbc..8a77b3dc7b 100644 --- a/keyboards/mt/mt40/config.h +++ b/keyboards/mt/mt40/config.h @@ -52,8 +52,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D2 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* #define LOCKING_SUPPORT_ENABLE */ /* Locking resynchronize hack */ diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/info.json index 89b385472c..730cdf6c24 100644 --- a/keyboards/mt/mt40/info.json +++ b/keyboards/mt/mt40/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "backlight": { + "pin": "D2" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["planck_mit"], diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h index 01187d43a0..8a5dbe68f8 100644 --- a/keyboards/mt/mt980/config.h +++ b/keyboards/mt/mt980/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json index e1c9f2758f..59afd26650 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/mt/ncr80/solder/config.h b/keyboards/mt/ncr80/solder/config.h index f9463fc079..c6828a9323 100644 --- a/keyboards/mt/ncr80/solder/config.h +++ b/keyboards/mt/ncr80/solder/config.h @@ -31,7 +31,3 @@ #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } #define DIODE_DIRECTION ROW2COL - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json index 1718eae5fd..2005f45d48 100644 --- a/keyboards/mt/ncr80/solder/info.json +++ b/keyboards/mt/ncr80/solder/info.json @@ -8,6 +8,10 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "C6", "num_lock": "B5", diff --git a/keyboards/mt/split75/config.h b/keyboards/mt/split75/config.h index 0f18e23646..f954d5fd95 100644 --- a/keyboards/mt/split75/config.h +++ b/keyboards/mt/split75/config.h @@ -20,6 +20,4 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_SLEEP -#define BACKLIGHT_PIN D4 - #define I2C_START_RETRY_COUNT 1 diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json index 13f3e32c6f..e97d70bf3b 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/ncc1701kb/config.h b/keyboards/ncc1701kb/config.h index 09207fb27a..959be9fb72 100644 --- a/keyboards/ncc1701kb/config.h +++ b/keyboards/ncc1701kb/config.h @@ -22,10 +22,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D4, D6, D7 } #define MATRIX_COL_PINS { B4, B5, B6 } -/* BackLight */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /*Encoders */ #define ENCODERS_PAD_A { D0 } #define ENCODERS_PAD_B { D1 } diff --git a/keyboards/ncc1701kb/info.json b/keyboards/ncc1701kb/info.json index 41c76f52f5..9c26601ae9 100644 --- a/keyboards/ncc1701kb/info.json +++ b/keyboards/ncc1701kb/info.json @@ -8,6 +8,10 @@ "pid": "0x1701", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 1aa349df4c..b15db6b616 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -23,9 +23,6 @@ #define ENCODERS_PAD_B { B0 } #define ENCODER_RESOLUTION 4 -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 - #define GRAVE_ESC_CTRL_OVERRIDE /* RGB Light Configuration */ diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 36b8e0ba22..09457315a7 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "B5", + "levels": 5, "on_state": 0 }, "indicators": { diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h index 2bc08ae7c5..68374d3e40 100644 --- a/keyboards/neokeys/g67/soldered/config.h +++ b/keyboards/neokeys/g67/soldered/config.h @@ -32,10 +32,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 10 - #if defined(RGBLIGHT_ENABLE) #define RGB_DI_PIN F0 #define RGBLED_NUM 18 diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json index a97249e2e1..7b61a631d2 100644 --- a/keyboards/neokeys/g67/soldered/info.json +++ b/keyboards/neokeys/g67/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0x5053", "device_version": "1.0.0" }, + "backlight": { + "pin": "B6", + "levels": 10, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso", "65_iso_blocker"], diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h index 0219426f18..fa337fe426 100644 --- a/keyboards/nix_studio/oxalys80/config.h +++ b/keyboards/nix_studio/oxalys80/config.h @@ -33,8 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json index aa37b150f7..64e491cc41 100644 --- a/keyboards/nix_studio/oxalys80/info.json +++ b/keyboards/nix_studio/oxalys80/info.json @@ -8,6 +8,9 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "E6", "scroll_lock": "B2", diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h index 367603694c..0a91a41444 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ b/keyboards/nopunin10did/jabberwocky/v2/config.h @@ -21,8 +21,6 @@ #define MATRIX_ROW_PINS { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 } #define MATRIX_COL_PINS { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 } -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json index ea7f59ed8d..a2b9d5a02c 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/info.json @@ -9,7 +9,9 @@ "device_version": "0.2.0" }, "backlight": { - "pins": ["D6"] + "driver": "software", + "pins": ["D6"], + "levels": 6 }, "indicators": { "caps_lock": "B7", diff --git a/keyboards/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk index ae0d08d802..b325f3f0c7 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/rules.mk +++ b/keyboards/nopunin10did/jabberwocky/v2/rules.mk @@ -8,6 +8,5 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = software # Software-driven backlight driver RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h index f8c5b1ab39..ff56c34c91 100755 --- a/keyboards/novelkeys/novelpad/config.h +++ b/keyboards/novelkeys/novelpad/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 10 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json index d08adfe99f..ae77ec387c 100644 --- a/keyboards/novelkeys/novelpad/info.json +++ b/keyboards/novelkeys/novelpad/info.json @@ -8,6 +8,10 @@ "pid": "0x6070", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 10 + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4"], diff --git a/keyboards/noxary/220/config.h b/keyboards/noxary/220/config.h index dbbf043e26..047c2712a2 100644 --- a/keyboards/noxary/220/config.h +++ b/keyboards/noxary/220/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/noxary/220/info.json b/keyboards/noxary/220/info.json index 423b20a663..5fe00edef0 100644 --- a/keyboards/noxary/220/info.json +++ b/keyboards/noxary/220/info.json @@ -8,6 +8,10 @@ "pid": "0x0899", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h index da5e664de5..4eb386df73 100644 --- a/keyboards/noxary/260/config.h +++ b/keyboards/noxary/260/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/noxary/260/info.json b/keyboards/noxary/260/info.json index 54328d3165..9e9763f4b0 100644 --- a/keyboards/noxary/260/info.json +++ b/keyboards/noxary/260/info.json @@ -8,6 +8,10 @@ "pid": "0x0A29", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "B1", "on_state": 0 diff --git a/keyboards/noxary/268/config.h b/keyboards/noxary/268/config.h index 8037caa96a..0808bb996f 100644 --- a/keyboards/noxary/268/config.h +++ b/keyboards/noxary/268/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/noxary/268/info.json b/keyboards/noxary/268/info.json index 842c397022..5c89fb242d 100644 --- a/keyboards/noxary/268/info.json +++ b/keyboards/noxary/268/info.json @@ -8,6 +8,9 @@ "pid": "0x0A79", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h index 8153787c93..b0c97a0c74 100644 --- a/keyboards/noxary/268_2/config.h +++ b/keyboards/noxary/268_2/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json index 80dafd23b9..fcba339ef5 100644 --- a/keyboards/noxary/268_2/info.json +++ b/keyboards/noxary/268_2/info.json @@ -8,6 +8,9 @@ "pid": "0x0A7A", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h index e3fa886915..c6460002a9 100644 --- a/keyboards/noxary/268_2_rgb/config.h +++ b/keyboards/noxary/268_2_rgb/config.h @@ -31,8 +31,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* ws2812b options */ #define RGB_DI_PIN B5 #ifdef RGB_DI_PIN diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json index 7b52a82966..9016300e25 100644 --- a/keyboards/noxary/268_2_rgb/info.json +++ b/keyboards/noxary/268_2_rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x0A7C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/noxary/280/config.h b/keyboards/noxary/280/config.h index e1f29f502f..d46eb41347 100644 --- a/keyboards/noxary/280/config.h +++ b/keyboards/noxary/280/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/noxary/280/info.json b/keyboards/noxary/280/info.json index 8f9b2aafc9..d606490b98 100644 --- a/keyboards/noxary/280/info.json +++ b/keyboards/noxary/280/info.json @@ -8,6 +8,10 @@ "pid": "0x0AF1", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h index 05d4dded48..f40f846d61 100644 --- a/keyboards/noxary/x268/config.h +++ b/keyboards/noxary/x268/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* ws2812b options */ #define RGB_DI_PIN B5 #ifdef RGB_DI_PIN diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json index bbc0eacdad..ee616992dd 100644 --- a/keyboards/noxary/x268/info.json +++ b/keyboards/noxary/x268/info.json @@ -8,6 +8,9 @@ "pid": "0x0A7B", "device_version": "0.7.8" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h index 31d75a7690..c2e9c2b6bb 100644 --- a/keyboards/oddforge/vea/config.h +++ b/keyboards/oddforge/vea/config.h @@ -39,5 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9 - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json index 97d6b19265..06e71e1be2 100644 --- a/keyboards/oddforge/vea/info.json +++ b/keyboards/oddforge/vea/info.json @@ -8,6 +8,9 @@ "pid": "0x4155", "device_version": "1.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h index d525f491a3..2dd38f77d0 100644 --- a/keyboards/ok60/config.h +++ b/keyboards/ok60/config.h @@ -31,13 +31,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json index 1413a3ca64..08cb263a2e 100644 --- a/keyboards/ok60/info.json +++ b/keyboards/ok60/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb"], diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index 1297450b3e..6adcf7253c 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -31,11 +31,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -#ifdef BACKLIGHT_ENABLE - #define BACKLIGHT_PIN B6 - #define BACKLIGHT_LEVELS 7 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 22ab94477a..4b5bd3bb70 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "backlight": { + "pin": "B6", + "levels": 7 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 802cbcae05..21bd3d4f7b 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -31,11 +31,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -#ifdef BACKLIGHT_ENABLE - #define BACKLIGHT_PIN B6 - #define BACKLIGHT_LEVELS 7 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index 44a6955e25..d11b84b733 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "backlight": { + "pin": "B6", + "levels": 7 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h index b35799caac..3d9fe1d327 100644 --- a/keyboards/orange75/config.h +++ b/keyboards/orange75/config.h @@ -7,8 +7,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/orange75/info.json b/keyboards/orange75/info.json index 9aa445afb2..67fc8db76d 100644 --- a/keyboards/orange75/info.json +++ b/keyboards/orange75/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index e3fedecc2e..44701c7e17 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index e537bb65cc..83da161e31 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "F5", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h index 6455bb1a72..32e6c4bd38 100644 --- a/keyboards/panc60/config.h +++ b/keyboards/panc60/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json index 05f916f248..4daeffe763 100644 --- a/keyboards/panc60/info.json +++ b/keyboards/panc60/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h index d490e7e75b..51e4b85e74 100644 --- a/keyboards/pearl/config.h +++ b/keyboards/pearl/config.h @@ -29,8 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 12 -#define BACKLIGHT_PIN D4 - #define MATRIX_ROW_PINS { B0, B1, B2, B3 } #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3} diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json index 3808bdecf4..96357ad346 100644 --- a/keyboards/pearl/info.json +++ b/keyboards/pearl/info.json @@ -7,6 +7,9 @@ "pid": "0x0348", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h index 6fe2567688..b452a0dcb6 100644 --- a/keyboards/percent/booster/config.h +++ b/keyboards/percent/booster/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D1, D6, D7, B4, B5 } #define MATRIX_COL_PINS { C7, D4, D2, D0 } -#define BACKLIGHT_PIN B7 - #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN E2 diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json index d17ba98f05..f92476c9f6 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/info.json @@ -8,6 +8,9 @@ "pid": "0x4253", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h index ff08476a5c..69f53905fc 100644 --- a/keyboards/percent/canoe/config.h +++ b/keyboards/percent/canoe/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json index 18d57bce99..951e55ec64 100644 --- a/keyboards/percent/canoe/info.json +++ b/keyboards/percent/canoe/info.json @@ -8,6 +8,9 @@ "pid": "0x434E", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h index bbd6a7470c..274d30df72 100644 --- a/keyboards/percent/skog/config.h +++ b/keyboards/percent/skog/config.h @@ -32,6 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json index 5d461b67a4..80c7d832c4 100644 --- a/keyboards/percent/skog/info.json +++ b/keyboards/percent/skog/info.json @@ -8,6 +8,10 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 5 + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h index 94dbb85d04..b00a612cd7 100644 --- a/keyboards/percent/skog_lite/config.h +++ b/keyboards/percent/skog_lite/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json index 8b126296e6..74abc67bdc 100644 --- a/keyboards/percent/skog_lite/info.json +++ b/keyboards/percent/skog_lite/info.json @@ -8,6 +8,9 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index 165e6dcc5c..ff4b7bb3aa 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h index 862751d6b6..7a64f87174 100644 --- a/keyboards/planck/light/config.h +++ b/keyboards/planck/light/config.h @@ -12,10 +12,6 @@ #define AUDIO_PIN C6 #define AUDIO_PIN_ALT B5 -#undef BACKLIGHT_PIN - -#define BACKLIGHT_PIN A5 - #define NO_USB_STARTUP_CHECK #define PLANCK_MIT_LAYOUT diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json index ed23c14828..c2ab19563e 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/info.json @@ -8,6 +8,9 @@ "pid": "0xBEA2", "device_version": "0.0.1" }, + "backlight": { + "pin": "A5" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json index 6829001b0e..ebf11c9c8b 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xAE01", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json index 2f36673b1e..b7a3a31628 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0xAE01", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json index 5479a93d93..4ba0085cda 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/info.json @@ -8,6 +8,9 @@ "pid": "0xAE01", "device_version": "0.0.3" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json index 2c3c9e842b..46513d8248 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/info.json @@ -8,6 +8,9 @@ "pid": "0xAE01", "device_version": "0.0.4" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index cd76c7e2ad..9fb2ae811e 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -8,6 +8,9 @@ "pid": "0xAE01", "device_version": "0.0.5" }, + "backlight": { + "pin": "B7" + }, "qmk_lufa_bootloader": { "esc_input": "D5", "esc_output": "F1", diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h index acaa94d4dd..1c1085c9a1 100644 --- a/keyboards/playkbtw/ca66/config.h +++ b/keyboards/playkbtw/ca66/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F0 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json index 8537254d54..809eaa0c39 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "F0" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h index f08764bf5b..b91943278f 100644 --- a/keyboards/playkbtw/helen80/config.h +++ b/keyboards/playkbtw/helen80/config.h @@ -32,8 +32,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 87 diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h index f637d22d50..42f15b3352 100644 --- a/keyboards/playkbtw/pk60/config.h +++ b/keyboards/playkbtw/pk60/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json index 6c9094d253..5909204f29 100644 --- a/keyboards/playkbtw/pk60/info.json +++ b/keyboards/playkbtw/pk60/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "indicators": { "caps_lock": "F4", "on_state": 0 diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h index f01184dea2..63cc719d84 100644 --- a/keyboards/plut0nium/0x3e/config.h +++ b/keyboards/plut0nium/0x3e/config.h @@ -27,13 +27,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* - * Backlight - */ -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 6 - /* * RGB Underglow */ diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json index 8c112f3463..52ad743a0a 100644 --- a/keyboards/plut0nium/0x3e/info.json +++ b/keyboards/plut0nium/0x3e/info.json @@ -8,6 +8,11 @@ "pid": "0x3E01", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 6, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h index 66775a7839..3332d62aa6 100644 --- a/keyboards/poker87c/config.h +++ b/keyboards/poker87c/config.h @@ -32,8 +32,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 95 diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json index 247436cc11..04c16583a6 100644 --- a/keyboards/poker87c/info.json +++ b/keyboards/poker87c/info.json @@ -8,6 +8,9 @@ "pid": "0x087C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "B3", "num_lock": "B1", diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h index f4bbc85bef..fbee1e1858 100644 --- a/keyboards/poker87d/config.h +++ b/keyboards/poker87d/config.h @@ -32,8 +32,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 125 diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json index 20e85800d8..22a09c541e 100644 --- a/keyboards/poker87d/info.json +++ b/keyboards/poker87d/info.json @@ -8,6 +8,9 @@ "pid": "0x087D", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "B3", "num_lock": "B1", diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h index e45ed0910d..6cb2e62308 100644 --- a/keyboards/polycarbdiet/s20/config.h +++ b/keyboards/polycarbdiet/s20/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json index d37ec49dcb..5c2ce53150 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/info.json @@ -8,6 +8,10 @@ "pid": "0x7320", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h index e5237bea16..e59d45ca45 100644 --- a/keyboards/pom_keyboards/tnln95/config.h +++ b/keyboards/pom_keyboards/tnln95/config.h @@ -33,10 +33,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 10 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json index e3a0930584..ea829767ba 100644 --- a/keyboards/pom_keyboards/tnln95/info.json +++ b/keyboards/pom_keyboards/tnln95/info.json @@ -8,6 +8,11 @@ "pid": "0x3931", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 10, + "breathing": true + }, "bootmagic": { "matrix": [0, 4] }, diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 494c15c516..c3a49487ef 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json index 6da254960b..340c178635 100644 --- a/keyboards/preonic/rev1/info.json +++ b/keyboards/preonic/rev1/info.json @@ -6,6 +6,9 @@ "pid": "0x67F3", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x12"] diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json index 4392f2e964..3da1615c2d 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/info.json @@ -6,6 +6,9 @@ "pid": "0x67F3", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7" + }, "qmk_lufa_bootloader": { "esc_input": "B5", "esc_output": "F1", diff --git a/keyboards/primekb/prime_e/std/config.h b/keyboards/primekb/prime_e/std/config.h deleted file mode 100644 index eb111f5665..0000000000 --- a/keyboards/primekb/prime_e/std/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2019 Holten Campbell - -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 2 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 . -*/ - -#pragma once - - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/info.json index 04f8842546..b6078c9d7a 100644 --- a/keyboards/primekb/prime_e/std/info.json +++ b/keyboards/primekb/prime_e/std/info.json @@ -3,5 +3,9 @@ "usb": { "pid": "0x0051", "device_version": "0.0.1" + }, + "backlight": { + "pin": "B7", + "levels": 5 } } diff --git a/keyboards/primekb/prime_l/v1/config.h b/keyboards/primekb/prime_l/v1/config.h index 278d22c738..553674692a 100644 --- a/keyboards/primekb/prime_l/v1/config.h +++ b/keyboards/primekb/prime_l/v1/config.h @@ -22,7 +22,3 @@ along with this program. If not, see . /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 } #define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 } - -#define BACKLIGHT_PIN B6 -/*#define BACKLIGHT_BREATHING*/ -#define BACKLIGHT_LEVELS 4 diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json index 628aa67c10..967939ccbc 100644 --- a/keyboards/primekb/prime_l/v1/info.json +++ b/keyboards/primekb/prime_l/v1/info.json @@ -6,6 +6,10 @@ "pid": "0x504C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] diff --git a/keyboards/primekb/prime_m/config.h b/keyboards/primekb/prime_m/config.h index e876259f2c..46995b1d31 100644 --- a/keyboards/primekb/prime_m/config.h +++ b/keyboards/primekb/prime_m/config.h @@ -26,10 +26,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -/*#define BACKLIGHT_BREATHING*/ -#define BACKLIGHT_LEVELS 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/primekb/prime_m/info.json b/keyboards/primekb/prime_m/info.json index 32493fc6f3..ace8f6b52a 100644 --- a/keyboards/primekb/prime_m/info.json +++ b/keyboards/primekb/prime_m/info.json @@ -8,6 +8,10 @@ "pid": "0x504D", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 4 + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x6"], diff --git a/keyboards/primekb/prime_o/config.h b/keyboards/primekb/prime_o/config.h index a3e2879dfd..b67af66f47 100644 --- a/keyboards/primekb/prime_o/config.h +++ b/keyboards/primekb/prime_o/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -/*#define BACKLIGHT_BREATHING*/ -#define BACKLIGHT_LEVELS 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/primekb/prime_o/info.json b/keyboards/primekb/prime_o/info.json index b3d41057e4..774dbc6523 100644 --- a/keyboards/primekb/prime_o/info.json +++ b/keyboards/primekb/prime_o/info.json @@ -8,6 +8,10 @@ "pid": "0x4024", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 4 + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h index 6295b57769..d86696aef1 100644 --- a/keyboards/primekb/prime_r/config.h +++ b/keyboards/primekb/prime_r/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/primekb/prime_r/info.json b/keyboards/primekb/prime_r/info.json index ffddcee44f..e2e597c793 100644 --- a/keyboards/primekb/prime_r/info.json +++ b/keyboards/primekb/prime_r/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/projectkb/alice/info.json b/keyboards/projectkb/alice/info.json index f77f68441d..746a4ea9ca 100644 --- a/keyboards/projectkb/alice/info.json +++ b/keyboards/projectkb/alice/info.json @@ -8,6 +8,11 @@ "pid": "0xA71C", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h index ade5f8f27c..54918d2b49 100644 --- a/keyboards/projectkb/alice/rev1/config.h +++ b/keyboards/projectkb/alice/rev1/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h index a63f0b85a5..1ac58753c7 100644 --- a/keyboards/projectkb/alice/rev2/config.h +++ b/keyboards/projectkb/alice/rev2/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h index a3d304801b..95e391b036 100644 --- a/keyboards/prototypist/allison/config.h +++ b/keyboards/prototypist/allison/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/prototypist/allison/info.json b/keyboards/prototypist/allison/info.json index dbfb113af0..c8423baf41 100644 --- a/keyboards/prototypist/allison/info.json +++ b/keyboards/prototypist/allison/info.json @@ -8,6 +8,11 @@ "pid": "0x414D", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 4, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h index 19682dbcf2..c26d0b1e19 100644 --- a/keyboards/prototypist/allison_numpad/config.h +++ b/keyboards/prototypist/allison_numpad/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/prototypist/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/info.json index 1d503cae20..8931ff2dc4 100644 --- a/keyboards/prototypist/allison_numpad/info.json +++ b/keyboards/prototypist/allison_numpad/info.json @@ -8,6 +8,11 @@ "pid": "0x414E", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 4, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4", "numpad_6x4"], diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h index e958680717..4f003e3cfe 100644 --- a/keyboards/prototypist/j01/config.h +++ b/keyboards/prototypist/j01/config.h @@ -33,9 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/prototypist/j01/info.json b/keyboards/prototypist/j01/info.json index b62a49ecce..a5bf0c836a 100644 --- a/keyboards/prototypist/j01/info.json +++ b/keyboards/prototypist/j01/info.json @@ -8,6 +8,10 @@ "pid": "0x6A31", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h index 7a68675b5a..b3a4bf279e 100644 --- a/keyboards/quad_h/lb75/config.h +++ b/keyboards/quad_h/lb75/config.h @@ -35,9 +35,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index fa18f23ffa..386ba46067 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -8,6 +8,10 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/redscarf_i/config.h b/keyboards/redscarf_i/config.h index b17b1f3310..c9ee89dbe8 100644 --- a/keyboards/redscarf_i/config.h +++ b/keyboards/redscarf_i/config.h @@ -21,6 +21,3 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7 } #define DIODE_DIRECTION COL2ROW - -/* Backlight */ -#define BACKLIGHT_PIN B5 diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/info.json index 1f508df3f5..620c7e457a 100644 --- a/keyboards/redscarf_i/info.json +++ b/keyboards/redscarf_i/info.json @@ -8,6 +8,9 @@ "pid": "0x5959", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "ortho_6x4", "numpad_5x4", "numpad_6x4"], diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h index 2f89ed0fd0..c92878c147 100755 --- a/keyboards/redscarf_iiplus/verb/config.h +++ b/keyboards/redscarf_iiplus/verb/config.h @@ -39,8 +39,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json index 42879d8ee5..ed1acaa11e 100644 --- a/keyboards/redscarf_iiplus/verb/info.json +++ b/keyboards/redscarf_iiplus/verb/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "C7", "num_lock": "E6", diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h index 2f89ed0fd0..c92878c147 100755 --- a/keyboards/redscarf_iiplus/verc/config.h +++ b/keyboards/redscarf_iiplus/verc/config.h @@ -39,8 +39,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json index fa425fa85d..cd8470a5ce 100644 --- a/keyboards/redscarf_iiplus/verc/info.json +++ b/keyboards/redscarf_iiplus/verc/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "C7", "num_lock": "E6", diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h index cbebb99f40..08ba1b48d8 100644 --- a/keyboards/redscarf_iiplus/verd/config.h +++ b/keyboards/redscarf_iiplus/verd/config.h @@ -38,8 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/redscarf_iiplus/verd/info.json b/keyboards/redscarf_iiplus/verd/info.json index 74c63bc54f..23488e734f 100644 --- a/keyboards/redscarf_iiplus/verd/info.json +++ b/keyboards/redscarf_iiplus/verd/info.json @@ -8,6 +8,9 @@ "pid": "0x7778", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "C6", "num_lock": "E6", diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h index e576982cf1..4fa5e6e18b 100644 --- a/keyboards/rmi_kb/wete/v1/config.h +++ b/keyboards/rmi_kb/wete/v1/config.h @@ -21,13 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A9, B12, B11, B10, B2, B1 } #define DIODE_DIRECTION COL2ROW -//LEDS A6 -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 24 -#define BACKLIGHT_BREATHING // RGB B4 #define RGB_DI_PIN B4 diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json index f36f7cefa7..cf17e5966d 100644 --- a/keyboards/rmi_kb/wete/v1/info.json +++ b/keyboards/rmi_kb/wete/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x00B5", "device_version": "0.1.2" }, + "backlight": { + "pin": "A6", + "levels": 24, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h index 05e901524a..a0625ed46f 100755 --- a/keyboards/ryloo_studio/m0110/config.h +++ b/keyboards/ryloo_studio/m0110/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json index 28eec374d9..251737d61e 100644 --- a/keyboards/ryloo_studio/m0110/info.json +++ b/keyboards/ryloo_studio/m0110/info.json @@ -8,6 +8,10 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb"], diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h index 9a89cb2560..0a235bd36c 100644 --- a/keyboards/sam/s80/config.h +++ b/keyboards/sam/s80/config.h @@ -32,8 +32,6 @@ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 20 diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index 39de786a79..ab0cde43a1 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -8,6 +8,9 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h index 23c2cbe484..d12d01cb38 100644 --- a/keyboards/sandwich/keeb68/config.h +++ b/keyboards/sandwich/keeb68/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN C7 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json index f8c50fbd10..ed30bd810a 100644 --- a/keyboards/sandwich/keeb68/info.json +++ b/keyboards/sandwich/keeb68/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "C7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index 8e5be4d533..0d96be0baf 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 13 diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index d39336e2e4..5b7af3fb0f 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -7,6 +7,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "url": "https://sentraq.com/collections/kits/products/number-pad-rgb-kit", diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h index 3f073551d1..01ce1f2e65 100644 --- a/keyboards/sentraq/s60_x/default/config.h +++ b/keyboards/sentraq/s60_x/default/config.h @@ -5,11 +5,6 @@ #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 } -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json index 2e98820a02..ae5728a679 100644 --- a/keyboards/sentraq/s60_x/default/info.json +++ b/keyboards/sentraq/s60_x/default/info.json @@ -1,5 +1,9 @@ { "keyboard_name": "S60-X", + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index 178b6c3027..2332b484e1 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -5,11 +5,6 @@ #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json index b29f71288b..6420a8069a 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -1,5 +1,9 @@ { "keyboard_name": "S60-X-RGB", + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 648c758462..3b8323074f 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -5,8 +5,6 @@ #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 } -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index 0e9f0fce75..3d9f6d1f21 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index cc31fdfd19..e8d1cb933d 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -5,10 +5,6 @@ #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } #define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_CAPS_LOCK - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index 6b77754a65..a37852080c 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "as_caps_lock": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_iso"], diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h index 2540c59465..3e9694ca36 100644 --- a/keyboards/singa/config.h +++ b/keyboards/singa/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json index 6a1271e237..3784c7232a 100644 --- a/keyboards/singa/info.json +++ b/keyboards/singa/info.json @@ -8,6 +8,9 @@ "pid": "0x7575", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 56bdd8e8c9..5307bcd65a 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 8 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index cf326cff80..39b296a679 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xB5E9", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 8, + "breathing": true + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index 5f140d1f25..095b95d13c 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 8 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index 20c94f4625..32ed0e6f0e 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0xB5E8", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 8, + "breathing": true + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/smithrune/iron165r2/f072/config.h b/keyboards/smithrune/iron165r2/f072/config.h index 28ab38b25e..21702a94a6 100644 --- a/keyboards/smithrune/iron165r2/f072/config.h +++ b/keyboards/smithrune/iron165r2/f072/config.h @@ -17,12 +17,9 @@ along with this program. If not, see . #pragma once -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 22 diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json index 8bba6f5d5d..a4171d423e 100644 --- a/keyboards/smithrune/iron165r2/f072/info.json +++ b/keyboards/smithrune/iron165r2/f072/info.json @@ -1,4 +1,9 @@ { + "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu" } diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk index 1b6ec31817..8b584c9a42 100644 --- a/keyboards/smithrune/iron165r2/f072/rules.mk +++ b/keyboards/smithrune/iron165r2/f072/rules.mk @@ -12,7 +12,6 @@ AUDIO_ENABLE = no # Audio output LTO_ENABLE = no ENCODER_ENABLE = no BACKLIGHT_ENABLE = yes -BACKLIGHT_DRIVER = pwm # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h index 832c40e1cc..88ff1d167a 100644 --- a/keyboards/smithrune/iron165r2/f411/config.h +++ b/keyboards/smithrune/iron165r2/f411/config.h @@ -17,12 +17,9 @@ along with this program. If not, see . #pragma once -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 22 diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json index 8610c8de5f..e3a63f8764 100644 --- a/keyboards/smithrune/iron165r2/f411/info.json +++ b/keyboards/smithrune/iron165r2/f411/info.json @@ -1,4 +1,9 @@ { + "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true + }, "processor": "STM32F411", "bootloader": "stm32-dfu" } diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk index 3fcdaacb60..b5b0582d5d 100644 --- a/keyboards/smithrune/iron165r2/f411/rules.mk +++ b/keyboards/smithrune/iron165r2/f411/rules.mk @@ -13,7 +13,6 @@ LTO_ENABLE = no ENCODER_ENABLE = no EEPROM_DRIVER = i2c BACKLIGHT_ENABLE = yes -BACKLIGHT_DRIVER = pwm WS2812_DRIVER = pwm # Enter lower-power sleep mode when on the ChibiOS idle thread diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h index bec408edc8..92c28d5719 100644 --- a/keyboards/smithrune/iron180/config.h +++ b/keyboards/smithrune/iron180/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json index 3092b2021f..0f8c436240 100644 --- a/keyboards/smithrune/iron180/info.json +++ b/keyboards/smithrune/iron180/info.json @@ -8,6 +8,11 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h index 513a4963e9..265cb24f07 100644 --- a/keyboards/sowbug/68keys/config.h +++ b/keyboards/sowbug/68keys/config.h @@ -28,11 +28,6 @@ #define RGB_DI_PIN B9 -// Want backlighting and RGB Matrix patterns? See the note in the readme, -// apply the patches, and then uncomment the line below as well as the ones -// in rules.mk. -// -// #define BACKLIGHT_PIN rgb_matrix #define RGB_MATRIX_KEYPRESSES #define RGBLED_NUM 68 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h index 1c96bbac26..770a48b14d 100644 --- a/keyboards/sowbug/ansi_tkl/config.h +++ b/keyboards/sowbug/ansi_tkl/config.h @@ -83,9 +83,3 @@ #define ENABLE_RGB_MATRIX_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -// Want backlighting and RGB Matrix patterns? See the note in the readme, -// apply the patches, and then uncomment the line below as well as the ones -// in rules.mk. -// -// #define BACKLIGHT_PIN rgb_matrix diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h index 1b41c96d2c..a987f5782f 100644 --- a/keyboards/specskeys/config.h +++ b/keyboards/specskeys/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 1 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/specskeys/info.json b/keyboards/specskeys/info.json index 57e0b92d51..8a4ff0d90b 100644 --- a/keyboards/specskeys/info.json +++ b/keyboards/specskeys/info.json @@ -8,6 +8,10 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 1 + }, "indicators": { "caps_lock": "C7", "scroll_lock": "C6" diff --git a/keyboards/spiderisland/split78/config.h b/keyboards/spiderisland/split78/config.h index 1f4772169e..6769ee2feb 100644 --- a/keyboards/spiderisland/split78/config.h +++ b/keyboards/spiderisland/split78/config.h @@ -22,7 +22,4 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 14 -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING - #define I2C_START_RETRY_COUNT 1 diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json index 27ab69b27b..74a49c57e3 100644 --- a/keyboards/spiderisland/split78/info.json +++ b/keyboards/spiderisland/split78/info.json @@ -8,6 +8,10 @@ "pid": "0xF4E4", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "processor": "atmega32a", "bootloader": "bootloadhid", "debounce": 50, diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h index 600d8bb156..058b582c36 100644 --- a/keyboards/subatomic/config.h +++ b/keyboards/subatomic/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . // #define AUDIO_VOICES // #define AUDIO_PIN C6 -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/subatomic/info.json b/keyboards/subatomic/info.json index 2b8546be71..99af17a9b7 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/info.json @@ -8,6 +8,9 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h index bfd3cb0cc1..598ac367b3 100644 --- a/keyboards/switchplate/southpaw_65/config.h +++ b/keyboards/switchplate/southpaw_65/config.h @@ -37,9 +37,6 @@ /* COL2ROW, ROW2COL */ //#define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 10 - #define RGB_DI_PIN C7 #define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json index a59c899bd6..97cff66a16 100644 --- a/keyboards/switchplate/southpaw_65/info.json +++ b/keyboards/switchplate/southpaw_65/info.json @@ -8,6 +8,10 @@ "pid": "0x4084", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 10 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h index 4f2ad82c45..92247d7951 100644 --- a/keyboards/switchplate/southpaw_fullsize/config.h +++ b/keyboards/switchplate/southpaw_fullsize/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json index 507ed097bc..1b1cda7d2f 100644 --- a/keyboards/switchplate/southpaw_fullsize/info.json +++ b/keyboards/switchplate/southpaw_fullsize/info.json @@ -8,6 +8,9 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h index d18bb40c3c..adb547468a 100644 --- a/keyboards/switchplate/switchplate910/config.h +++ b/keyboards/switchplate/switchplate910/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/info.json index cdc9291765..5807471094 100644 --- a/keyboards/switchplate/switchplate910/info.json +++ b/keyboards/switchplate/switchplate910/info.json @@ -8,6 +8,9 @@ "pid": "0x2065", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index 2fb26e4fc0..46921665c9 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -32,8 +32,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json index b4b93b2cad..9c0b6bcf9a 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/info.json @@ -8,6 +8,9 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "F4", "num_lock": "F5", diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h index 6781107ec6..e99d3e1255 100755 --- a/keyboards/tada68/config.h +++ b/keyboards/tada68/config.h @@ -31,11 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json index 53ac1a5bfc..73dd33330b 100644 --- a/keyboards/tada68/info.json +++ b/keyboards/tada68/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "levels": 4, + "breathing": true + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h index 3b0c746dd7..fc5c288264 100644 --- a/keyboards/team0110/p1800fl/config.h +++ b/keyboards/team0110/p1800fl/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* RGB Lighting */ #define RGB_DI_PIN C6 #ifdef RGB_DI_PIN diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json index 3abaaf33b7..118299101b 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/info.json @@ -8,6 +8,11 @@ "pid": "0x3EAE", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h index 8f383b8710..fdc08d244c 100644 --- a/keyboards/tgr/910/config.h +++ b/keyboards/tgr/910/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json index 3c4de6fe39..65aabe6ca8 100644 --- a/keyboards/tgr/910/info.json +++ b/keyboards/tgr/910/info.json @@ -8,6 +8,9 @@ "pid": "0x9100", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h index a868ebe1f9..5e5d28d5af 100644 --- a/keyboards/tgr/910ce/config.h +++ b/keyboards/tgr/910ce/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json index 77655f52af..2c5fcb40d9 100644 --- a/keyboards/tgr/910ce/info.json +++ b/keyboards/tgr/910ce/info.json @@ -8,6 +8,9 @@ "pid": "0x910C", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h index ba9171b989..d2e2f41a62 100644 --- a/keyboards/tgr/alice/config.h +++ b/keyboards/tgr/alice/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json index 3586e49367..67cbcad7ea 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/info.json @@ -8,6 +8,9 @@ "pid": "0x422E", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/tgr/jane/v2/config.h b/keyboards/tgr/jane/v2/config.h index d0f00ac2bd..fa8fe1d455 100644 --- a/keyboards/tgr/jane/v2/config.h +++ b/keyboards/tgr/jane/v2/config.h @@ -23,5 +23,3 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json index f43d27c84f..4351782e57 100644 --- a/keyboards/tgr/jane/v2/info.json +++ b/keyboards/tgr/jane/v2/info.json @@ -8,6 +8,9 @@ "pid": "0x4A4E", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/tgr/jane/v2ce/config.h b/keyboards/tgr/jane/v2ce/config.h index 0b3d381d19..485a2416e9 100644 --- a/keyboards/tgr/jane/v2ce/config.h +++ b/keyboards/tgr/jane/v2ce/config.h @@ -22,5 +22,3 @@ #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json index 3aa62ded58..b27eaf8e92 100644 --- a/keyboards/tgr/jane/v2ce/info.json +++ b/keyboards/tgr/jane/v2ce/info.json @@ -8,6 +8,9 @@ "pid": "0x4A43", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D6" diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h index 59d4fbb325..db1d1e1625 100644 --- a/keyboards/tgr/tris/config.h +++ b/keyboards/tgr/tris/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json index 6ce36ce819..91cce43327 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/info.json @@ -8,6 +8,9 @@ "pid": "0x5452", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "num_lock": "D0" }, diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h index c526ed05f9..ab5f20d40a 100644 --- a/keyboards/thevankeyboards/bananasplit/config.h +++ b/keyboards/thevankeyboards/bananasplit/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . #define DIODE_DIRECTION ROW2COL -/* mapping backlight LEDs to correct Pin */ -#define BACKLIGHT_PIN B7 - #define TAPPING_TERM 175 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json index 961a89c94f..1824e945cf 100644 --- a/keyboards/thevankeyboards/bananasplit/info.json +++ b/keyboards/thevankeyboards/bananasplit/info.json @@ -8,6 +8,9 @@ "pid": "0x8870", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso"], diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h index 8b59585bac..01959c10ad 100644 --- a/keyboards/tkc/california/config.h +++ b/keyboards/tkc/california/config.h @@ -36,11 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json index 0b50229db8..d7c95747c9 100644 --- a/keyboards/tkc/california/info.json +++ b/keyboards/tkc/california/info.json @@ -8,6 +8,10 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "F0", "num_lock": "F1" diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index dc94510953..7c09119e17 100644 --- a/keyboards/tkc/m0lly/config.h +++ b/keyboards/tkc/m0lly/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - - #define RGB_DI_PIN D7 #ifdef RGB_DI_PIN # define RGBLED_NUM 30 diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json index 61bb64dca2..8f6d63a74d 100644 --- a/keyboards/tkc/m0lly/info.json +++ b/keyboards/tkc/m0lly/info.json @@ -8,6 +8,10 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "qmk_lufa_bootloader": { "esc_input": "F4", "esc_output": "A0", diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h index a4a78406e6..b8f2806ef1 100644 --- a/keyboards/tkc/osav2/config.h +++ b/keyboards/tkc/osav2/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PIN D6 - #define BACKLIGHT_BREATHING - #define RGB_DI_PIN D4 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json index d718a790c4..ed842b4b51 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/info.json @@ -8,6 +8,10 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "backlight": { + "pin": "D6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h index 8e475e3ff2..747db6bf03 100644 --- a/keyboards/tkc/tkc1800/config.h +++ b/keyboards/tkc/tkc1800/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING - /* Underlight configuration */ #define RGB_DI_PIN D7 diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json index 0be83dbd53..ad57eb1aa5 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "qmk_lufa_bootloader": { "esc_input": "F4", "esc_output": "A0", diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h index 002979fcc0..ed701d2aa1 100644 --- a/keyboards/tkc/tkl_ab87/config.h +++ b/keyboards/tkc/tkl_ab87/config.h @@ -36,10 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json index 76f0c3f63e..6c610a6007 100644 --- a/keyboards/tkc/tkl_ab87/info.json +++ b/keyboards/tkc/tkl_ab87/info.json @@ -8,6 +8,10 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "F1", "scroll_lock": "F0" diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h index 09258f347c..1aac9574f8 100644 --- a/keyboards/tmo50/config.h +++ b/keyboards/tmo50/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json index 24d9e8296a..29b19aa513 100644 --- a/keyboards/tmo50/info.json +++ b/keyboards/tmo50/info.json @@ -8,6 +8,10 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index 9a98443470..26736637cb 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -14,12 +14,6 @@ along with this program. If not, see . #pragma once -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 31 -#define BACKLIGHT_BREATHING -#endif - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index 1113fbf392..513a883d8e 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -8,6 +8,11 @@ "pid": "0x4134", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 31, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index c29c92ad37..8ba921eaeb 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -1,10 +1,5 @@ #pragma once -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 6 -#endif - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index b39dff92bc..dd16c3f4c2 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h index ac28f080af..39f21310ca 100644 --- a/keyboards/tr60w/config.h +++ b/keyboards/tr60w/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json index 09e236dbd2..15025926ce 100644 --- a/keyboards/tr60w/info.json +++ b/keyboards/tr60w/info.json @@ -8,6 +8,9 @@ "pid": "0x4140", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h index 288cbe0549..35b03eebfb 100644 --- a/keyboards/treasure/type9/config.h +++ b/keyboards/treasure/type9/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 10 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json index 6abc631310..c2ed86346f 100644 --- a/keyboards/treasure/type9/info.json +++ b/keyboards/treasure/type9/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 10 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/treasure/type9s2/config.h b/keyboards/treasure/type9s2/config.h index e94a269caa..f4e04317ce 100644 --- a/keyboards/treasure/type9s2/config.h +++ b/keyboards/treasure/type9s2/config.h @@ -23,5 +23,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json index ce99c159da..bcb719c76f 100644 --- a/keyboards/treasure/type9s2/info.json +++ b/keyboards/treasure/type9s2/info.json @@ -8,6 +8,9 @@ "pid": "0x5492", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h index 9ef23769f1..bb2bd6f6e2 100644 --- a/keyboards/tzarc/djinn/config.h +++ b/keyboards/tzarc/djinn/config.h @@ -49,7 +49,6 @@ #endif // LCD_ACTIVITY_TIMEOUT // Backlight driver (to control LCD backlight) -#define BACKLIGHT_LEVELS 4 #define BACKLIGHT_PWM_DRIVER PWMD17 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index 08634983c8..cceaf637e5 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -30,7 +30,8 @@ "cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"] }, "backlight": { - "pin": "A7" + "pin": "A7", + "levels": 4 }, "split": { "enabled": true, diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk index 2f343a5a9d..9b81a4bfaf 100644 --- a/keyboards/tzarc/djinn/rules.mk +++ b/keyboards/tzarc/djinn/rules.mk @@ -2,8 +2,6 @@ CUSTOM_MATRIX = lite SERIAL_DRIVER = usart -BACKLIGHT_DRIVER = pwm - WS2812_DRIVER = pwm CIE1931_CURVE = yes diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h index feb3d468b2..75551832f1 100644 --- a/keyboards/ubest/vn/config.h +++ b/keyboards/ubest/vn/config.h @@ -32,8 +32,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 8 diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json index ab4df7d838..348a51fc7a 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/info.json @@ -8,6 +8,9 @@ "pid": "0x0868", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, "indicators": { "caps_lock": "B3", "num_lock": "B1", diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index c03e419ab2..3a9e21ea60 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json index 06c6626a0a..fbbc15609c 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/info.json @@ -8,6 +8,9 @@ "pid": "0x004E", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h index d845d8a2f3..c9a5d49447 100644 --- a/keyboards/unikeyboard/diverge3/config.h +++ b/keyboards/unikeyboard/diverge3/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #ifndef SELECT_SOFT_SERIAL_SPEED #define SELECT_SOFT_SERIAL_SPEED 3 #endif diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index 65f72af3be..c2caaca881 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -8,6 +8,11 @@ "pid": "0x1257", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 5, + "breathing": true + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h index 2f0740c8f1..a3a667d632 100644 --- a/keyboards/unikeyboard/felix/config.h +++ b/keyboards/unikeyboard/felix/config.h @@ -17,9 +17,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN C6 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json index f8ebb75424..ee74cb134f 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x4"], diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h index d1c71a801e..fc91f5138f 100644 --- a/keyboards/unikorn/config.h +++ b/keyboards/unikorn/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 17 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json index 8a6b47624b..b894a98dac 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/info.json @@ -8,6 +8,9 @@ "pid": "0x556B", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h index 074b7311a6..9677a8e262 100644 --- a/keyboards/utd80/config.h +++ b/keyboards/utd80/config.h @@ -21,9 +21,6 @@ #define MATRIX_ROW_PINS { B4, D5, D0, B2, B3, B0 } #define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, C7, C6, D3, E6, D7, D6, D4, D2, D1 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json index 22e83c6f70..cf0b6530ad 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/info.json @@ -8,6 +8,10 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "B6", "scroll_lock": "B5" diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h index f2af33616e..3c76b77bce 100644 --- a/keyboards/v60_type_r/config.h +++ b/keyboards/v60_type_r/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F7 - #define RGBLED_NUM 1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json index f107f27aa4..e37ccc9543 100644 --- a/keyboards/v60_type_r/info.json +++ b/keyboards/v60_type_r/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F7", "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h index 856a1136d6..028b00de10 100644 --- a/keyboards/waldo/config.h +++ b/keyboards/waldo/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } #define MATRIX_COL_PINS { F7, D5, D3, D2, B3, B2, C7, C6, B6, B5, B4, D7, D6, D4, B1 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json index 277664fd71..0c85e1d8d5 100644 --- a/keyboards/waldo/info.json +++ b/keyboards/waldo/info.json @@ -7,6 +7,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h index 5324f76114..84f3444730 100644 --- a/keyboards/walletburner/neuron/config.h +++ b/keyboards/walletburner/neuron/config.h @@ -8,8 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index 4ec99fa5ef..70f820c25e 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/config.h @@ -26,10 +26,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json index 65945c69a3..4c3e9bf058 100644 --- a/keyboards/westfoxtrot/aanzee/info.json +++ b/keyboards/westfoxtrot/aanzee/info.json @@ -8,6 +8,11 @@ "pid": "0xAA01", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h index 3a6d4a024a..a6e5ac891f 100644 --- a/keyboards/westfoxtrot/cypher/rev1/config.h +++ b/keyboards/westfoxtrot/cypher/rev1/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json index 192d78d468..5089486866 100644 --- a/keyboards/westfoxtrot/cypher/rev1/info.json +++ b/keyboards/westfoxtrot/cypher/rev1/info.json @@ -6,6 +6,11 @@ "pid": "0xAA97", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h index 794f2188b0..61604a74a9 100644 --- a/keyboards/westfoxtrot/cypher/rev5/config.h +++ b/keyboards/westfoxtrot/cypher/rev5/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -47,11 +44,6 @@ along with this program. If not, see . */ #define GRAVE_ESC_CTRL_OVERRIDE - - - -#define BACKLIGHT_PIN D0 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json index b2d4417af5..17bc326890 100644 --- a/keyboards/westfoxtrot/cypher/rev5/info.json +++ b/keyboards/westfoxtrot/cypher/rev5/info.json @@ -6,6 +6,11 @@ "pid": "0xAA98", "device_version": "0.0.2" }, + "backlight": { + "pin": "D0", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h index c3589cad99..be92b36639 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/config.h +++ b/keyboards/wilba_tech/rama_works_m10_b/config.h @@ -33,8 +33,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN C6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json index ea7c0ba833..4b7c87be21 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/info.json +++ b/keyboards/wilba_tech/rama_works_m10_b/info.json @@ -8,6 +8,9 @@ "pid": "0x00AB", "device_version": "0.0.1" }, + "backlight": { + "pin": "C6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h index 6d0d221922..ce27a1c563 100644 --- a/keyboards/winkeyless/b87/config.h +++ b/keyboards/winkeyless/b87/config.h @@ -36,5 +36,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json index 0d53604cd1..542cc74d27 100644 --- a/keyboards/winkeyless/b87/info.json +++ b/keyboards/winkeyless/b87/info.json @@ -8,6 +8,9 @@ "pid": "0x0B87", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h index d2ad985cae..cbb0be707d 100644 --- a/keyboards/winkeyless/bface/config.h +++ b/keyboards/winkeyless/bface/config.h @@ -35,5 +35,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json index e19e42e577..f7a8c61032 100644 --- a/keyboards/winkeyless/bface/info.json +++ b/keyboards/winkeyless/bface/info.json @@ -8,6 +8,9 @@ "pid": "0x4246", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h index 8589b74f37..033807a3f5 100644 --- a/keyboards/winkeyless/bmini/config.h +++ b/keyboards/winkeyless/bmini/config.h @@ -34,5 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_PIN D4 diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json index e096f860cc..58edbac998 100644 --- a/keyboards/winkeyless/bmini/info.json +++ b/keyboards/winkeyless/bmini/info.json @@ -8,6 +8,9 @@ "pid": "0x424D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h index b145f25348..351de6f475 100644 --- a/keyboards/winkeyless/bminiex/config.h +++ b/keyboards/winkeyless/bminiex/config.h @@ -34,6 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json index 65d888eaec..afd766f480 100644 --- a/keyboards/winkeyless/bminiex/info.json +++ b/keyboards/winkeyless/bminiex/info.json @@ -8,6 +8,10 @@ "pid": "0x4258", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 5 + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h index 6787d262ca..c0150fce0b 100644 --- a/keyboards/wolf/sabre/config.h +++ b/keyboards/wolf/sabre/config.h @@ -35,5 +35,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B7 diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json index 5dd8aba471..40ee60a6d0 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/info.json @@ -8,6 +8,9 @@ "pid": "0x0055", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "B3", "scroll_lock": "B0", diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk index c53a08ce4a..e7cc37d18d 100644 --- a/keyboards/wolf/sabre/rules.mk +++ b/keyboards/wolf/sabre/rules.mk @@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output BACKLIGHT_ENABLE = yes -BACKLIGHT_DRIVER = pwm \ No newline at end of file diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h index e5cb71fb4c..7664e747c7 100644 --- a/keyboards/wolf/ts60/config.h +++ b/keyboards/wolf/ts60/config.h @@ -52,7 +52,4 @@ along with this program. If not, see . #define RGBLIGHT_SLEEP #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL -/* Define Per Key Backlight */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 6 #define BACKLIGHT_DEFAULT_LEVEL 6 diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json index e3d2a375e3..8b40cd6ff2 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/info.json @@ -8,6 +8,10 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/woodkeys/meira/config.h b/keyboards/woodkeys/meira/config.h index e611ebf11f..f1434fdbd4 100644 --- a/keyboards/woodkeys/meira/config.h +++ b/keyboards/woodkeys/meira/config.h @@ -25,10 +25,7 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ //#define DIODE_DIRECTION -#ifdef BACKLIGHT_ENABLE -#define BACKLIGHT_LEVELS 10 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} -#endif #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN D3 diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 70d2600163..3a0ae1d190 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -8,6 +8,10 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 10 + }, "processor": "atmega32u4", "bootloader": "caterina", "layout_aliases": { diff --git a/keyboards/woodkeys/meira/meira.c b/keyboards/woodkeys/meira/meira.c index d8c04859e2..1f4c2557b0 100644 --- a/keyboards/woodkeys/meira/meira.c +++ b/keyboards/woodkeys/meira/meira.c @@ -18,7 +18,6 @@ #include "TWIlib.h" #include "lighting.h" #include "quantum.h" -#define BACKLIGHT_BREATHING extern void backlight_set(uint8_t level); diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk index 7f77c0a123..20802b3179 100644 --- a/keyboards/woodkeys/meira/rules.mk +++ b/keyboards/woodkeys/meira/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality, also set ISSI_ENABLE below for Meira -BACKLIGHT_DRIVER = custom ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h index 40ae37b57f..673e71eca8 100644 --- a/keyboards/x16/config.h +++ b/keyboards/x16/config.h @@ -33,9 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/x16/info.json b/keyboards/x16/info.json index 2fafd80695..b5e457d424 100644 --- a/keyboards/x16/info.json +++ b/keyboards/x16/info.json @@ -8,6 +8,10 @@ "pid": "0x016A", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 175b7873f3..a404780eea 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -7,6 +7,10 @@ "pid": "0x0404", "device_version": "0.0.1" }, + "backlight": { + "pin": "D5", + "levels": 6 + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 0b4e44336c..1e747adeaf 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -23,11 +23,6 @@ where some things are disabled to save space as well. #pragma once -/* Backlight Setup */ -// Looks like each backlight LED is connected to a single output, D5 is the one furtherst away from USB port -#define BACKLIGHT_PIN D5 -#define BACKLIGHT_LEVELS 6 - /* RGB Underglow This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk We do not have enough space in the flash for this at the moment, maybe diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h index 8641113690..43a56c9a92 100644 --- a/keyboards/xiudi/xd60/rev2/config.h +++ b/keyboards/xiudi/xd60/rev2/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json index 6d6d288d0c..1951e52dfe 100644 --- a/keyboards/xiudi/xd60/rev2/info.json +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -4,6 +4,8 @@ "pid": "0x6060" }, "backlight": { + "pin": "F5", + "levels": 6, "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h index 05acd6cba2..617d77b1de 100644 --- a/keyboards/xiudi/xd60/rev3/config.h +++ b/keyboards/xiudi/xd60/rev3/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json index 85e6a5d3f4..1b03e6c6e3 100644 --- a/keyboards/xiudi/xd60/rev3/info.json +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -4,6 +4,8 @@ "pid": "0x6363" }, "backlight": { + "pin": "F5", + "levels": 6, "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h index d1e69102e1..93181b668b 100644 --- a/keyboards/xiudi/xd68/config.h +++ b/keyboards/xiudi/xd68/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json index 5163e03127..8b1169474c 100644 --- a/keyboards/xiudi/xd68/info.json +++ b/keyboards/xiudi/xd68/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F5", + "levels": 6, + "breathing": true, "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h index b44c70e2c1..e4a2e0139e 100644 --- a/keyboards/xiudi/xd75/config.h +++ b/keyboards/xiudi/xd75/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - #define RGB_DI_PIN F6 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json index 0c45316080..54b1dc718b 100644 --- a/keyboards/xiudi/xd75/info.json +++ b/keyboards/xiudi/xd75/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F5", + "levels": 6, "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h index 6d1024d748..5908cc6d24 100644 --- a/keyboards/xiudi/xd84/config.h +++ b/keyboards/xiudi/xd84/config.h @@ -37,9 +37,6 @@ /* COL2ROW, ROW2COL */ //#define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 10 - #define RGB_DI_PIN C7 #define RGBLED_NUM 7 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json index a4d40e4fcd..60fed56bce 100644 --- a/keyboards/xiudi/xd84/info.json +++ b/keyboards/xiudi/xd84/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "B5", + "levels": 10, "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h index f9b059ef56..7390a6cd0a 100644 --- a/keyboards/xiudi/xd84pro/config.h +++ b/keyboards/xiudi/xd84pro/config.h @@ -42,9 +42,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #endif -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 10 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json index 87f1549c57..88968b933f 100644 --- a/keyboards/xiudi/xd84pro/info.json +++ b/keyboards/xiudi/xd84pro/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F5", + "levels": 10, "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h index 80abf8b7ee..42a49372ce 100644 --- a/keyboards/xiudi/xd87/config.h +++ b/keyboards/xiudi/xd87/config.h @@ -36,8 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D0 - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json index 6503d55bba..52d010ada5 100644 --- a/keyboards/xiudi/xd87/info.json +++ b/keyboards/xiudi/xd87/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "D0", "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h index 8e6c6601e7..5950630920 100644 --- a/keyboards/xiudi/xd96/config.h +++ b/keyboards/xiudi/xd96/config.h @@ -37,9 +37,6 @@ /* COL2ROW, ROW2COL */ //#define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 10 - #define RGB_DI_PIN C7 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json index c8a62379b2..7d60236491 100644 --- a/keyboards/xiudi/xd96/info.json +++ b/keyboards/xiudi/xd96/info.json @@ -8,6 +8,10 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 10 + }, "indicators": { "caps_lock": "B6", "num_lock": "C6", diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h index d9a06c2e2c..a3fcde472f 100644 --- a/keyboards/ydkb/chili/config.h +++ b/keyboards/ydkb/chili/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - /* Underlight configuration */ #define RGB_DI_PIN B3 diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json index 78a64c44ea..1ef666e69f 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "B2", "num_lock": "B1", diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h index 515ca47546..0b71d91e84 100644 --- a/keyboards/ydkb/grape/config.h +++ b/keyboards/ydkb/grape/config.h @@ -24,9 +24,6 @@ #define SN74X138_ADDRESS_PINS { D2, D1, D0 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E6 #define RGBLED_NUM 4 diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json index c9dbcb6136..1609ba2721 100644 --- a/keyboards/ydkb/grape/info.json +++ b/keyboards/ydkb/grape/info.json @@ -8,6 +8,10 @@ "pid": "0x6772", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "indicators": { "caps_lock": "F0", "num_lock": "F1", diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h index 0b4652da0e..9314f26bea 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 6 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index 0547091c2a..641fe31543 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -8,6 +8,10 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 6 + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 2a9a53dcab..1420387adb 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index 93c64be2cd..074e6c0485 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -8,6 +8,10 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index 631f9d5c0e..ce2e688bd7 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 12 -#define BACKLIGHT_BREATHING - #define RGBLED_NUM 5 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 31dc02f0cd..9d1e375cd9 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -7,6 +7,11 @@ "pid": "0x5021", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, "indicators": { "num_lock": "D0" }, diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index ab5642d682..0524cfd563 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -23,11 +23,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 31 -#endif - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 1d5ff5dbd7..dd4b532538 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,10 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "backlight": { + "pin": "B7", + "levels": 31 + }, "indicators": { "num_lock": "C6", "on_state": 0 diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index 757f474490..3b21cea4a6 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -32,9 +32,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 80e0c580a3..92f019bacb 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -8,6 +8,10 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 3b1e7f3182..055c93b327 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -30,9 +30,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 80 diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index e451d10d4d..8e72d4093a 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -8,6 +8,10 @@ "pid": "0x4975", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index 602144f294..82d7484aa8 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index 2d3777414e..84b42905c7 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -7,6 +7,10 @@ "vid": "0x594D", "pid": "0x604D" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h index 7716529d54..d07a8917df 100644 --- a/keyboards/ymdk/ym68/config.h +++ b/keyboards/ymdk/ym68/config.h @@ -32,10 +32,6 @@ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 20 diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index 5074716cf3..5d4d3913f8 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -8,6 +8,11 @@ "pid": "0xD896", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h index 494a299296..36cbd93891 100644 --- a/keyboards/ymdk/ymd21/v2/config.h +++ b/keyboards/ymdk/ymd21/v2/config.h @@ -32,9 +32,6 @@ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 8 diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index b5729091f6..84badccc5a 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -8,6 +8,10 @@ "pid": "0x0110", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h index 3304be6aac..21a027eab4 100644 --- a/keyboards/ymdk/ymd40/v2/config.h +++ b/keyboards/ymdk/ymd40/v2/config.h @@ -32,9 +32,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING - #if defined(RGBLIGHT_ENABLE) #define RGB_DI_PIN E2 #define RGBLED_NUM 8 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 55681cb2f0..375f8c8480 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -8,6 +8,10 @@ "pid": "0x4440", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index ee4bedbaaa..90f4ffed24 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -8,11 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index 39a823c830..f66e1533dd 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h index d384ae2479..5807ae4d8d 100644 --- a/keyboards/ymdk/ymd75/config.h +++ b/keyboards/ymdk/ymd75/config.h @@ -19,9 +19,6 @@ along with this program. If not, see . #pragma once - -#define BACKLIGHT_LEVELS 12 - #define RGB_DI_PIN E2 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h index 967bb1b226..d46c3bc010 100644 --- a/keyboards/ymdk/ymd75/rev1/config.h +++ b/keyboards/ymdk/ymd75/rev1/config.h @@ -21,5 +21,4 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define BACKLIGHT_PIN D4 #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json index 6dee7f2d94..967dd3de95 100644 --- a/keyboards/ymdk/ymd75/rev1/info.json +++ b/keyboards/ymdk/ymd75/rev1/info.json @@ -2,6 +2,10 @@ "usb": { "device_version": "1.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12 + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h index 04db2b13a6..83e075b290 100644 --- a/keyboards/ymdk/ymd75/rev2/config.h +++ b/keyboards/ymdk/ymd75/rev2/config.h @@ -2,5 +2,4 @@ #define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 } #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define BACKLIGHT_PIN D4 #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json index be7df2e5a7..56435d5b27 100644 --- a/keyboards/ymdk/ymd75/rev2/info.json +++ b/keyboards/ymdk/ymd75/rev2/info.json @@ -2,6 +2,10 @@ "usb": { "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12 + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h index 87053214b4..e3a31b5116 100644 --- a/keyboards/ymdk/ymd75/rev3/config.h +++ b/keyboards/ymdk/ymd75/rev3/config.h @@ -2,6 +2,5 @@ #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3 #define DIODE_DIRECTION ROW2COL #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4 diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json index 850cf51f56..ce0db873cf 100644 --- a/keyboards/ymdk/ymd75/rev3/info.json +++ b/keyboards/ymdk/ymd75/rev3/info.json @@ -2,6 +2,10 @@ "usb": { "device_version": "3.0.0" }, + "backlight": { + "pin": "B6", + "levels": 12 + }, "indicators": { "caps_lock": "C7" }, diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index 384acfd8cf..f4fc0a99c3 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_LEVELS 12 -#define BACKLIGHT_BREATHING - #define TAPPING_TOGGLE 3 #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index ebf56d2ee5..7541e62019 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index 5681360dd7..efbdb02f81 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 5 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 7da059cbc4..0c902f2468 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -7,6 +7,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 2d1876d178..739358f693 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -// In-switch LED defines -#define BACKLIGHT_PIN A6 -#define BACKLIGHT_BREATHING - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 4c1a36c4f4..74bf17b603 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -8,6 +8,10 @@ "pid": "0xE600", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "breathing": true + }, "indicators": { "caps_lock": "B8", "num_lock": "B0", -- cgit v1.3.1