From 8b10f7f58d1af3215f62ffaefa609d51ee455d5f Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Mon, 26 Oct 2020 21:22:42 +0200 Subject: [PATCH 01/30] manually fixing submodules issue --- .../dz60/keymaps/olligranlund_iso/keymap.c | 67 +++++++++- .../dz60/keymaps/olligranlund_iso/readme.md | 2 +- .../dz60/keymaps/olligranlund_iso/rules.mk | 3 + .../dz60/keymaps/olligranlund_iso_v2/keymap.c | 93 +++++++++++++ .../keymaps/olligranlund_iso_v2/readme.md | 6 + .../dz60/keymaps/olligranlund_iso_v2/rules.mk | 3 + .../iris/keymaps/olligranlund_nordic/config.h | 22 +-- .../keymaps/olligranlund_nordic/readme.md | 2 +- .../iris/keymaps/olligranlund_nordic/rules.mk | 4 +- .../keymaps/olligranlund_nordic_v2/config.h | 35 +++++ .../keymaps/olligranlund_nordic_v2/keymap.c | 126 ++++++++++++++++++ .../keymaps/olligranlund_nordic_v2/readme.md | 8 ++ .../keymaps/olligranlund_nordic_v2/rules.mk | 4 + 13 files changed, 354 insertions(+), 21 deletions(-) create mode 100644 keyboards/dz60/keymaps/olligranlund_iso/rules.mk create mode 100644 keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c create mode 100644 keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md create mode 100644 keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk create mode 100644 keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h create mode 100644 keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c create mode 100644 keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md create mode 100644 keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk diff --git a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c index 74953764fdc9..fac346d28120 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c +++ b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c @@ -19,20 +19,75 @@ * `-----------------------------------------------------------------------------------------' */ +enum custom_keycodes { + EMOJI_DANCERS = SAFE_RANGE, + EMOJI_PERJANTAI, + EMOJI_THISISFINE, + EMOJI_KOVAAAJOA, +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case EMOJI_DANCERS: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">dancers>"); + } else {} break; + + case EMOJI_PERJANTAI: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">perjantaideploy>"); + } else {} break; + + case EMOJI_THISISFINE: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">this/is/fine>"); + } else {} break; + + case EMOJI_KOVAAAJOA: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">kovaaajoa>"); + } else {} break; + } + + return true; +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // 0 Base LAYOUT_60_iso_split_space_bs_rshift( 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_DEL, 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, - MO(1), 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_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_PSCR, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL), + MO(2), 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_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, TG(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(3), KC_APP, KC_RCTL), + // 1 Base with arrows + LAYOUT_60_iso_split_space_bs_rshift( + 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_DEL, 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, + MO(2), 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_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_UP, KC_TRNS, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + + // 2 FN LAYOUT_60_iso_split_space_bs_rshift( 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, - KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_PGDOWN,KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, - KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_PGDN, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, + KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_CAPS, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_NO, KC_APP, KC_RCTL), + + // 3 FN with RGB and macros + LAYOUT_60_iso_split_space_bs_rshift( + KC_GRV, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_F10, KC_F11, KC_F12, KC_DEL, RESET, + KC_NO, KC_NO, EMOJI_DANCERS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, EMOJI_PERJANTAI, EMOJI_THISISFINE,EMOJI_KOVAAAJOA, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_CAPS, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_NO, KC_APP, KC_RCTL), }; diff --git a/keyboards/dz60/keymaps/olligranlund_iso/readme.md b/keyboards/dz60/keymaps/olligranlund_iso/readme.md index 6aa4007d3871..d6f1b575827d 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso/readme.md +++ b/keyboards/dz60/keymaps/olligranlund_iso/readme.md @@ -1,4 +1,4 @@ -# DZ60 with splitted parts +# DZ60 with splitted parts with VIA support ### by Oliver Granlund ![Finished product](https://i.imgur.com/HlEo5Yg.jpg) diff --git a/keyboards/dz60/keymaps/olligranlund_iso/rules.mk b/keyboards/dz60/keymaps/olligranlund_iso/rules.mk new file mode 100644 index 000000000000..9008ce984f86 --- /dev/null +++ b/keyboards/dz60/keymaps/olligranlund_iso/rules.mk @@ -0,0 +1,3 @@ +EXTRAKEY_ENABLE = yes +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c new file mode 100644 index 000000000000..e74312eb6b5a --- /dev/null +++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c @@ -0,0 +1,93 @@ +#include QMK_KEYBOARD_H + +/* ISO 60 layout by olligranlund +* +* This layout starts from a standard ISO 60% layout, and adds one function layer. +* If you wish to only have one wide spacebar, you can easily do that by dismissing the "side" spacebar switches. +* +* Default Layer +* ,-----------------------------------------------------------------------------------------. +* | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Del | BSPC| +* |-----------------------------------------------------------------------------------------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | Ä | + * | Enter | +* |---------------------------------------------------------------------------------- | +* | FN | A | S | D | F | G | H | J | K | L | Ö | Ü | # ' | | +* |-----------------------------------------------------------------------------------------| +* | Shift | < > | Z | X | C | V | B | N | M | , ; | . : | - _ | Shift |Shift| +* |-----------------------------------------------------------------------------------------| +* | LCtl | LGUI | LAlt | Space | Space | Space | RAlt | FN | App | RCtl | | +* `-----------------------------------------------------------------------------------------' +*/ + +enum custom_keycodes { + EMOJI_DANCERS = SAFE_RANGE, + EMOJI_PERJANTAI, + EMOJI_THISISFINE, + EMOJI_KOVAAAJOA, +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case EMOJI_DANCERS: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">dancers>"); + } else {} break; + + case EMOJI_PERJANTAI: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">perjantaideploy>"); + } else {} break; + + case EMOJI_THISISFINE: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">this/is/fine>"); + } else {} break; + + case EMOJI_KOVAAAJOA: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING(">kovaaajoa>"); + } else {} break; + } + + return true; +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // 0 Base + LAYOUT_60_iso_5x1u_split_bs_rshift_spc( + 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_DEL, 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, + MO(2), 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_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, TG(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(3), KC_APP, KC_PSCR, KC_RCTL), + + // 1 Base with arrows + LAYOUT_60_iso_5x1u_split_bs_rshift_spc( + 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_DEL, 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, + MO(2), 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_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_UP, KC_TRNS, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(3), KC_LEFT, KC_DOWN, KC_RGHT), + + // 2 FN + LAYOUT_60_iso_5x1u_split_bs_rshift_spc( + 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, + KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_PGDN, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, + KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_CAPS, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_NO, KC_APP, KC_PSCR, KC_RCTL), + + // 3 FN with RGB and macros + LAYOUT_60_iso_5x1u_split_bs_rshift_spc( + KC_GRV, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_F10, KC_F11, KC_F12, KC_DEL, RESET, + KC_NO, KC_NO, EMOJI_DANCERS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, EMOJI_PERJANTAI, EMOJI_THISISFINE,EMOJI_KOVAAAJOA, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_CAPS, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_NO, KC_APP, KC_PSCR, KC_RCTL), + +}; diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md b/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md new file mode 100644 index 000000000000..d1cc16400fbe --- /dev/null +++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md @@ -0,0 +1,6 @@ +# DZ60 with splitted parts with VIA support +### by Oliver Granlund + +![Finished product](https://i.imgur.com/AT1Lyrx.jpg) + +This is still under progress, but currently works on Windows as a daily driver. Also added macros for Slack emojis \ No newline at end of file diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk b/keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk new file mode 100644 index 000000000000..9008ce984f86 --- /dev/null +++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk @@ -0,0 +1,3 @@ +EXTRAKEY_ENABLE = yes +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h index 259f2a7424b7..16c430237363 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h @@ -19,18 +19,18 @@ along with this program. If not, see . /* Use I2C or Serial, not both */ -#define USE_SERIAL -//#define USE_I2C +//#define USE_SERIAL +#define USE_I2C /* Select hand configuration */ -// #define MASTER_LEFT +#define MASTER_LEFT // #define MASTER_RIGHT -#define EE_HANDS - -#undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 18 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 +// #define EE_HANDS + +// #undef RGBLED_NUM +// #define RGBLIGHT_ANIMATIONS +// #define RGBLED_NUM 18 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md b/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md index 72eccde10293..c929a15324aa 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md @@ -8,4 +8,4 @@ gaming aspect with this keyboard, therefore space on left side. At first I thought about having backspace in the upper right corner of the slave side, but that made it really clunky to fix your text. Thumbs should take -care of this job instead. +care of this job instead. \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk b/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk index d7463419b4fe..1964bd0a7c25 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk @@ -1,2 +1,2 @@ -RGBLIGHT_ENABLE = yes -BACKLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h new file mode 100644 index 000000000000..417d7f86212d --- /dev/null +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h @@ -0,0 +1,35 @@ +/* +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 + +/* Use I2C or Serial, not both */ + +//#define USE_SERIAL +#define USE_I2C + +/* Select hand configuration */ + +// #define MASTER_LEFT +// #define MASTER_RIGHT +#define EE_HANDS + +#undef RGBLED_NUM + +// Via stuff? +// #define PRODUCT_ID 3406832214 +// #define MANUFACTURER keebio \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c new file mode 100644 index 000000000000..442111129998 --- /dev/null +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c @@ -0,0 +1,126 @@ +#include QMK_KEYBOARD_H + +extern keymap_config_t keymap_config; + +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 +#define _ADJUST 16 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST, +}; + +#define KC_ KC_TRNS + +#define KC_LOWER LOWER +#define KC_RAISE RAISE +#define KC_RST RESET + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + MO(_LOWER), 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_LALT, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + KC_LGUI, KC_LCTL, KC_SPC, KC_ENT,MO(_RAISE),KC_RALT + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_LOWER] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP, KC_PGDOWN, KC_TRNS, KC_RBRC, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_BSLS, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_GRAVE, KC_CIRC, KC_QUOTE, KC_TRNS, KC_TRNS, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_RAISE] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS, KC_TRNS, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS, KC_TRNS, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_LSFT, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_1, KC_2, KC_3, KC_0, KC_TRNS, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_ADJUST] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + BL_TOGG, BL_STEP, BL_BRTG, RGB_TOG, RGB_RMOD, RGB_MOD, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + BL_DEC, _______, BL_INC, RGB_VAD, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + _______, _______, _______, _______, _______, _______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ) +}; + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md new file mode 100644 index 000000000000..0e2e142d3c4e --- /dev/null +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md @@ -0,0 +1,8 @@ +# Iris Nordic Layout V2, now with VIA support +### by Oliver Granlund + +![Finished product](https://i.imgur.com/Y1V9Dvp.jpg) + +After my rebuild I decided on making the layout better for swapping between 60% and Iris. + +Still kinda buggy but should work automaticly with VIA \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk new file mode 100644 index 000000000000..545998d122dd --- /dev/null +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk @@ -0,0 +1,4 @@ +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file From 50f9addd47ebc0af2ad8f7c59fcba9ea2c712a61 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Thu, 5 Nov 2020 19:48:47 +0200 Subject: [PATCH 02/30] adding GPL text --- keyboards/dz60/keymaps/olligranlund_iso/keymap.c | 16 ++++++++++++++++ .../dz60/keymaps/olligranlund_iso_v2/keymap.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c index fac346d28120..a89eb22d350b 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c +++ b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 /* ISO 60 layout by olligranlund diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c index e74312eb6b5a..8b2f587a946e 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c +++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 /* ISO 60 layout by olligranlund From 4b7523f493639c791190ad14b518ec86b1c393e8 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Thu, 5 Nov 2020 19:56:16 +0200 Subject: [PATCH 03/30] Added more GPL text, made requested edits to keymaps --- .../iris/keymaps/olligranlund_nordic/keymap.c | 16 +++++++++ .../keymaps/olligranlund_nordic_v2/keymap.c | 33 ++++++++++++------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c index 115b70640e7c..9027bdab64ef 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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_swedish.h" diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c index 442111129998..c2e9c36cfe04 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c @@ -1,11 +1,27 @@ -#include QMK_KEYBOARD_H +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ -extern keymap_config_t keymap_config; +#include QMK_KEYBOARD_H -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 -#define _ADJUST 16 +enum layers ( + _QWERTY, + _LOWER, + _RAISE + _ADJUST, +}; enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -79,11 +95,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: From df4046d0002938f38d604737ea82d5496a38740d Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 23 Dec 2020 19:03:06 +0200 Subject: [PATCH 04/30] Neito qmk init, still bug with compile but almost ready --- keyboards/handwired/neito/config.h | 47 +++ keyboards/handwired/neito/info.json | 365 ++++++++++++++++++ .../handwired/neito/keymaps/default/keymap.c | 40 ++ keyboards/handwired/neito/neito.c | 17 + keyboards/handwired/neito/neito.h | 37 ++ keyboards/handwired/neito/readme.md | 9 + keyboards/handwired/neito/rules.mk | 27 ++ 7 files changed, 542 insertions(+) create mode 100644 keyboards/handwired/neito/config.h create mode 100644 keyboards/handwired/neito/info.json create mode 100644 keyboards/handwired/neito/keymaps/default/keymap.c create mode 100644 keyboards/handwired/neito/neito.c create mode 100644 keyboards/handwired/neito/neito.h create mode 100644 keyboards/handwired/neito/readme.md create mode 100644 keyboards/handwired/neito/rules.mk diff --git a/keyboards/handwired/neito/config.h b/keyboards/handwired/neito/config.h new file mode 100644 index 000000000000..c46bc113a035 --- /dev/null +++ b/keyboards/handwired/neito/config.h @@ -0,0 +1,47 @@ +/* Copyright 2020 Oliver Granlund + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x2602 +#define PRODUCT_ID 0x2603 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Oliver Granlund +#define PRODUCT Neito +#define DESCRIPTION 60% Mechanical keyboard + + +#define MATRIX_ROWS 10 +#define MATRIX_COLS 8 +#define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, D8, D7, D6, D4 } +#define MATRIX_COL_PINS { F4, F1, F7, B2, D1, D2, B3, B1 } + +#define DIODE_DIRECTION COL2ROW +#define ENCODERS_PAD_A { B7 } +#define ENCODERS_PAD_B { B0 } +#define ENCODER_RESOLUTION 4 +#define UNUSED_PINS + +/* RGB Light Configuration */ + +/* +#define RGB_DI_PIN D1 +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 13 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +*/ diff --git a/keyboards/handwired/neito/info.json b/keyboards/handwired/neito/info.json new file mode 100644 index 000000000000..0ceae71ce968 --- /dev/null +++ b/keyboards/handwired/neito/info.json @@ -0,0 +1,365 @@ +{ + "keyboard_name":"Neito", + "url":"olli.works", + "maintainer":"Migiii, Erkki Halinen, Oliver Granlund", + "width":18.1875, + "height":14.25, + "layouts":{ + "LAYOUT":{ + "layout":[ + { + "label":"0,7", + "x":16.6875, + "y":0.75 + }, + { + "label":"0,1", + "x":2.75, + "y":0.9375 + }, + { + "label":"1,5", + "x":12.4375, + "y":0.9375 + }, + { + "label":"0,0", + "x":0.75, + "y":1 + }, + { + "label":"1,0", + "x":1.75, + "y":1 + }, + { + "label":"0,6", + "x":13.4375, + "y":1 + }, + { + "label":"1,6", + "x":14.4375, + "y":1, + "w":2 + }, + { + "label":"2,7", + "x":16.9375, + "y":1.75 + }, + { + "label":"2,0", + "x":0.5625, + "y":2, + "w":1.5 + }, + { + "label":"3,0", + "x":2.0625, + "y":2 + }, + { + "label":"3,5", + "x":13.1875, + "y":2 + }, + { + "label":"2,6", + "x":14.1875, + "y":2 + }, + { + "label":"3,6", + "x":15.4375, + "y":2, + "w":1.25, + "h":2 + }, + { + "label":"4,7", + "x":17.1875, + "y":2.75 + }, + { + "label":"4,0", + "x":0.3125, + "y":3, + "w":1.75 + }, + { + "label":"5,0", + "x":2.0625, + "y":3 + }, + { + "label":"4,5", + "x":12.4375, + "y":3 + }, + { + "label":"5,5", + "x":13.4375, + "y":3 + }, + { + "label":"4,6", + "x":14.4375, + "y":3 + }, + { + "label":"6,0", + "x":0.125, + "y":4, + "w":1.25 + }, + { + "label":"8,0", + "x":1.375, + "y":4 + }, + { + "label":"7,0", + "x":2.375, + "y":4 + }, + { + "label":"6,5", + "x":12.94, + "y":4 + }, + { + "label":"6,6", + "x":13.9375, + "y":4, + "w":1.75 + }, + { + "label":"7,6", + "x":15.9375, + "y":4.25 + }, + { + "label":"9,0", + "x":0.125, + "y":5, + "w":1.5 + }, + { + "label":"8,6", + "x":14.9375, + "y":5.25 + }, + { + "label":"9,6", + "x":15.9375, + "y":5.25 + }, + { + "label":"8,7", + "x":16.9375, + "y":5.25 + }, + { + "label":"1,1", + "x":0.5, + "y":5.25 + }, + { + "label":"0,2", + "x":1.5, + "y":5.25 + }, + { + "label":"1,2", + "x":2.5, + "y":5.25 + }, + { + "label":"0,3", + "x":3.5, + "y":5.25 + }, + { + "label":"2,1", + "x":0, + "y":6.25 + }, + { + "label":"3,1", + "x":1, + "y":6.25 + }, + { + "label":"2,2", + "x":2, + "y":6.25 + }, + { + "label":"3,2", + "x":3, + "y":6.25 + }, + { + "label":"4,1", + "x":0.25, + "y":7.25 + }, + { + "label":"5,1", + "x":1.25, + "y":7.25 + }, + { + "label":"4,2", + "x":2.25, + "y":7.25 + }, + { + "label":"5,2", + "x":3.25, + "y":7.25 + }, + { + "label":"6,1", + "x":0.75, + "y":8.25 + }, + { + "label":"7,1", + "x":1.75, + "y":8.25 + }, + { + "label":"6,2", + "x":2.75, + "y":8.25 + }, + { + "label":"7,2", + "x":3.75, + "y":8.25 + }, + { + "label":"8,1", + "x":0.75, + "y":9.25, + "w":1.5 + }, + { + "label":"8,2", + "x":2.25, + "y":9.25, + "w":2 + }, + { + "label":"9,2", + "x":4.25, + "y":9.25 + }, + { + "label":"1,3", + "x":-4.5, + "y":9.25 + }, + { + "label":"0,4", + "x":-3.5, + "y":9.25 + }, + { + "label":"1,4", + "x":-2.5, + "y":9.25 + }, + { + "label":"0,5", + "x":-1.5, + "y":9.25 + }, + { + "label":"2,3", + "x":-5.0, + "y":10.25 + }, + { + "label":"3,3", + "x":-4, + "y":10.25 + }, + { + "label":"2,4", + "x":-3.0, + "y":10.25 + }, + { + "label":"3,4", + "x":-2, + "y":10.25 + }, + { + "label":"2,5", + "x":-1.0, + "y":10.25 + }, + { + "label":"4,3", + "x":-4.75, + "y":11.25 + }, + { + "label":"5,3", + "x":-3.75, + "y":11.25 + }, + { + "label":"4,4", + "x":-2.75, + "y":11.25 + }, + { + "label":"5,4", + "x":-1.75, + "y":11.25 + }, + { + "label":"8,3", + "x":-5.5, + "y":12.25 + }, + { + "label":"6,3", + "x":-4.5, + "y":12.25 + }, + { + "label":"8,3", + "x":-3.5, + "y":12.25 + }, + { + "label":"6,4", + "x":-2.5, + "y":12.25 + }, + { + "label":"7,4", + "x":-1.5, + "y":12.25 + }, + { + "label":"9,3", + "x":-5.0, + "y":13.25, + "w":2.75 + }, + { + "label":"8,4", + "x":-2.25, + "y":13.25, + "w":1.5 + } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/handwired/neito/keymaps/default/keymap.c b/keyboards/handwired/neito/keymaps/default/keymap.c new file mode 100644 index 000000000000..9c4976ab96f1 --- /dev/null +++ b/keyboards/handwired/neito/keymaps/default/keymap.c @@ -0,0 +1,40 @@ +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 + +enum layers { + _DEFAULT +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_DEFAULT] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + + +void encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_TAB); + } else { + tap_code(KC_PGUP); + } +} diff --git a/keyboards/handwired/neito/neito.c b/keyboards/handwired/neito/neito.c new file mode 100644 index 000000000000..bf5d187af511 --- /dev/null +++ b/keyboards/handwired/neito/neito.c @@ -0,0 +1,17 @@ +/* Copyright 2020 ErkHal + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 "neito.h" diff --git a/keyboards/handwired/neito/neito.h b/keyboards/handwired/neito/neito.h new file mode 100644 index 000000000000..dadefa03c583 --- /dev/null +++ b/keyboards/handwired/neito/neito.h @@ -0,0 +1,37 @@ +/* Copyright 2020 Migiii, Erkki Halinen & Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 LAYOUT( \ + k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, \ + k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, \ + k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \ + k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k66, k76, \ + k90, k80, k81, k82, k92, k83, k93, k84, k86, k96, k87 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07 }, \ + { k10, k11, k12, k13, k14, k15, k16, KC_NO }, \ + { k20, k21, k22, k23, k24, k25, k26, k27 }, \ + { k30, k31, k32, k33, k34, k35, k36, KC_NO }, \ + { k40, k41, k42, k43, k44, k45, k46, k47 }, \ + { k50, k51, k52, k53, k54, k55, KC_NO, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, KC_NO }, \ + { k70, k71, k72, k73, k74, KC_NO, k76, KC_NO }, \ + { k80, k81, k82, k83, k84, KC_NO, k86, k87 }, \ + { k90, KC_NO, k92, k93, KC_NO, KC_NO, k86, KC_NO }, \ +} diff --git a/keyboards/handwired/neito/readme.md b/keyboards/handwired/neito/readme.md new file mode 100644 index 000000000000..597420d5e1e3 --- /dev/null +++ b/keyboards/handwired/neito/readme.md @@ -0,0 +1,9 @@ +# Neito + +ISO-variant of TGR Alice with a few tweaks + +Make example for this keyboard (after setting up your build environment): + + make handwired/neito: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/handwired/neito/rules.mk b/keyboards/handwired/neito/rules.mk new file mode 100644 index 000000000000..574da2e4500b --- /dev/null +++ b/keyboards/handwired/neito/rules.mk @@ -0,0 +1,27 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow \ No newline at end of file From febee1c4b65efc4b510c1b188a13ad3b664fe96a Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 23 Dec 2020 20:16:23 +0200 Subject: [PATCH 05/30] minor adjustements to neito --- keyboards/handwired/neito/config.h | 2 +- keyboards/handwired/neito/neito.h | 2 +- keyboards/handwired/neito/rules.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/neito/config.h b/keyboards/handwired/neito/config.h index c46bc113a035..2cc06c3bd223 100644 --- a/keyboards/handwired/neito/config.h +++ b/keyboards/handwired/neito/config.h @@ -26,7 +26,7 @@ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 -#define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, D8, D7, D6, D4 } +#define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, B4, D7, D6, D4 } #define MATRIX_COL_PINS { F4, F1, F7, B2, D1, D2, B3, B1 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/neito/neito.h b/keyboards/handwired/neito/neito.h index dadefa03c583..751bab655990 100644 --- a/keyboards/handwired/neito/neito.h +++ b/keyboards/handwired/neito/neito.h @@ -33,5 +33,5 @@ { k60, k61, k62, k63, k64, k65, k66, KC_NO }, \ { k70, k71, k72, k73, k74, KC_NO, k76, KC_NO }, \ { k80, k81, k82, k83, k84, KC_NO, k86, k87 }, \ - { k90, KC_NO, k92, k93, KC_NO, KC_NO, k86, KC_NO }, \ + { k90, KC_NO, k92, k93, KC_NO, KC_NO, k96, KC_NO }, \ } diff --git a/keyboards/handwired/neito/rules.mk b/keyboards/handwired/neito/rules.mk index 574da2e4500b..bfb9ffb336c2 100644 --- a/keyboards/handwired/neito/rules.mk +++ b/keyboards/handwired/neito/rules.mk @@ -9,7 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = caterina +BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable From c375e92b278dc11251a5b2fb4c09b9b45ebccbdf Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Mon, 28 Dec 2020 12:20:03 +0200 Subject: [PATCH 06/30] moving neito-keyboard related files to right location as it's not a handwired keyboard --- keyboards/{handwired => }/neito/config.h | 4 ++-- keyboards/{handwired => }/neito/info.json | 2 +- keyboards/{handwired => }/neito/keymaps/default/keymap.c | 0 keyboards/{handwired => }/neito/neito.c | 0 keyboards/{handwired => }/neito/neito.h | 2 +- keyboards/{handwired => }/neito/readme.md | 0 keyboards/{handwired => }/neito/rules.mk | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename keyboards/{handwired => }/neito/config.h (95%) rename keyboards/{handwired => }/neito/info.json (99%) rename keyboards/{handwired => }/neito/keymaps/default/keymap.c (100%) rename keyboards/{handwired => }/neito/neito.c (100%) rename keyboards/{handwired => }/neito/neito.h (96%) rename keyboards/{handwired => }/neito/readme.md (100%) rename keyboards/{handwired => }/neito/rules.mk (100%) diff --git a/keyboards/handwired/neito/config.h b/keyboards/neito/config.h similarity index 95% rename from keyboards/handwired/neito/config.h rename to keyboards/neito/config.h index 2cc06c3bd223..618d9ab9e051 100644 --- a/keyboards/handwired/neito/config.h +++ b/keyboards/neito/config.h @@ -16,8 +16,8 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x2602 -#define PRODUCT_ID 0x2603 +#define VENDOR_ID 0xB9F7 +#define PRODUCT_ID 0x4F47 // "OG" #define DEVICE_VER 0x0001 #define MANUFACTURER Oliver Granlund #define PRODUCT Neito diff --git a/keyboards/handwired/neito/info.json b/keyboards/neito/info.json similarity index 99% rename from keyboards/handwired/neito/info.json rename to keyboards/neito/info.json index 0ceae71ce968..11f0f5e10e25 100644 --- a/keyboards/handwired/neito/info.json +++ b/keyboards/neito/info.json @@ -1,7 +1,7 @@ { "keyboard_name":"Neito", "url":"olli.works", - "maintainer":"Migiii, Erkki Halinen, Oliver Granlund", + "maintainer":"Oliver Granlund", "width":18.1875, "height":14.25, "layouts":{ diff --git a/keyboards/handwired/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c similarity index 100% rename from keyboards/handwired/neito/keymaps/default/keymap.c rename to keyboards/neito/keymaps/default/keymap.c diff --git a/keyboards/handwired/neito/neito.c b/keyboards/neito/neito.c similarity index 100% rename from keyboards/handwired/neito/neito.c rename to keyboards/neito/neito.c diff --git a/keyboards/handwired/neito/neito.h b/keyboards/neito/neito.h similarity index 96% rename from keyboards/handwired/neito/neito.h rename to keyboards/neito/neito.h index 751bab655990..e25470fffa36 100644 --- a/keyboards/handwired/neito/neito.h +++ b/keyboards/neito/neito.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Migiii, Erkki Halinen & Oliver Granlund +/* Copyright 2020 Oliver Granlund * * This 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/handwired/neito/readme.md b/keyboards/neito/readme.md similarity index 100% rename from keyboards/handwired/neito/readme.md rename to keyboards/neito/readme.md diff --git a/keyboards/handwired/neito/rules.mk b/keyboards/neito/rules.mk similarity index 100% rename from keyboards/handwired/neito/rules.mk rename to keyboards/neito/rules.mk From 31a1cca16d0dd6fd1ca086bd27411e042cc3c8ab Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Mon, 28 Dec 2020 12:31:39 +0200 Subject: [PATCH 07/30] fixing readme for neito keyboard --- keyboards/neito/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/neito/readme.md b/keyboards/neito/readme.md index 597420d5e1e3..cdcdc0e8e02d 100644 --- a/keyboards/neito/readme.md +++ b/keyboards/neito/readme.md @@ -1,9 +1,9 @@ # Neito -ISO-variant of TGR Alice with a few tweaks +ISO-variant of TGR Alice with a few tweaks! Make example for this keyboard (after setting up your build environment): - make handwired/neito:default + make neito: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). From d830400e37c9cc7edb910663d0308cd6c054fe39 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 30 Dec 2020 16:25:29 +0200 Subject: [PATCH 08/30] Adjusting neito keyboard properties and adding VIA support --- keyboards/neito/config.h | 2 +- keyboards/neito/info.json | 2 ++ keyboards/neito/keymaps/via/keymap.c | 9 +++++++++ keyboards/neito/rules.mk | 15 +++++++++++---- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 keyboards/neito/keymaps/via/keymap.c diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 618d9ab9e051..5d99b99ba3de 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -21,7 +21,7 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER Oliver Granlund #define PRODUCT Neito -#define DESCRIPTION 60% Mechanical keyboard +#define DESCRIPTION Alice style keyboard with ISO-layout #define MATRIX_ROWS 10 diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 11f0f5e10e25..1f3352052682 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -4,8 +4,10 @@ "maintainer":"Oliver Granlund", "width":18.1875, "height":14.25, + "matrix": {"rows": 10, "cols": 8}, "layouts":{ "LAYOUT":{ + "key_count": 68, "layout":[ { "label":"0,7", diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c new file mode 100644 index 000000000000..40c26c41b513 --- /dev/null +++ b/keyboards/neito/keymaps/via/keymap.c @@ -0,0 +1,9 @@ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; \ No newline at end of file diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index bfb9ffb336c2..407601a9e344 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -16,12 +16,19 @@ BOOTLOADER = atmel-dfu # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow \ No newline at end of file +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches + +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file From 49b5e70b86e70bea954d213e6fad56e036ca2de4 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 30 Dec 2020 17:10:39 +0200 Subject: [PATCH 09/30] Adjusting product ID for neito keyboard --- keyboards/neito/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 5d99b99ba3de..79e04df95ba4 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -17,7 +17,7 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0xB9F7 -#define PRODUCT_ID 0x4F47 // "OG" +#define PRODUCT_ID 0xB44C // "Neito" #define DEVICE_VER 0x0001 #define MANUFACTURER Oliver Granlund #define PRODUCT Neito From 24868afd1ab7f083669a3ece2ae164533663526b Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 30 Dec 2020 17:13:18 +0200 Subject: [PATCH 10/30] Adding comment for neito-keyboard vendor ID --- keyboards/neito/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 79e04df95ba4..41a6a42f7a94 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -16,7 +16,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xB9F7 +#define VENDOR_ID 0xB9F7 // "Oliver Granlund" #define PRODUCT_ID 0xB44C // "Neito" #define DEVICE_VER 0x0001 #define MANUFACTURER Oliver Granlund From 55374297b65ac52a4cb105f685d6c39c706b122f Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 30 Dec 2020 17:43:59 +0200 Subject: [PATCH 11/30] removed unused keymap from neito keyboard --- keyboards/neito/keymaps/via/keymap.c | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 keyboards/neito/keymaps/via/keymap.c diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c deleted file mode 100644 index 40c26c41b513..000000000000 --- a/keyboards/neito/keymaps/via/keymap.c +++ /dev/null @@ -1,9 +0,0 @@ -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( - 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_1, - 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_2, - 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_3, - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; \ No newline at end of file From 161fe27d9905144ee7a19cf88dafa10390250031 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 30 Dec 2020 17:47:58 +0200 Subject: [PATCH 12/30] Adding back via-keymap with via-support in rules.mk --- keyboards/neito/keymaps/via/keymap.c | 40 ++++++++++++++++++++++++++++ keyboards/neito/keymaps/via/rules.mk | 2 ++ keyboards/neito/rules.mk | 5 +--- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 keyboards/neito/keymaps/via/keymap.c create mode 100644 keyboards/neito/keymaps/via/rules.mk diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c new file mode 100644 index 000000000000..9c4976ab96f1 --- /dev/null +++ b/keyboards/neito/keymaps/via/keymap.c @@ -0,0 +1,40 @@ +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 + +enum layers { + _DEFAULT +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_DEFAULT] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + + +void encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_TAB); + } else { + tap_code(KC_PGUP); + } +} diff --git a/keyboards/neito/keymaps/via/rules.mk b/keyboards/neito/keymaps/via/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/neito/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index 407601a9e344..dfdda1aa82ec 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -28,7 +28,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches - -VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches \ No newline at end of file From f89abd8f9f503454b9c41a683e3210bbba93ebeb Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 30 Dec 2020 17:59:08 +0200 Subject: [PATCH 13/30] 4 layers for neito keyboard, layouts need still work --- keyboards/neito/keymaps/default/keymap.c | 26 +++++++++++++++++++++++- keyboards/neito/keymaps/via/keymap.c | 26 +++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index 9c4976ab96f1..0ac93aa853c9 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -17,7 +17,10 @@ #include QMK_KEYBOARD_H enum layers { - _DEFAULT + _DEFAULT, + _FN1, + _FN2, + _FN3, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -28,6 +31,27 @@ 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_RSFT, KC_UP, KC_LCTL, KC_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), + [_FN1] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_FN2] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_FN3] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), }; diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c index 9c4976ab96f1..0ac93aa853c9 100644 --- a/keyboards/neito/keymaps/via/keymap.c +++ b/keyboards/neito/keymaps/via/keymap.c @@ -17,7 +17,10 @@ #include QMK_KEYBOARD_H enum layers { - _DEFAULT + _DEFAULT, + _FN1, + _FN2, + _FN3, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -28,6 +31,27 @@ 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_RSFT, KC_UP, KC_LCTL, KC_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), + [_FN1] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_FN2] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_FN3] = LAYOUT( + 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_1, + 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_2, + 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_3, + 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), }; From 772f941d87ed79e3f1ea4ab2d8008879671f0f61 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Mon, 1 Feb 2021 19:49:36 +0200 Subject: [PATCH 14/30] Neito keymaps and conf --- keyboards/neito/config.h | 12 ++++-- keyboards/neito/keymaps/default/keymap.c | 52 +++++++++++++----------- keyboards/neito/keymaps/via/keymap.c | 52 +++++++++++++----------- keyboards/neito/neito.c | 8 ++++ keyboards/neito/rules.mk | 11 ++--- 5 files changed, 78 insertions(+), 57 deletions(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 41a6a42f7a94..3d32eefbff31 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -35,13 +35,17 @@ #define ENCODER_RESOLUTION 4 #define UNUSED_PINS +#define LED_CAPS_LOCK_PIN B6 +#define LED_PIN_ON_STATE 0 + +#define BACKLIGHT_PIN B5 +#define BACKLIGHT_LEVELS 5 + /* RGB Light Configuration */ -/* -#define RGB_DI_PIN D1 +#define RGB_DI_PIN D5 #define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 13 +#define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -*/ diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index 0ac93aa853c9..16e81bf0de8e 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -18,47 +18,51 @@ enum layers { _DEFAULT, + _MAC, _FN1, _FN2, - _FN3, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_1, - 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_2, - 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_3, + 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_MUTE, + 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, TG(_MAC), + MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN1] = LAYOUT( - 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_1, - 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_2, - 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_3, + [_MAC] = LAYOUT( + 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_TRNS, + 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_TRNS, + MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + KC_LGUI, KC_NUBS, KC_LALT, KC_SPC, KC_LCTL, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN2] = LAYOUT( - 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_1, - 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_2, - 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_3, - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + [_FN1] = LAYOUT( + 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_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, 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 ), - [_FN3] = LAYOUT( - 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_1, - 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_2, - 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_3, - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + [_FN2] = LAYOUT( + KC_ESC, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, + 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_LGUI, 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 ), }; void encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { - tap_code(KC_TAB); + tap_code(KC_VOLU); } else { - tap_code(KC_PGUP); + tap_code(KC_VOLD); } -} +}; + +bool led_update_user(led_t led_state) { + return true; +} \ No newline at end of file diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c index 0ac93aa853c9..16e81bf0de8e 100644 --- a/keyboards/neito/keymaps/via/keymap.c +++ b/keyboards/neito/keymaps/via/keymap.c @@ -18,47 +18,51 @@ enum layers { _DEFAULT, + _MAC, _FN1, _FN2, - _FN3, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_1, - 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_2, - 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_3, + 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_MUTE, + 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, TG(_MAC), + MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN1] = LAYOUT( - 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_1, - 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_2, - 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_3, + [_MAC] = LAYOUT( + 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_TRNS, + 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_TRNS, + MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + KC_LGUI, KC_NUBS, KC_LALT, KC_SPC, KC_LCTL, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN2] = LAYOUT( - 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_1, - 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_2, - 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_3, - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + [_FN1] = LAYOUT( + 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_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, 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 ), - [_FN3] = LAYOUT( - 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_1, - 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_2, - 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_3, - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + [_FN2] = LAYOUT( + KC_ESC, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, + 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_LGUI, 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 ), }; void encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { - tap_code(KC_TAB); + tap_code(KC_VOLU); } else { - tap_code(KC_PGUP); + tap_code(KC_VOLD); } -} +}; + +bool led_update_user(led_t led_state) { + return true; +} \ No newline at end of file diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c index bf5d187af511..d40384837888 100644 --- a/keyboards/neito/neito.c +++ b/keyboards/neito/neito.c @@ -15,3 +15,11 @@ */ #include "neito.h" + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + } + return res; +} \ No newline at end of file diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index dfdda1aa82ec..28d3fcdb776a 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -17,15 +17,16 @@ BOOTLOADER = atmel-dfu BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches \ No newline at end of file +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +ENCODER_ENABLE = yes \ No newline at end of file From f9e2c180b8447e7d36a17ffd8206596a62387419 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Mon, 1 Feb 2021 20:43:10 +0200 Subject: [PATCH 15/30] rgb brightness limit --- keyboards/neito/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 3d32eefbff31..b6a2314224d7 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -36,7 +36,7 @@ #define UNUSED_PINS #define LED_CAPS_LOCK_PIN B6 -#define LED_PIN_ON_STATE 0 +/* #define LED_PIN_ON_STATE 0 */ #define BACKLIGHT_PIN B5 #define BACKLIGHT_LEVELS 5 @@ -49,3 +49,4 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_LIMIT_VAL 200 \ No newline at end of file From 58d1e95c14e407839753098a11af65ce65934cf2 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Tue, 2 Feb 2021 18:17:29 +0200 Subject: [PATCH 16/30] updated readme for Neito --- keyboards/neito/config.h | 2 +- keyboards/neito/readme.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index b6a2314224d7..7d53b0b6b9ef 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -36,7 +36,7 @@ #define UNUSED_PINS #define LED_CAPS_LOCK_PIN B6 -/* #define LED_PIN_ON_STATE 0 */ +#define BACKLIGHT_ON_STATE 0 #define BACKLIGHT_PIN B5 #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/neito/readme.md b/keyboards/neito/readme.md index cdcdc0e8e02d..4b41e752f947 100644 --- a/keyboards/neito/readme.md +++ b/keyboards/neito/readme.md @@ -1,7 +1,12 @@ # Neito +### by Oliver Granlund ISO-variant of TGR Alice with a few tweaks! +![First prototype](https://i.redd.it/5ujrp8fupid61.jpg) + +GB:s of this board are hosted on [https://olli.works](https://olli.works) + Make example for this keyboard (after setting up your build environment): make neito:default From 0345f541fe0a45edfd3f782d4898129f33239d8c Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Sat, 6 Feb 2021 14:26:47 +0200 Subject: [PATCH 17/30] Made requested PR changed, added tap code delay to make encoder work as a volume rocker --- keyboards/neito/config.h | 6 +++--- keyboards/neito/neito.c | 8 -------- keyboards/neito/rules.mk | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 7d53b0b6b9ef..ccefb7f915d3 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -21,8 +21,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER Oliver Granlund #define PRODUCT Neito -#define DESCRIPTION Alice style keyboard with ISO-layout - #define MATRIX_ROWS 10 #define MATRIX_COLS 8 @@ -49,4 +47,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_LIMIT_VAL 200 \ No newline at end of file +#define RGBLIGHT_LIMIT_VAL 200 + +#define TAP_CODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c index d40384837888..bf5d187af511 100644 --- a/keyboards/neito/neito.c +++ b/keyboards/neito/neito.c @@ -15,11 +15,3 @@ */ #include "neito.h" - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if(res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - } - return res; -} \ No newline at end of file diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index 28d3fcdb776a..e913bcbe8cf8 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -25,8 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches ENCODER_ENABLE = yes \ No newline at end of file From 1894691a40ddf4879f0c3718ae836f2cccdf47cb Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Sat, 6 Feb 2021 14:29:47 +0200 Subject: [PATCH 18/30] updated Readme with new images --- keyboards/neito/readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/neito/readme.md b/keyboards/neito/readme.md index 4b41e752f947..8853498d4b2f 100644 --- a/keyboards/neito/readme.md +++ b/keyboards/neito/readme.md @@ -3,7 +3,9 @@ ISO-variant of TGR Alice with a few tweaks! -![First prototype](https://i.redd.it/5ujrp8fupid61.jpg) +![First prototype](https://i.imgur.com/GbZAnIp.jpg) + +![First prototypes backside](https://i.imgur.com/h7Hx6EU.jpg) GB:s of this board are hosted on [https://olli.works](https://olli.works) From 2e33ea74907db73639b7697e09e130c7d8a935a3 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Mon, 15 Feb 2021 09:20:14 +0200 Subject: [PATCH 19/30] proposed changes --- keyboards/dz60/keymaps/olligranlund_iso/readme.md | 2 +- .../keebio/iris/keymaps/olligranlund_nordic_v2/config.h | 6 +----- keyboards/neito/keymaps/default/keymap.c | 6 +----- keyboards/neito/keymaps/via/keymap.c | 6 +----- keyboards/neito/readme.md | 4 ++-- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/keyboards/dz60/keymaps/olligranlund_iso/readme.md b/keyboards/dz60/keymaps/olligranlund_iso/readme.md index d6f1b575827d..77869e4361f8 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso/readme.md +++ b/keyboards/dz60/keymaps/olligranlund_iso/readme.md @@ -1,6 +1,6 @@ # DZ60 with splitted parts with VIA support ### by Oliver Granlund -![Finished product](https://i.imgur.com/HlEo5Yg.jpg) +![Finished product](https://i.imgur.com/HlEo5Ygl.jpg) This is still under progress, but currently works on Windows as a daily driver. \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h index 417d7f86212d..c1acce7c3807 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h @@ -28,8 +28,4 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#undef RGBLED_NUM - -// Via stuff? -// #define PRODUCT_ID 3406832214 -// #define MANUFACTURER keebio \ No newline at end of file +#undef RGBLED_NUM \ No newline at end of file diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index 16e81bf0de8e..1526b9b198f1 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -61,8 +61,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else { tap_code(KC_VOLD); } -}; - -bool led_update_user(led_t led_state) { - return true; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c index 16e81bf0de8e..1526b9b198f1 100644 --- a/keyboards/neito/keymaps/via/keymap.c +++ b/keyboards/neito/keymaps/via/keymap.c @@ -61,8 +61,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else { tap_code(KC_VOLD); } -}; - -bool led_update_user(led_t led_state) { - return true; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/keyboards/neito/readme.md b/keyboards/neito/readme.md index 8853498d4b2f..29686c432566 100644 --- a/keyboards/neito/readme.md +++ b/keyboards/neito/readme.md @@ -3,9 +3,9 @@ ISO-variant of TGR Alice with a few tweaks! -![First prototype](https://i.imgur.com/GbZAnIp.jpg) +![First prototype](https://i.imgur.com/GbZAnIpl.jpg) -![First prototypes backside](https://i.imgur.com/h7Hx6EU.jpg) +![First prototypes backside](https://i.imgur.com/h7Hx6EUl.jpg) GB:s of this board are hosted on [https://olli.works](https://olli.works) From 1a8776ff92cd498d5347980b628e549fe5bd83d8 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Tue, 2 Mar 2021 21:28:38 +0200 Subject: [PATCH 20/30] proposed PR changes --- keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md | 2 +- keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md | 2 +- keyboards/neito/info.json | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md b/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md index d1cc16400fbe..1d81116af837 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md +++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md @@ -1,6 +1,6 @@ # DZ60 with splitted parts with VIA support ### by Oliver Granlund -![Finished product](https://i.imgur.com/AT1Lyrx.jpg) +![Finished product](https://i.imgur.com/AT1Lyrxl.jpg) This is still under progress, but currently works on Windows as a daily driver. Also added macros for Slack emojis \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md index 0e2e142d3c4e..82d460c756ac 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md @@ -1,7 +1,7 @@ # Iris Nordic Layout V2, now with VIA support ### by Oliver Granlund -![Finished product](https://i.imgur.com/Y1V9Dvp.jpg) +![Finished product](https://i.imgur.com/Y1V9Dvpl.jpg) After my rebuild I decided on making the layout better for swapping between 60% and Iris. diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 1f3352052682..11f0f5e10e25 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -4,10 +4,8 @@ "maintainer":"Oliver Granlund", "width":18.1875, "height":14.25, - "matrix": {"rows": 10, "cols": 8}, "layouts":{ "LAYOUT":{ - "key_count": 68, "layout":[ { "label":"0,7", From d46f0a902247ce222719d2d52cb009b14eb2681d Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Fri, 5 Mar 2021 09:42:46 +0200 Subject: [PATCH 21/30] changes according to pr --- keyboards/dz60/keymaps/olligranlund_iso/keymap.c | 12 ++++++++---- keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c | 12 ++++++++---- .../iris/keymaps/olligranlund_nordic_v2/keymap.c | 4 ---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c index a89eb22d350b..b5cc920b565c 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c +++ b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c @@ -48,25 +48,29 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">dancers>"); - } else {} break; + } + break; case EMOJI_PERJANTAI: if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">perjantaideploy>"); - } else {} break; + } + break; case EMOJI_THISISFINE: if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">this/is/fine>"); - } else {} break; + } + break; case EMOJI_KOVAAAJOA: if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">kovaaajoa>"); - } else {} break; + } + break; } return true; diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c index 8b2f587a946e..76fdedbbd68a 100644 --- a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c +++ b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c @@ -48,25 +48,29 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">dancers>"); - } else {} break; + } + break; case EMOJI_PERJANTAI: if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">perjantaideploy>"); - } else {} break; + } + break; case EMOJI_THISISFINE: if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">this/is/fine>"); - } else {} break; + } + break; case EMOJI_KOVAAAJOA: if (record->event.pressed) { // when keycode QMKBEST is pressed SEND_STRING(">kovaaajoa>"); - } else {} break; + } + break; } return true; diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c index c2e9c36cfe04..8016ca1e5019 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c @@ -102,7 +102,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_single_persistent_default_layer(_QWERTY); } return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); @@ -112,7 +111,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { update_tri_layer(_LOWER, _RAISE, _ADJUST); } return false; - break; case RAISE: if (record->event.pressed) { layer_on(_RAISE); @@ -122,7 +120,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { update_tri_layer(_LOWER, _RAISE, _ADJUST); } return false; - break; case ADJUST: if (record->event.pressed) { @@ -131,7 +128,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_off(_ADJUST); } return false; - break; } return true; } From dc032cbc40a559272134a03ec61c7dfec727bc28 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Thu, 18 Mar 2021 22:34:37 +0200 Subject: [PATCH 22/30] adjusting Neito info.json to look proper in config.qmk.fm --- keyboards/neito/info.json | 726 +++++++++++++++++++------------------- 1 file changed, 363 insertions(+), 363 deletions(-) diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 11f0f5e10e25..dd003b71c067 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -1,365 +1,365 @@ { - "keyboard_name":"Neito", - "url":"olli.works", - "maintainer":"Oliver Granlund", - "width":18.1875, - "height":14.25, - "layouts":{ - "LAYOUT":{ - "layout":[ - { - "label":"0,7", - "x":16.6875, - "y":0.75 - }, - { - "label":"0,1", - "x":2.75, - "y":0.9375 - }, - { - "label":"1,5", - "x":12.4375, - "y":0.9375 - }, - { - "label":"0,0", - "x":0.75, - "y":1 - }, - { - "label":"1,0", - "x":1.75, - "y":1 - }, - { - "label":"0,6", - "x":13.4375, - "y":1 - }, - { - "label":"1,6", - "x":14.4375, - "y":1, - "w":2 - }, - { - "label":"2,7", - "x":16.9375, - "y":1.75 - }, - { - "label":"2,0", - "x":0.5625, - "y":2, - "w":1.5 - }, - { - "label":"3,0", - "x":2.0625, - "y":2 - }, - { - "label":"3,5", - "x":13.1875, - "y":2 - }, - { - "label":"2,6", - "x":14.1875, - "y":2 - }, - { - "label":"3,6", - "x":15.4375, - "y":2, - "w":1.25, - "h":2 - }, - { - "label":"4,7", - "x":17.1875, - "y":2.75 - }, - { - "label":"4,0", - "x":0.3125, - "y":3, - "w":1.75 - }, - { - "label":"5,0", - "x":2.0625, - "y":3 - }, - { - "label":"4,5", - "x":12.4375, - "y":3 - }, - { - "label":"5,5", - "x":13.4375, - "y":3 - }, - { - "label":"4,6", - "x":14.4375, - "y":3 - }, - { - "label":"6,0", - "x":0.125, - "y":4, - "w":1.25 - }, - { - "label":"8,0", - "x":1.375, - "y":4 - }, - { - "label":"7,0", - "x":2.375, - "y":4 - }, - { - "label":"6,5", - "x":12.94, - "y":4 - }, - { - "label":"6,6", - "x":13.9375, - "y":4, - "w":1.75 - }, - { - "label":"7,6", - "x":15.9375, - "y":4.25 - }, - { - "label":"9,0", - "x":0.125, - "y":5, - "w":1.5 - }, - { - "label":"8,6", - "x":14.9375, - "y":5.25 - }, - { - "label":"9,6", - "x":15.9375, - "y":5.25 - }, - { - "label":"8,7", - "x":16.9375, - "y":5.25 - }, - { - "label":"1,1", - "x":0.5, - "y":5.25 - }, - { - "label":"0,2", - "x":1.5, - "y":5.25 - }, - { - "label":"1,2", - "x":2.5, - "y":5.25 - }, - { - "label":"0,3", - "x":3.5, - "y":5.25 - }, - { - "label":"2,1", - "x":0, - "y":6.25 - }, - { - "label":"3,1", - "x":1, - "y":6.25 - }, - { - "label":"2,2", - "x":2, - "y":6.25 - }, - { - "label":"3,2", - "x":3, - "y":6.25 - }, - { - "label":"4,1", - "x":0.25, - "y":7.25 - }, - { - "label":"5,1", - "x":1.25, - "y":7.25 - }, - { - "label":"4,2", - "x":2.25, - "y":7.25 - }, - { - "label":"5,2", - "x":3.25, - "y":7.25 - }, - { - "label":"6,1", - "x":0.75, - "y":8.25 - }, - { - "label":"7,1", - "x":1.75, - "y":8.25 - }, - { - "label":"6,2", - "x":2.75, - "y":8.25 - }, - { - "label":"7,2", - "x":3.75, - "y":8.25 - }, - { - "label":"8,1", - "x":0.75, - "y":9.25, - "w":1.5 - }, - { - "label":"8,2", - "x":2.25, - "y":9.25, - "w":2 - }, - { - "label":"9,2", - "x":4.25, - "y":9.25 - }, - { - "label":"1,3", - "x":-4.5, - "y":9.25 - }, - { - "label":"0,4", - "x":-3.5, - "y":9.25 - }, - { - "label":"1,4", - "x":-2.5, - "y":9.25 - }, - { - "label":"0,5", - "x":-1.5, - "y":9.25 - }, - { - "label":"2,3", - "x":-5.0, - "y":10.25 - }, - { - "label":"3,3", - "x":-4, - "y":10.25 - }, - { - "label":"2,4", - "x":-3.0, - "y":10.25 - }, - { - "label":"3,4", - "x":-2, - "y":10.25 - }, - { - "label":"2,5", - "x":-1.0, - "y":10.25 - }, - { - "label":"4,3", - "x":-4.75, - "y":11.25 - }, - { - "label":"5,3", - "x":-3.75, - "y":11.25 - }, - { - "label":"4,4", - "x":-2.75, - "y":11.25 - }, - { - "label":"5,4", - "x":-1.75, - "y":11.25 - }, - { - "label":"8,3", - "x":-5.5, - "y":12.25 - }, - { - "label":"6,3", - "x":-4.5, - "y":12.25 - }, - { - "label":"8,3", - "x":-3.5, - "y":12.25 - }, - { - "label":"6,4", - "x":-2.5, - "y":12.25 - }, - { - "label":"7,4", - "x":-1.5, - "y":12.25 - }, - { - "label":"9,3", - "x":-5.0, - "y":13.25, - "w":2.75 - }, - { - "label":"8,4", - "x":-2.25, - "y":13.25, - "w":1.5 - } - ] - } - } + "keyboard_name":"Neito", + "url":"olli.works", + "maintainer":"Oliver Granlund", + "width":20.69, + "height":14.755, + "layouts":{ + "LAYOUT":{ + "layout":[ + { + "label":"0,7", + "x":19.19, + "y":0.75 + }, + { + "label":"0,1", + "x":2.75, + "y":0.9375 + }, + { + "label":"1,5", + "x":14.94, + "y":0.94 + }, + { + "label":"0,0", + "x":0.75, + "y":1 + }, + { + "label":"1,0", + "x":1.75, + "y":1 + }, + { + "label":"0,6", + "x":15.94, + "y":1 + }, + { + "label":"1,6", + "x":16.94, + "y":1, + "w":2 + }, + { + "label":"1,1", + "x":4, + "y":1.19 + }, + { + "label":"0,2", + "x":5, + "y":1.19 + }, + { + "label":"1,2", + "x":6, + "y":1.19 + }, + { + "label":"0,3", + "x":7, + "y":1.19 + }, + { + "label":"1,3", + "x":10.25, + "y":1.19 + }, + { + "label":"0,4", + "x":11.25, + "y":1.19 + }, + { + "label":"1,4", + "x":12.25, + "y":1.19 + }, + { + "label":"0,5", + "x":13.25, + "y":1.19 + }, + { + "label":"2,7", + "x":19.44, + "y":1.75 + }, + { + "label":"2,0", + "x":0.5625, + "y":2.0, + "w":1.5 + }, + { + "label":"3,0", + "x":2.0625, + "y":2.0 + }, + { + "label":"3,5", + "x":15.69, + "y":2.0 + }, + { + "label":"2,6", + "x":16.69, + "y":2.0 + }, + { + "label":"3,6", + "x":17.94, + "y":2.0, + "w":1.25, + "h":2 + }, + { + "label":"2,1", + "x":3.5, + "y":2.19 + }, + { + "label":"3,1", + "x":4.5, + "y":2.19 + }, + { + "label":"2,2", + "x":5.5, + "y":2.19 + }, + { + "label":"3,2", + "x":6.5, + "y":2.19 + }, + { + "label":"2,3", + "x":9.75, + "y":2.19 + }, + { + "label":"3,3", + "x":10.75, + "y":2.19 + }, + { + "label":"2,4", + "x":11.75, + "y":2.19 + }, + { + "label":"3,4", + "x":12.75, + "y":2.19 + }, + { + "label":"2,5", + "x":13.75, + "y":2.19 + }, + { + "label":"4,7", + "x":19.69, + "y":2.75 + }, + { + "label":"4,0", + "x":0.3125, + "y":3.0, + "w":1.75 + }, + { + "label":"5,0", + "x":2.0625, + "y":3.0 + }, + { + "label":"4,5", + "x":14.94, + "y":3.0 + }, + { + "label":"5,5", + "x":15.94, + "y":3.0 + }, + { + "label":"4,6", + "x":16.94, + "y":3.0 + }, + { + "label":"4,1", + "x":3.75, + "y":3.19 + }, + { + "label":"5,1", + "x":4.75, + "y":3.19 + }, + { + "label":"4,2", + "x":5.75, + "y":3.19 + }, + { + "label":"5,2", + "x":6.75, + "y":3.19 + }, + { + "label":"4,3", + "x":10, + "y":3.19 + }, + { + "label":"5,3", + "x":11, + "y":3.19 + }, + { + "label":"4,4", + "x":12, + "y":3.19 + }, + { + "label":"5,4", + "x":13, + "y":3.19 + }, + { + "label":"6,0", + "x":0.125, + "y":4.0, + "w":1.25 + }, + { + "label":"8,0", + "x":1.375, + "y":4.0 + }, + { + "label":"7,0", + "x":2.375, + "y":4.0 + }, + { + "label":"6,5", + "x":15.44, + "y":4.0 + }, + { + "label":"6,6", + "x":16.44, + "y":4.0, + "w":1.75 + }, + { + "label":"6,1", + "x":4.25, + "y":4.1899999999999995 + }, + { + "label":"7,1", + "x":5.25, + "y":4.1899999999999995 + }, + { + "label":"6,2", + "x":6.25, + "y":4.1899999999999995 + }, + { + "label":"7,2", + "x":7.25, + "y":4.1899999999999995 + }, + { + "label":"8,3", + "x":9.25, + "y":4.1899999999999995 + }, + { + "label":"6,3", + "x":10.25, + "y":4.1899999999999995 + }, + { + "label":"7,3", + "x":11.25, + "y":4.1899999999999995 + }, + { + "label":"6,4", + "x":12.25, + "y":4.1899999999999995 + }, + { + "label":"7,4", + "x":13.25, + "y":4.1899999999999995 + }, + { + "label":"7,6", + "x":18.44, + "y":4.25 + }, + { + "label":"9,0", + "x":0.125, + "y":5.0, + "w":1.5 + }, + { + "label":"8,1", + "x":4.25, + "y":5.1899999999999995, + "w":1.5 + }, + { + "label":"8,2", + "x":5.75, + "y":5.1899999999999995, + "w":2 + }, + { + "label":"9,2", + "x":7.75, + "y":5.1899999999999995 + }, + { + "label":"9,3", + "x":9.75, + "y":5.1899999999999995, + "w":2.75 + }, + { + "label":"8,4", + "x":12.5, + "y":5.1899999999999995, + "w":1.5 + }, + { + "label":"8,6", + "x":17.44, + "y":5.25 + }, + { + "label":"9,6", + "x":18.44, + "y":5.25 + }, + { + "label":"8,7", + "x":19.44, + "y":5.25 + } + ] + } + } } \ No newline at end of file From 769dbf461d6aa2e252bc9588c480fd90687c7051 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 24 Mar 2021 21:31:09 +0200 Subject: [PATCH 23/30] Readjusted keymap in KLE to be glued to left and top edge, fixed rounding errors by hand after QMK-converter --- keyboards/neito/info.json | 158 +++++++++++++++++++------------------- keyboards/neito/rules.mk | 28 +++---- 2 files changed, 89 insertions(+), 97 deletions(-) diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index dd003b71c067..92900051a192 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -10,354 +10,354 @@ { "label":"0,7", "x":19.19, - "y":0.75 + "y":0 }, { "label":"0,1", - "x":2.75, - "y":0.9375 + "x":2.62, + "y":0.19 }, { "label":"1,5", "x":14.94, - "y":0.94 + "y":0.19 }, { "label":"0,0", - "x":0.75, - "y":1 + "x":0.62, + "y":0.25 }, { "label":"1,0", - "x":1.75, - "y":1 + "x":1.62, + "y":0.25 }, { "label":"0,6", "x":15.94, - "y":1 + "y":0.25 }, { "label":"1,6", "x":16.94, - "y":1, + "y":0.25, "w":2 }, { "label":"1,1", "x":4, - "y":1.19 + "y":0.44 }, { "label":"0,2", "x":5, - "y":1.19 + "y":0.44 }, { "label":"1,2", "x":6, - "y":1.19 + "y":0.44 }, { "label":"0,3", "x":7, - "y":1.19 + "y":0.44 }, { "label":"1,3", "x":10.25, - "y":1.19 + "y":0.44 }, { "label":"0,4", "x":11.25, - "y":1.19 + "y":0.44 }, { "label":"1,4", "x":12.25, - "y":1.19 + "y":0.44 }, { "label":"0,5", "x":13.25, - "y":1.19 + "y":0.44 }, { "label":"2,7", "x":19.44, - "y":1.75 + "y":1 }, { "label":"2,0", - "x":0.5625, - "y":2.0, + "x":0.43, + "y":1.25, "w":1.5 }, { "label":"3,0", - "x":2.0625, - "y":2.0 + "x":1.93, + "y":1.25 }, { "label":"3,5", "x":15.69, - "y":2.0 + "y":1.25 }, { "label":"2,6", "x":16.69, - "y":2.0 + "y":1.25 }, { "label":"3,6", "x":17.94, - "y":2.0, + "y":1.25, "w":1.25, "h":2 }, { "label":"2,1", "x":3.5, - "y":2.19 + "y":1.44 }, { "label":"3,1", "x":4.5, - "y":2.19 + "y":1.44 }, { "label":"2,2", "x":5.5, - "y":2.19 + "y":1.44 }, { "label":"3,2", "x":6.5, - "y":2.19 + "y":1.44 }, { "label":"2,3", "x":9.75, - "y":2.19 + "y":1.44 }, { "label":"3,3", "x":10.75, - "y":2.19 + "y":1.44 }, { "label":"2,4", "x":11.75, - "y":2.19 + "y":1.44 }, { "label":"3,4", "x":12.75, - "y":2.19 + "y":1.44 }, { "label":"2,5", "x":13.75, - "y":2.19 + "y":1.44 }, { "label":"4,7", "x":19.69, - "y":2.75 + "y":2.0 }, { "label":"4,0", - "x":0.3125, - "y":3.0, + "x":0.18, + "y":2.25, "w":1.75 }, { "label":"5,0", - "x":2.0625, - "y":3.0 + "x":1.93, + "y":2.25 }, { "label":"4,5", "x":14.94, - "y":3.0 + "y":2.25 }, { "label":"5,5", "x":15.94, - "y":3.0 + "y":2.25 }, { "label":"4,6", "x":16.94, - "y":3.0 + "y":2.25 }, { "label":"4,1", "x":3.75, - "y":3.19 + "y":2.44 }, { "label":"5,1", "x":4.75, - "y":3.19 + "y":2.44 }, { "label":"4,2", "x":5.75, - "y":3.19 + "y":2.44 }, { "label":"5,2", "x":6.75, - "y":3.19 + "y":2.44 }, { "label":"4,3", "x":10, - "y":3.19 + "y":2.44 }, { "label":"5,3", "x":11, - "y":3.19 + "y":2.44 }, { "label":"4,4", "x":12, - "y":3.19 + "y":2.44 }, { "label":"5,4", "x":13, - "y":3.19 + "y":2.44 }, { "label":"6,0", - "x":0.125, - "y":4.0, + "x":0, + "y":3.25, "w":1.25 }, { "label":"8,0", - "x":1.375, - "y":4.0 + "x":1.25, + "y":3.25 }, { "label":"7,0", - "x":2.375, - "y":4.0 + "x":2.25, + "y":3.25 }, { "label":"6,5", "x":15.44, - "y":4.0 + "y":3.25 }, { "label":"6,6", "x":16.44, - "y":4.0, + "y":3.25, "w":1.75 }, { "label":"6,1", "x":4.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"7,1", "x":5.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"6,2", "x":6.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"7,2", "x":7.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"8,3", "x":9.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"6,3", "x":10.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"7,3", "x":11.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"6,4", "x":12.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"7,4", "x":13.25, - "y":4.1899999999999995 + "y":3.44 }, { "label":"7,6", "x":18.44, - "y":4.25 + "y":3.5 }, { "label":"9,0", - "x":0.125, - "y":5.0, + "x":0, + "y":4.25, "w":1.5 }, { "label":"8,1", "x":4.25, - "y":5.1899999999999995, + "y":4.44, "w":1.5 }, { "label":"8,2", "x":5.75, - "y":5.1899999999999995, + "y":4.44, "w":2 }, { "label":"9,2", "x":7.75, - "y":5.1899999999999995 + "y":4.44 }, { "label":"9,3", "x":9.75, - "y":5.1899999999999995, + "y":4.44, "w":2.75 }, { "label":"8,4", "x":12.5, - "y":5.1899999999999995, + "y":4.44, "w":1.5 }, { "label":"8,6", "x":17.44, - "y":5.25 + "y":4.5 }, { "label":"9,6", "x":18.44, - "y":5.25 + "y":4.5 }, { "label":"8,7", "x":19.44, - "y":5.25 + "y":4.5 } ] } diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index e913bcbe8cf8..bd6660d0ff01 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -2,29 +2,21 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration 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 +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes \ No newline at end of file From 9c998e8436873a74bae5814fb51b343fee5c0f27 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Sat, 3 Apr 2021 11:20:03 +0300 Subject: [PATCH 24/30] Added additional empty lines un rules.mk for clarity --- keyboards/neito/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index bd6660d0ff01..4092e3e325a6 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -3,6 +3,7 @@ MCU = atmega32u4 # Bootloader selection BOOTLOADER = atmel-dfu + # Build Options # change yes to no to disable # @@ -19,4 +20,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file +ENCODER_ENABLE = yes From 4386c77be809e04ee67d8e6e03a61b79b95f1004 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Sat, 15 May 2021 16:03:54 +0300 Subject: [PATCH 25/30] proposed changed, improved Neito README to have instructions about bootloader reset --- .../keymaps/olligranlund_nordic_v2/keymap.c | 36 ++++++++----------- keyboards/neito/readme.md | 10 +++++- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c index 8016ca1e5019..d616884eb39a 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c @@ -1,25 +1,25 @@ /* Copyright 2020 Oliver Granlund - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 enum layers ( _QWERTY, _LOWER, - _RAISE + _RAISE, _ADJUST, }; @@ -30,12 +30,6 @@ enum custom_keycodes { ADJUST, }; -#define KC_ KC_TRNS - -#define KC_LOWER LOWER -#define KC_RAISE RAISE -#define KC_RST RESET - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( diff --git a/keyboards/neito/readme.md b/keyboards/neito/readme.md index 29686c432566..eec96d3341e9 100644 --- a/keyboards/neito/readme.md +++ b/keyboards/neito/readme.md @@ -7,7 +7,15 @@ ISO-variant of TGR Alice with a few tweaks! ![First prototypes backside](https://i.imgur.com/h7Hx6EUl.jpg) -GB:s of this board are hosted on [https://olli.works](https://olli.works) +* Keyboard Maintainer: [Oliver Granlund](https://github.com/OlliGranlund) +* Hardware Supported: Neito PCB (ATmega32U4) +* Hardware Availability: Group Buys hosted on [https://olli.works](https://olli.works) + +Getting the board into bootloader mode: + +To be able to flash firmware onto this board, you'll need to bring the keyboard into bootloader mode. The keyboard has a debug-panel located between the keys "H" and "N". In this 2x3-panel, short the two pins which are furthest away from the atmega32u4 microcontroller. See the red arrows in the image below. + +![Reset pins](https://i.imgur.com/fN2XjY8l.jpg) Make example for this keyboard (after setting up your build environment): From af2c5093e3c9b17d7c7463e17934fb652ff3a545 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 19 May 2021 22:01:23 +0300 Subject: [PATCH 26/30] Fixing Neito matrix, fixing all keymaps to work with clearer matrix, making default keymaps simpler and splitting specific keymap to own folder, adjusting RGB array, adding libs for better debug/via use --- keyboards/neito/config.h | 3 +- keyboards/neito/keymaps/default/keymap.c | 44 +++++++------- keyboards/neito/keymaps/olli.works/keymap.c | 64 +++++++++++++++++++++ keyboards/neito/keymaps/olli.works/rules.mk | 2 + keyboards/neito/keymaps/via/keymap.c | 46 +++++++-------- keyboards/neito/neito.h | 10 ++-- keyboards/neito/rules.mk | 5 +- 7 files changed, 121 insertions(+), 53 deletions(-) create mode 100644 keyboards/neito/keymaps/olli.works/keymap.c create mode 100644 keyboards/neito/keymaps/olli.works/rules.mk diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index ccefb7f915d3..ecd66daf291a 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -44,9 +44,10 @@ #define RGB_DI_PIN D5 #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 11 +#define RGBLIGHT_LED_MAP { 4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5 } #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 -#define TAP_CODE_DELAY 10 \ No newline at end of file +#define TAP_CODE_DELAY 10 diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index 1526b9b198f1..bf04dd267dc8 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -25,32 +25,32 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_MUTE, - 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, TG(_MAC), - MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + 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_MUTE, + 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, MO(_FN0), + 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, MO(_FN1), + 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, + KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [_MAC] = LAYOUT( - 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_TRNS, - 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_TRNS, - MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), - 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_LGUI, KC_NUBS, KC_LALT, KC_SPC, KC_LCTL, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + [_FN0] = LAYOUT( + 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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FN1] = LAYOUT( - 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_TRNS, - KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, - KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, 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, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, + 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 ), [_FN2] = LAYOUT( - KC_ESC, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, - KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, - 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_LGUI, 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, 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 ), }; @@ -61,4 +61,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else { tap_code(KC_VOLD); } -}; \ No newline at end of file +}; diff --git a/keyboards/neito/keymaps/olli.works/keymap.c b/keyboards/neito/keymaps/olli.works/keymap.c new file mode 100644 index 000000000000..60d5f98841f6 --- /dev/null +++ b/keyboards/neito/keymaps/olli.works/keymap.c @@ -0,0 +1,64 @@ +/* Copyright 2020 Oliver Granlund + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 + +enum layers { + _DEFAULT, + _MAC, + _FN1, + _FN2, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_DEFAULT] = LAYOUT( + 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_MUTE, + 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, TG(_MAC), + MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), + 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, + KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_MAC] = LAYOUT( + 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_TRNS, + 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_TRNS, + MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), + 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, + KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_FN1] = LAYOUT( + 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_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, 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 + ), + [_FN2] = LAYOUT( + KC_ESC, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, + 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_LGUI, 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 + ), +}; + + +void encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } +}; diff --git a/keyboards/neito/keymaps/olli.works/rules.mk b/keyboards/neito/keymaps/olli.works/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/neito/keymaps/olli.works/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c index 1526b9b198f1..01dd7cc0783a 100644 --- a/keyboards/neito/keymaps/via/keymap.c +++ b/keyboards/neito/keymaps/via/keymap.c @@ -18,39 +18,39 @@ enum layers { _DEFAULT, - _MAC, + _FN0, _FN1, _FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_MUTE, - 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, TG(_MAC), - MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), - 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_NUBS, KC_LALT, KC_SPC, KC_SPC, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + 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_MUTE, + 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, MO(_FN0), + 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, MO(_FN1), + 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, + KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [_MAC] = LAYOUT( - 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_TRNS, - 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_TRNS, - MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), - 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_LGUI, KC_NUBS, KC_LALT, KC_SPC, KC_LCTL, KC_B, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + [_FN0] = LAYOUT( + 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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FN1] = LAYOUT( - 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_TRNS, - KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, - KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, 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, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, + 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 ), [_FN2] = LAYOUT( - KC_ESC, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, - KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, - 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_LGUI, 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, 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 ), }; @@ -61,4 +61,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else { tap_code(KC_VOLD); } -}; \ No newline at end of file +}; diff --git a/keyboards/neito/neito.h b/keyboards/neito/neito.h index e25470fffa36..35f1df286245 100644 --- a/keyboards/neito/neito.h +++ b/keyboards/neito/neito.h @@ -18,11 +18,11 @@ #include "quantum.h" #define LAYOUT( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k66, k76, \ - k90, k80, k81, k82, k92, k83, k93, k84, k86, k96, k87 \ + k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, \ + k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, \ + k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \ + k60, k80, k70, k61, k71, k62, k72, k83, k63, k73, k64, k74, k65, k66, k76, \ + k90, k81, k82, k92, k93, k84, k86, k96, k87 \ ) { \ { k00, k01, k02, k03, k04, k05, k06, k07 }, \ { k10, k11, k12, k13, k14, k15, k16, KC_NO }, \ diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index 4092e3e325a6..fe22f824f313 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -20,4 +20,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes +ENCODER_ENABLE = yes # We have a encoder +MOUSEKEY_ENABLE = yes # In case someone wants to use mousekeys and doesn't want to reflash stock firmware From 8225e11f20dcf193a4b82283aaa944d49533a32e Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Wed, 19 May 2021 22:13:12 +0300 Subject: [PATCH 27/30] ESC to GESC, fixing copyright texts --- keyboards/neito/config.h | 7 ++++++- keyboards/neito/keymaps/default/keymap.c | 2 +- keyboards/neito/keymaps/olli.works/keymap.c | 2 +- keyboards/neito/keymaps/via/keymap.c | 2 +- keyboards/neito/neito.c | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index ecd66daf291a..c638b800c45a 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -1,4 +1,5 @@ -/* Copyright 2020 Oliver Granlund +/* Copyright 2021 Oliver Granlund + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or @@ -39,6 +40,8 @@ #define BACKLIGHT_PIN B5 #define BACKLIGHT_LEVELS 5 +#define GRAVE_ESC_CTRL_OVERRIDE + /* RGB Light Configuration */ #define RGB_DI_PIN D5 @@ -50,4 +53,6 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 +/* Handle volume control issue with rotary encoder */ + #define TAP_CODE_DELAY 10 diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index bf04dd267dc8..70770e807d14 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -25,7 +25,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_MUTE, + KC_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_MUTE, 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, MO(_FN0), 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, MO(_FN1), 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, diff --git a/keyboards/neito/keymaps/olli.works/keymap.c b/keyboards/neito/keymaps/olli.works/keymap.c index 60d5f98841f6..cf181f56006b 100644 --- a/keyboards/neito/keymaps/olli.works/keymap.c +++ b/keyboards/neito/keymaps/olli.works/keymap.c @@ -25,7 +25,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_MUTE, + KC_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_MUTE, 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, TG(_MAC), MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, MO(_FN2), 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, diff --git a/keyboards/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c index 01dd7cc0783a..7d655a2e1554 100644 --- a/keyboards/neito/keymaps/via/keymap.c +++ b/keyboards/neito/keymaps/via/keymap.c @@ -25,7 +25,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT] = LAYOUT( - 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_MUTE, + KC_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_MUTE, 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, MO(_FN0), 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, MO(_FN1), 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, diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c index bf5d187af511..a05831ec17e8 100644 --- a/keyboards/neito/neito.c +++ b/keyboards/neito/neito.c @@ -1,4 +1,4 @@ -/* Copyright 2020 ErkHal +/* Copyright 2021 Oliver Granlund * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 134fb921e4f768421c180c86f19e52aa2cd29b27 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Sat, 22 May 2021 15:24:09 +0300 Subject: [PATCH 28/30] iris typo fix, fixing naming on layers in neito:default, fixing neito rules to be cleaner --- .../keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c | 2 +- keyboards/neito/keymaps/default/keymap.c | 2 +- keyboards/neito/rules.mk | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c index d616884eb39a..b8a124baf0ee 100644 --- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c +++ b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H -enum layers ( +enum layers { _QWERTY, _LOWER, _RAISE, diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index 70770e807d14..7d655a2e1554 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -18,7 +18,7 @@ enum layers { _DEFAULT, - _MAC, + _FN0, _FN1, _FN2, }; diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk index fe22f824f313..b16bff32857d 100644 --- a/keyboards/neito/rules.mk +++ b/keyboards/neito/rules.mk @@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu # change yes to no to disable # BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +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 @@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # We have a encoder -MOUSEKEY_ENABLE = yes # In case someone wants to use mousekeys and doesn't want to reflash stock firmware +ENCODER_ENABLE = yes # We have a encoder From d8e1140ceb12a1c47c8fdf95e67bb492d05b4792 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Sat, 22 May 2021 16:39:30 +0300 Subject: [PATCH 29/30] rename neito keymap olli.works --> olli_works --- keyboards/neito/keymaps/{olli.works => olli_works}/keymap.c | 0 keyboards/neito/keymaps/{olli.works => olli_works}/rules.mk | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/neito/keymaps/{olli.works => olli_works}/keymap.c (100%) rename keyboards/neito/keymaps/{olli.works => olli_works}/rules.mk (100%) diff --git a/keyboards/neito/keymaps/olli.works/keymap.c b/keyboards/neito/keymaps/olli_works/keymap.c similarity index 100% rename from keyboards/neito/keymaps/olli.works/keymap.c rename to keyboards/neito/keymaps/olli_works/keymap.c diff --git a/keyboards/neito/keymaps/olli.works/rules.mk b/keyboards/neito/keymaps/olli_works/rules.mk similarity index 100% rename from keyboards/neito/keymaps/olli.works/rules.mk rename to keyboards/neito/keymaps/olli_works/rules.mk From 4beb54b407b21d79a36db2b68d4f439cc7216866 Mon Sep 17 00:00:00 2001 From: Oliver Granlund Date: Fri, 16 Jul 2021 16:52:43 +0300 Subject: [PATCH 30/30] Fixing encoders to work with 'new' QMK --- keyboards/neito/keymaps/default/keymap.c | 4 +++- keyboards/neito/keymaps/olli_works/keymap.c | 4 +++- keyboards/neito/keymaps/via/keymap.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/keyboards/neito/keymaps/default/keymap.c b/keyboards/neito/keymaps/default/keymap.c index 7d655a2e1554..47e84d58387a 100644 --- a/keyboards/neito/keymaps/default/keymap.c +++ b/keyboards/neito/keymaps/default/keymap.c @@ -55,10 +55,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void encoder_update_user(uint8_t index, bool clockwise) { +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/neito/keymaps/olli_works/keymap.c b/keyboards/neito/keymaps/olli_works/keymap.c index cf181f56006b..31763e1169f0 100644 --- a/keyboards/neito/keymaps/olli_works/keymap.c +++ b/keyboards/neito/keymaps/olli_works/keymap.c @@ -55,10 +55,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void encoder_update_user(uint8_t index, bool clockwise) { +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/neito/keymaps/via/keymap.c b/keyboards/neito/keymaps/via/keymap.c index 7d655a2e1554..47e84d58387a 100644 --- a/keyboards/neito/keymaps/via/keymap.c +++ b/keyboards/neito/keymaps/via/keymap.c @@ -55,10 +55,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { tap_code(KC_VOLU); } else { tap_code(KC_VOLD); } + + return true; };