diff options
| author | Rozakiin <6567067+Rozakiin@users.noreply.github.com> | 2020-06-23 07:08:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-22 23:08:36 -0700 |
| commit | d353fcb99cfe345cde29cb7dc94cceaab82c610b (patch) | |
| tree | bcf8ec344e497239d1ff93325b4a6197460baf34 | |
| parent | f0bde7906d35c1955a39251659e80d41caccbc54 (diff) | |
| download | qmk_firmware-d353fcb99cfe345cde29cb7dc94cceaab82c610b.tar.gz qmk_firmware-d353fcb99cfe345cde29cb7dc94cceaab82c610b.zip | |
Add VIA support to Noxary x268 (#9450)
* Update USB descriptors
* Update default keymap for readability
* Update readme description
* Update rules.mk build options, enable bootmagic and mousekey
* Add commented modern led code
* Add VIA keymap
* Update default keymap readme.md layout image
* Update keyboards/noxary/x268/rules.mk
remove incorrect comment
* Update keyboards/noxary/x268/x268.c
remove commented setPinOutput(B1)
* Update keyboards/noxary/x268/keymaps/default/readme.md
Flip order of layout image and title
* Update keyboards/noxary/x268/keymaps/via/readme.md
Flip order of layout image and title
* Update LED function to led_update_kb()
| -rw-r--r-- | keyboards/noxary/x268/config.h | 8 | ||||
| -rw-r--r-- | keyboards/noxary/x268/keymaps/default/keymap.c | 142 | ||||
| -rw-r--r-- | keyboards/noxary/x268/keymaps/default/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/noxary/x268/keymaps/via/keymap.c | 111 | ||||
| -rw-r--r-- | keyboards/noxary/x268/keymaps/via/readme.md | 3 | ||||
| -rw-r--r-- | keyboards/noxary/x268/keymaps/via/rules.mk | 5 | ||||
| -rw-r--r-- | keyboards/noxary/x268/readme.md | 3 | ||||
| -rw-r--r-- | keyboards/noxary/x268/rules.mk | 10 | ||||
| -rw-r--r-- | keyboards/noxary/x268/x268.c | 39 |
9 files changed, 226 insertions, 97 deletions
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h index 0604f6529..c342da505 100644 --- a/keyboards/noxary/x268/config.h +++ b/keyboards/noxary/x268/config.h | |||
| @@ -20,12 +20,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | #include "config_common.h" | 20 | #include "config_common.h" |
| 21 | 21 | ||
| 22 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
| 23 | #define VENDOR_ID 0x4E58 | 23 | #define VENDOR_ID 0x4E58 //"NX" |
| 24 | #define PRODUCT_ID 0x0044 | 24 | #define PRODUCT_ID 0x010C //268 |
| 25 | #define DEVICE_VER 0x00F2 | 25 | #define DEVICE_VER 0x0078 //"x" |
| 26 | #define MANUFACTURER Noxary | 26 | #define MANUFACTURER Noxary |
| 27 | #define PRODUCT x268 | 27 | #define PRODUCT x268 |
| 28 | #define DESCRIPTION QMK keyboard firmware for x268 | 28 | #define DESCRIPTION A fully customizable RGB 65% keyboard. |
| 29 | 29 | ||
| 30 | /* key matrix size */ | 30 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 5 | 31 | #define MATRIX_ROWS 5 |
diff --git a/keyboards/noxary/x268/keymaps/default/keymap.c b/keyboards/noxary/x268/keymaps/default/keymap.c index ae07f5213..7f26a6c10 100644 --- a/keyboards/noxary/x268/keymaps/default/keymap.c +++ b/keyboards/noxary/x268/keymaps/default/keymap.c | |||
| @@ -1,83 +1,111 @@ | |||
| 1 | /* Copyright 2020 Rozakiin | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 1 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 2 | 17 | ||
| 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 18 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 19 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| 5 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | 20 | // Layer names don't all need to be of the same length, obviously, and you can also skip them |
| 6 | // entirely and just use numbers. | 21 | // entirely and just use numbers. |
| 7 | #define _BL 0 | 22 | enum layer_names { |
| 8 | #define _FL1 1 | 23 | _BL, |
| 9 | #define _FL2 2 | 24 | _FL1, |
| 25 | _FL2, | ||
| 26 | _FL3 | ||
| 27 | }; | ||
| 28 | |||
| 10 | 29 | ||
| 11 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 12 | /* _BL: Base Layer(Default) - For ISO enter use ANSI enter | 31 | /* Base Layer - For ISO enter use ANSI enter |
| 13 | * ,----------------------------------------------------------------. | 32 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
| 14 | * |Esc | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \|BSpc| Grv| | 33 | * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │Bsp│ ` │ |
| 15 | * |----------------------------------------------------------------| | 34 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
| 16 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | Del| | 35 | * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │Del│ |
| 17 | * |----------------------------------------------------------------| | 36 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ |
| 18 | * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| #| Ent|PgUp| | 37 | * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Ent │PgU│ |
| 19 | * |----------------------------------------------------------------| | 38 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ |
| 20 | * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | Up|PgDn| | 39 | * │Sft │ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│ |
| 21 | * |----------------------------------------------------------------| | 40 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ |
| 22 | * |Ctrl|Win |Alt | Space |Alt|Mo(1)|Ctrl|Lef|Dow|Rght| | 41 | * │Ctrl│Win │Alt │ Space │Alt │M(1)│Ctrl│ ← │ ↓ │ → │ |
| 23 | * `----------------------------------------------------------------' | 42 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ |
| 24 | */ | 43 | */ |
| 25 | [_BL] = LAYOUT( | 44 | [_BL] = LAYOUT( |
| 26 | 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_BSPC, KC_GRV, | 45 | 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_BSPC, KC_GRV, |
| 27 | 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, | 46 | 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, |
| 28 | 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_PGUP, | 47 | 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_PGUP, |
| 29 | 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, | 48 | 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, |
| 30 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(_FL1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), | 49 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(_FL1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 31 | /* _FL1: Function Layer 1 - For ISO enter use ANSI enter | 50 | ), |
| 32 | * ,----------------------------------------------------------------. | 51 | /* Function Layer 1 - For ISO enter use ANSI enter |
| 33 | * | `|F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |PScr| | | 52 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
| 34 | * |----------------------------------------------------------------| | 53 | * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ │Psc│ │ |
| 35 | * | | | | |RST| | | | | | | | | | Ins| | 54 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
| 36 | * |----------------------------------------------------------------| | 55 | * │ │ │ │ │RST│ │ │ │ │ │ │ │ │ │Ins│ |
| 37 | * | | | | | | | | | | | | | | |Home| | 56 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ |
| 38 | * |----------------------------------------------------------------| | 57 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │Hme│ |
| 39 | * | | | | | | | | | |Bl-|Bl+| |Mute|Vol+| End| | 58 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ |
| 40 | * |----------------------------------------------------------------| | 59 | * │ │ │ │ │ │ │ │ │ │Bl-│Bl+│ │ Mute │Vl+│End│ |
| 41 | * | | | | BL_Toggle | | | | |Vol-| | | 60 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ |
| 42 | * `----------------------------------------------------------------' | 61 | * │ │ │ │ BL_Toggle │ │ │ │ │Vl-│ │ |
| 62 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | ||
| 43 | */ | 63 | */ |
| 44 | [_FL1] = LAYOUT( | 64 | [_FL1] = LAYOUT( |
| 45 | 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_PSCR, _______, | 65 | 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_PSCR, _______, |
| 46 | RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, | 66 | RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, |
| 47 | _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, | 67 | _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, |
| 48 | _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, _______, KC_MUTE, KC_VOLU, KC_END, | 68 | _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, _______, KC_MUTE, KC_VOLU, KC_END, |
| 49 | _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______), | 69 | _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______ |
| 50 | /* _FL2: Function Layer 2 - For ISO enter use ANSI enter | 70 | ), |
| 51 | * ,----------------------------------------------------------------. | 71 | /* Function Layer 2 - For ISO enter use ANSI enter |
| 52 | * | | | | | | | | | | | | | | | | | | 72 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
| 53 | * |----------------------------------------------------------------| | 73 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 54 | * | | | | | | | | | | | | | | | | | 74 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ |
| 55 | * |----------------------------------------------------------------| | 75 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 56 | * | | | | | | | | | | | | | | | | | 76 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ |
| 57 | * |----------------------------------------------------------------| | 77 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 58 | * | | | | | | | | | | | | | | | | | 78 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ |
| 59 | * |----------------------------------------------------------------| | 79 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 60 | * | | | | | | | | | | | | 80 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ |
| 61 | * `----------------------------------------------------------------' | 81 | * │ │ │ │ │ │ │ │ │ │ │ |
| 82 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | ||
| 62 | */ | 83 | */ |
| 63 | [_FL2] = LAYOUT( | 84 | [_FL2] = LAYOUT( |
| 64 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 85 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 65 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 86 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 66 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 87 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 67 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 88 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 68 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), | 89 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 69 | 90 | ), | |
| 70 | 91 | /* Function Layer 3 - For ISO enter use ANSI enter | |
| 71 | }; | 92 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ |
| 72 | 93 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | |
| 73 | 94 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | |
| 74 | void matrix_init_user(void) { | 95 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 75 | } | 96 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ |
| 76 | 97 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | |
| 77 | void matrix_scan_user(void) { | 98 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ |
| 78 | } | 99 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 79 | 100 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ | |
| 80 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 101 | * │ │ │ │ │ │ │ │ │ │ │ |
| 81 | return true; | 102 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ |
| 82 | } | 103 | */ |
| 83 | 104 | [_FL3] = LAYOUT( | |
| 105 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 106 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 107 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 108 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 109 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 110 | ), | ||
| 111 | }; \ No newline at end of file | ||
diff --git a/keyboards/noxary/x268/keymaps/default/readme.md b/keyboards/noxary/x268/keymaps/default/readme.md index 5d5bd6959..3540b3905 100644 --- a/keyboards/noxary/x268/keymaps/default/readme.md +++ b/keyboards/noxary/x268/keymaps/default/readme.md | |||
| @@ -1 +1,3 @@ | |||
| 1 | # The default keymap for x268 | 1 | # The default keymap for x268 |
| 2 | |||
| 3 |  | ||
diff --git a/keyboards/noxary/x268/keymaps/via/keymap.c b/keyboards/noxary/x268/keymaps/via/keymap.c new file mode 100644 index 000000000..7f26a6c10 --- /dev/null +++ b/keyboards/noxary/x268/keymaps/via/keymap.c | |||
| @@ -0,0 +1,111 @@ | |||
| 1 | /* Copyright 2020 Rozakiin | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||
| 19 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||
| 20 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||
| 21 | // entirely and just use numbers. | ||
| 22 | enum layer_names { | ||
| 23 | _BL, | ||
| 24 | _FL1, | ||
| 25 | _FL2, | ||
| 26 | _FL3 | ||
| 27 | }; | ||
| 28 | |||
| 29 | |||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 31 | /* Base Layer - For ISO enter use ANSI enter | ||
| 32 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | ||
| 33 | * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │Bsp│ ` │ | ||
| 34 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | ||
| 35 | * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │Del│ | ||
| 36 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ | ||
| 37 | * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Ent │PgU│ | ||
| 38 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ | ||
| 39 | * │Sft │ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│ | ||
| 40 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ | ||
| 41 | * │Ctrl│Win │Alt │ Space │Alt │M(1)│Ctrl│ ← │ ↓ │ → │ | ||
| 42 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | ||
| 43 | */ | ||
| 44 | [_BL] = LAYOUT( | ||
| 45 | 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_BSPC, KC_GRV, | ||
| 46 | 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, | ||
| 47 | 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_PGUP, | ||
| 48 | 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, | ||
| 49 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(_FL1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 50 | ), | ||
| 51 | /* Function Layer 1 - For ISO enter use ANSI enter | ||
| 52 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | ||
| 53 | * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ │Psc│ │ | ||
| 54 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | ||
| 55 | * │ │ │ │ │RST│ │ │ │ │ │ │ │ │ │Ins│ | ||
| 56 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ | ||
| 57 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │Hme│ | ||
| 58 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ | ||
| 59 | * │ │ │ │ │ │ │ │ │ │Bl-│Bl+│ │ Mute │Vl+│End│ | ||
| 60 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ | ||
| 61 | * │ │ │ │ BL_Toggle │ │ │ │ │Vl-│ │ | ||
| 62 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | ||
| 63 | */ | ||
| 64 | [_FL1] = LAYOUT( | ||
| 65 | 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_PSCR, _______, | ||
| 66 | RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, | ||
| 67 | _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, | ||
| 68 | _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, _______, KC_MUTE, KC_VOLU, KC_END, | ||
| 69 | _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______ | ||
| 70 | ), | ||
| 71 | /* Function Layer 2 - For ISO enter use ANSI enter | ||
| 72 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | ||
| 73 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 74 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | ||
| 75 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 76 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ | ||
| 77 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 78 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ | ||
| 79 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 80 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ | ||
| 81 | * │ │ │ │ │ │ │ │ │ │ │ | ||
| 82 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | ||
| 83 | */ | ||
| 84 | [_FL2] = LAYOUT( | ||
| 85 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 86 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 87 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 88 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 89 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 90 | ), | ||
| 91 | /* Function Layer 3 - For ISO enter use ANSI enter | ||
| 92 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | ||
| 93 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 94 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | ||
| 95 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 96 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ | ||
| 97 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 98 | * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ | ||
| 99 | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 100 | * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤ | ||
| 101 | * │ │ │ │ │ │ │ │ │ │ │ | ||
| 102 | * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘ | ||
| 103 | */ | ||
| 104 | [_FL3] = LAYOUT( | ||
| 105 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 106 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 107 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 108 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 109 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 110 | ), | ||
| 111 | }; \ No newline at end of file | ||
diff --git a/keyboards/noxary/x268/keymaps/via/readme.md b/keyboards/noxary/x268/keymaps/via/readme.md new file mode 100644 index 000000000..e0e0b9f92 --- /dev/null +++ b/keyboards/noxary/x268/keymaps/via/readme.md | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # The VIA keymap for x268 | ||
| 2 | |||
| 3 |  | ||
diff --git a/keyboards/noxary/x268/keymaps/via/rules.mk b/keyboards/noxary/x268/keymaps/via/rules.mk new file mode 100644 index 000000000..c2e96d233 --- /dev/null +++ b/keyboards/noxary/x268/keymaps/via/rules.mk | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | MOUSEKEY_ENABLE = no | ||
| 3 | CONSOLE_ENABLE = no # Console for debug | ||
| 4 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 5 | LTO_ENABLE = yes | ||
diff --git a/keyboards/noxary/x268/readme.md b/keyboards/noxary/x268/readme.md index c1c05c34d..4dd1a7c78 100644 --- a/keyboards/noxary/x268/readme.md +++ b/keyboards/noxary/x268/readme.md | |||
| @@ -2,11 +2,10 @@ | |||
| 2 | 2 | ||
| 3 |  | 3 |  |
| 4 | 4 | ||
| 5 | A fully customizable 65% keyboard. | 5 | A fully customizable RGB 65% keyboard. |
| 6 | 6 | ||
| 7 | * Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin) | 7 | * Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin) |
| 8 | * Hardware Supported: x268 PCB | 8 | * Hardware Supported: x268 PCB |
| 9 | * rev1 | ||
| 10 | * Hardware Availability: | 9 | * Hardware Availability: |
| 11 | * [Noxary - 268](https://geekhack.org/index.php?topic=92066.0) | 10 | * [Noxary - 268](https://geekhack.org/index.php?topic=92066.0) |
| 12 | * [LZ - CLS ms](https://geekhack.org/index.php?topic=96377) | 11 | * [LZ - CLS ms](https://geekhack.org/index.php?topic=96377) |
diff --git a/keyboards/noxary/x268/rules.mk b/keyboards/noxary/x268/rules.mk index a8654dc91..c4b8c2117 100644 --- a/keyboards/noxary/x268/rules.mk +++ b/keyboards/noxary/x268/rules.mk | |||
| @@ -14,17 +14,17 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration |
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| 21 | COMMAND_ENABLE = no # Commands for debug and configuration | 21 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | 28 | MIDI_ENABLE = no # MIDI support |
| 29 | UNICODE_ENABLE = no # Unicode | 29 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
diff --git a/keyboards/noxary/x268/x268.c b/keyboards/noxary/x268/x268.c index 3921270ac..589d59def 100644 --- a/keyboards/noxary/x268/x268.c +++ b/keyboards/noxary/x268/x268.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2018 Rozakiin | 1 | /* Copyright 2020 Rozakiin |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 3 | * This program is free software: you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License as published by | 4 | * it under the terms of the GNU General Public License as published by |
| @@ -15,39 +15,20 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include "x268.h" | 16 | #include "x268.h" |
| 17 | 17 | ||
| 18 | // Optional override functions below. | ||
| 19 | // You can leave any or all of these undefined. | ||
| 20 | // These are only required if you want to perform custom actions. | ||
| 21 | |||
| 18 | void matrix_init_kb(void) { | 22 | void matrix_init_kb(void) { |
| 19 | // put your keyboard start-up code here | 23 | // put your keyboard start-up code here |
| 20 | // runs once when the firmware starts up | 24 | // runs once when the firmware starts up |
| 21 | 25 | setPinOutput(B0); | |
| 22 | matrix_init_user(); | 26 | matrix_init_user(); |
| 23 | } | 27 | } |
| 24 | 28 | ||
| 25 | void matrix_scan_kb(void) { | 29 | bool led_update_kb(led_t led_state) { |
| 26 | // put your looping keyboard code here | 30 | if(led_update_user(led_state)) { |
| 27 | // runs every cycle (a lot) | 31 | writePin(B0, led_state.caps_lock); |
| 28 | |||
| 29 | matrix_scan_user(); | ||
| 30 | } | ||
| 31 | |||
| 32 | bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||
| 33 | // put your per-action keyboard code here | ||
| 34 | // runs for every action, just before processing by the firmware | ||
| 35 | |||
| 36 | return process_record_user(keycode, record); | ||
| 37 | } | ||
| 38 | |||
| 39 | void led_set_kb(uint8_t usb_led) { | ||
| 40 | // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here | ||
| 41 | |||
| 42 | led_set_user(usb_led); | ||
| 43 | } | ||
| 44 | |||
| 45 | void led_set_user(uint8_t usb_led) { | ||
| 46 | |||
| 47 | if (usb_led & (1 << USB_LED_CAPS_LOCK)) { | ||
| 48 | DDRB |= (1 << 0); PORTB |= (1 << 0); | ||
| 49 | } | ||
| 50 | else { | ||
| 51 | DDRB &= ~(1 << 0); PORTB &= ~(1 << 0); | ||
| 52 | } | 32 | } |
| 33 | return true; | ||
| 53 | } | 34 | } |
