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.

Sign up for GitHub

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

DZ60 keymap and layout #5474

Merged
merged 20 commits into from
May 4, 2019
Merged

DZ60 keymap and layout #5474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5aa9a80
init
OlliGranlund Mar 9, 2018
99b0c33
function layout planning
OlliGranlund Mar 10, 2018
9b333cd
Merge remote-tracking branch 'upstream'
OlliGranlund Sep 23, 2018
94323cf
nordic keymap v1.0
OlliGranlund Sep 30, 2018
1727b3a
Added latest satan layouts, updated readmes
OlliGranlund Sep 30, 2018
00e9b3f
Cleaning code
OlliGranlund Sep 30, 2018
d5097c9
Renamed ISO -> iso
OlliGranlund Sep 30, 2018
e7746fe
Updated keymap to work better with Swedish layout
OlliGranlund Jan 11, 2019
5129f8a
merged upstream
OlliGranlund Mar 23, 2019
ac7063a
merge conflict
OlliGranlund Mar 23, 2019
cda44c1
Added dz60 layout
OlliGranlund Mar 23, 2019
c83a0df
pr issues fixes
OlliGranlund Mar 24, 2019
f12692f
Merge remote-tracking branch 'upstream'
OlliGranlund Mar 24, 2019
5ed647d
removed weirdly positioned files
OlliGranlund Mar 24, 2019
1510f64
code cleanup, added dz60 layout json data
OlliGranlund Mar 24, 2019
46b5304
Added dz60 layout readme
OlliGranlund Mar 24, 2019
f6e752e
Renamed layout
OlliGranlund Mar 24, 2019
944688b
removed vscode file
OlliGranlund Mar 25, 2019
05b0a63
Update keyboards/dz60/dz60.h
drashna Apr 4, 2019
3bede56
Merge branch 'master' of https://github.com/qmk/qmk_firmware
OlliGranlund Apr 20, 2019
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
Prev Previous commit
Next Next commit
Added latest satan layouts, updated readmes
  • Loading branch information
@OlliGranlund
OlliGranlund committed Sep 30, 2018
commit 1727b3a7f00f1fd99552626fa3faabb9ff24abe9
11 changes: 11 additions & 0 deletions keyboards/iris/keymaps/olligranlund_nordic/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Iris Nordic Layout
### by Oliver Granlund

![Finished product](https://i.imgur.com/zqSBc3t.jpg)

This is for those who insist to use keyboard with ÅÄÖ. Also thought about the
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.
6 changes: 5 additions & 1 deletion keyboards/satan/keymaps/olligranlund_ISO/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

// Backlight configuration
#undef BACKLIGHT_LEVELS
#define BACKLIGHT_LEVELS 5
#define BACKLIGHT_LEVELS 10

// Underlight configuration
#undef RGB_DI_PIN
#define RGB_DI_PIN B2
#undef RGBLED_NUM
#define RGBLED_NUM 16 // Number of LEDs
#undef RGBLIGHT_HUE_STEP
Expand All @@ -13,3 +15,5 @@
#define RGBLIGHT_SAT_STEP 8
#undef RGBLIGHT_VAL_STEP
#define RGBLIGHT_VAL_STEP 8

#define RGBLIGHT_ANIMATIONS
55 changes: 18 additions & 37 deletions keyboards/satan/keymaps/olligranlund_ISO/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#include "satan.h"

#define BASE 0 // Default layer
#define SPACE 1 // Space layer
#define MOUSE 1 // Space layer
#define NUMPAD 2 // Alt layer
#define CAPS 3 // Caps layer
#define FN1 4 // Generic function layer

#define MAC0 M(0) //
#define MAC1 M(1) //
Expand Down Expand Up @@ -80,52 +79,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |-----------------------------------------------------------|
* |Ctrl|Gui |Alt | Space |Alt |Gui |FN |Ctrl |
* `-----------------------------------------------------------|
BL_TOGG
*/

[ BASE ] = KEYMAP_ISO_SPLITRSHIFT(
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_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, XXXXX, \
OSL(CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT, \
KC_LSPO, KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSPC, XXXXX, \
KC_LCTL, KC_LGUI,KC_LALT, LT(SPACE, KC_SPC), KC_RALT,OSL(FN1),TG(NUMPAD), KC_RCTL),
LT(CAPS, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT, \
KC_LSFT, KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, XXXXX, \
KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT, MO(CAPS), TG(NUMPAD), TG(MOUSE)),

[ SPACE ] = KEYMAP(
KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, XXXXX,\
_______, _______, _______, _______, MAIL, _______, _______, HOME, KC_UP, PSCR, SLCK, PAUS, PGUP, _______,\
_______, _______, _______, PGUP , PGDN, _______, LALT(KC_F4), KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,\
_______, _______, _______, _______, CALC, _______, _______, _______, MUTE, VOLD, VOLU, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, _______),
[ MOUSE ] = KEYMAP( // Mouse controls
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, _______),

[ NUMPAD ] = KEYMAP( //Numpad and alt shortcuts
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______, _______, XXXXX,\
_______, BL_TOGG, BL_DEC, BL_INC, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______,\
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______,\
_______, _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_7, KC_8, KC_9, KC_0, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, _______),

[ CAPS ] = KEYMAP( //Mostly mouse layer with option for caps too
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
_______, _______, KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______,\
_______, KC_CAPS, _______, _______, KC_MS_BTN1, KC_MS_BTN2, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, _______),


[ FN1 ] = KEYMAP( //Functions/settings
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_INC , BL_DEC , BL_TOGG, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, _______),
};

/* FN layer close to what the Pok3r has
[ FN1 ] = KEYMAP( //Functions/settings
[ CAPS ] = KEYMAP( // Main "function" key, arrows, media control
KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, XXXXX,\
_______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, PGUP, KC_MS_U, PGDN, PSCR, SLCK, PAUS, _______,\
_______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______,\
_______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, PGDN, KC_UP, PGUP, PSCR, SLCK, PAUS, _______,\
_______, KC__VOLDOWN, KC__MUTE, KC__VOLUP, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,\
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______)

};
*/
22 changes: 14 additions & 8 deletions keyboards/satan/keymaps/olligranlund_ISO/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# ISO layout for the Satan GH60
## Originally by Ben James, forked by Oliver Granlund
-----
This layout has a few unique features including:
* Spacebar activates special features when held:
# ISO layout for the Satan GH60
### Originally by Ben James, forked by Oliver Granlund

![Finished product](https://i.imgur.com/s5HAgr6.jpg)

I've wanted to make this as close to a P0ker as possible, but some macros in
the P0ker don't make sense...

Some of the features:
* Caps activates special features when held:
* Arrow keys directly under right hand
* Volume control
* Fn keys on number row
* PageUp/PageDn/Home/other general buttons
* Mouse control when CAPS is held. Right hand controls mouse direction, left hand controls speed and mouse buttons.
* Space cadet style brackets when left/right shift are tapped

* Mouse control
* Numpad (works so much better if this would be ortho)
### RGB-strip
![Behind the scenes](https://i.imgur.com/reHLXrc.jpg)
4 changes: 2 additions & 2 deletions keyboards/satan/keymaps/olligranlund_ISO/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
Expand Down