Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New keyboard: Neito + my DZ60 keymap tweaks #11773

Merged
merged 32 commits into from
Jul 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8b10f7f
manually fixing submodules issue
OlliGranlund Oct 26, 2020
50f9add
adding GPL text
OlliGranlund Nov 5, 2020
4b7523f
Added more GPL text, made requested edits to keymaps
OlliGranlund Nov 5, 2020
df4046d
Neito qmk init, still bug with compile but almost ready
OlliGranlund Dec 23, 2020
1a048f9
Merge branch 'master' into dev
OlliGranlund Dec 23, 2020
febee1c
minor adjustements to neito
OlliGranlund Dec 23, 2020
c375e92
moving neito-keyboard related files to right location as it's not a h…
OlliGranlund Dec 28, 2020
31a1cca
fixing readme for neito keyboard
OlliGranlund Dec 28, 2020
d830400
Adjusting neito keyboard properties and adding VIA support
OlliGranlund Dec 30, 2020
49b5e70
Adjusting product ID for neito keyboard
OlliGranlund Dec 30, 2020
24868af
Adding comment for neito-keyboard vendor ID
OlliGranlund Dec 30, 2020
5537429
removed unused keymap from neito keyboard
OlliGranlund Dec 30, 2020
161fe27
Adding back via-keymap with via-support in rules.mk
OlliGranlund Dec 30, 2020
f89abd8
4 layers for neito keyboard, layouts need still work
OlliGranlund Dec 30, 2020
772f941
Neito keymaps and conf
OlliGranlund Feb 1, 2021
f9e2c18
rgb brightness limit
OlliGranlund Feb 1, 2021
58d1e95
updated readme for Neito
OlliGranlund Feb 2, 2021
d810be5
Merge branch 'master' into dev
OlliGranlund Feb 2, 2021
0345f54
Made requested PR changed, added tap code delay to make encoder work …
OlliGranlund Feb 6, 2021
1894691
updated Readme with new images
OlliGranlund Feb 6, 2021
2e33ea7
proposed changes
OlliGranlund Feb 15, 2021
1a8776f
proposed PR changes
OlliGranlund Mar 2, 2021
d46f0a9
changes according to pr
OlliGranlund Mar 5, 2021
dc032cb
adjusting Neito info.json to look proper in config.qmk.fm
OlliGranlund Mar 18, 2021
769dbf4
Readjusted keymap in KLE to be glued to left and top edge, fixed roun…
OlliGranlund Mar 24, 2021
9c998e8
Added additional empty lines un rules.mk for clarity
OlliGranlund Apr 3, 2021
4386c77
proposed changed, improved Neito README to have instructions about bo…
OlliGranlund May 15, 2021
af2c509
Fixing Neito matrix, fixing all keymaps to work with clearer matrix, …
OlliGranlund May 19, 2021
8225e11
ESC to GESC, fixing copyright texts
OlliGranlund May 19, 2021
134fb92
iris typo fix, fixing naming on layers in neito:default, fixing neito…
OlliGranlund May 22, 2021
d8e1140
rename neito keymap olli.works --> olli_works
OlliGranlund May 22, 2021
4beb54b
Fixing encoders to work with 'new' QMK
OlliGranlund Jul 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 81 additions & 6 deletions keyboards/dz60/keymaps/olligranlund_iso/keymap.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

/* ISO 60 layout by olligranlund
Expand All @@ -19,20 +35,79 @@
* `-----------------------------------------------------------------------------------------'
*/

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>");
}
break;

case EMOJI_PERJANTAI:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING(">perjantaideploy>");
}
break;

case EMOJI_THISISFINE:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING(">this/is/fine>");
}
break;

case EMOJI_KOVAAAJOA:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING(">kovaaajoa>");
}
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),

};
4 changes: 2 additions & 2 deletions keyboards/dz60/keymaps/olligranlund_iso/readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DZ60 with splitted parts
# 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.
3 changes: 3 additions & 0 deletions keyboards/dz60/keymaps/olligranlund_iso/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
EXTRAKEY_ENABLE = yes
VIA_ENABLE = yes
LTO_ENABLE = yes
113 changes: 113 additions & 0 deletions keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/* 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 <http://www.gnu.org/licenses/>.
*/

#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>");
}
break;

case EMOJI_PERJANTAI:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING(">perjantaideploy>");
}
break;

case EMOJI_THISISFINE:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING(">this/is/fine>");
}
break;

case EMOJI_KOVAAAJOA:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING(">kovaaajoa>");
}
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),

};
6 changes: 6 additions & 0 deletions keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# DZ60 with splitted parts with VIA support
### by Oliver Granlund

![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
3 changes: 3 additions & 0 deletions keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
EXTRAKEY_ENABLE = yes
VIA_ENABLE = yes
LTO_ENABLE = yes
22 changes: 11 additions & 11 deletions keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* 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
16 changes: 16 additions & 0 deletions keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
#include "keymap_swedish.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
RGBLIGHT_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no
BACKLIGHT_ENABLE = no
31 changes: 31 additions & 0 deletions keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
Copyright 2017 Danny Nguyen <[email protected]>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#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
Loading