summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorMojitas <47667093+Mojitas@users.noreply.github.com>2021-03-17 04:09:45 +0100
committerGitHub <noreply@github.com>2021-03-16 20:09:45 -0700
commit4e8a218d175476664258333d89582c243969825f (patch)
treea3537d546b1d311f8917cf33b2ab6793ff3e465c /keyboards
parent57de02c9f290d26927778b1bf7b1cfa41090a436 (diff)
[Keymap] Mojito - removed layer macros (#12201)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/keebio/iris/keymaps/mojitas/config.h12
-rw-r--r--keyboards/keebio/iris/keymaps/mojitas/keymap.c150
2 files changed, 89 insertions, 73 deletions
diff --git a/keyboards/keebio/iris/keymaps/mojitas/config.h b/keyboards/keebio/iris/keymaps/mojitas/config.h
index 149a54be7f..24aecb9f84 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/config.h
+++ b/keyboards/keebio/iris/keymaps/mojitas/config.h
@@ -1,5 +1,5 @@
/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
+Copyright 2021 Mathias Strand <m.strand91@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,5 +17,13 @@ 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
-#define EE_HANDS
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+//#define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/keebio/iris/keymaps/mojitas/keymap.c b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
index 548bffc650..2ecfc0f6a1 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
@@ -1,18 +1,29 @@
+/*
+Copyright 2021 Mathias Strand <m.strand91@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General 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"
-//Heavily modified keymap. Some features:
-//Multiple layouts, I use dvorak as main.
//Nordic(swedish) signs
-//Symbols, numpad, arrows/navigation reachable under the alpas via the layers
-//Mirrored ctl, alt and shift to be able to use both hands when doing commands
-//Gaming layer, qwerty with space on left half.
enum layer_names {
_DVORAK,
_COLEMAK,
_QWERTY,
- _WORKMAN,
_GAMING,
_NUMPAD,
_LOWER,
@@ -20,13 +31,16 @@ enum layer_names {
_ADJUST
};
+
enum custom_keycodes {
QWERTY = SAFE_RANGE,
DVORAK,
COLEMAK,
- WORKMAN,
GAMING,
NUMPAD,
+ LOWER,
+ RAISE,
+ ADJUST
};
#define KC_ KC_TRNS
@@ -34,16 +48,13 @@ enum custom_keycodes {
#define SE_YEN ALGR(SE_6) //isn't in the swedish_keymap.h
#define KC_CATDEL LCTL(LALT(KC_DEL)) // Ctrl alt del
#define KC_TSKMGR LCTL(S(KC_ESC)) // Ctrl shift esc
-#define KC_NUMP TG(_NUMPAD) // Toggle layer NUMPAD for use in LAYOUT_kc
#define KC_Close RALT(KC_F4) // Alt F4
-#define KC_MEH1 MEH(KC_1)
-#define KC_MEH2 MEH(KC_2)
-#define KC_MEH3 MEH(KC_3)
-#define KC_MEH4 MEH(KC_4)
-#define KC_MEH5 MEH(KC_5)
+#define KC_MEH1 MEH(KC_1) // crtl shift alt 1
+#define KC_MEH2 MEH(KC_2) //
+#define KC_MEH3 MEH(KC_3) //
+#define KC_MEH4 MEH(KC_4) //
+#define KC_MEH5 MEH(KC_5) //
-#define KC_LOWR MO(_LOWER)
-#define KC_RASE MO(_RAISE)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -51,13 +62,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
KC_DEL , KC_APP , KC_VOLD, KC_MUTE, KC_VOLU, KC_LGUI, KC_GRV , KC_MPRV, KC_MPLY, KC_MNXT, KC_DOWN, KC_ESC ,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_TAB , KC_Q , KC_W , KC_E , KC_ R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , SE_ARNG,
+ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , SE_ARNG,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , SE_ODIA, SE_ADIA,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_NUMP, KC_ENT , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , NUMPAD, KC_ENT , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- KC_LALT, KC_LOWR, KC_BSPC, KC_SPC , KC_RASE, KC_LALT
+ KC_LALT, LOWER, KC_BSPC, KC_SPC , RAISE , KC_LALT
// `--------+--------+--------' `--------+--------+--------'
),
@@ -65,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_ESC ,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_TAB , KC_Q , KC_W , KC_E , KC_ R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_DEL ,
+ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_DEL ,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , SE_ODIA, KC_RCTL,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_NUMP, KC_ENT , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , NUMPAD, KC_ENT , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- KC_LALT, KC_LOWR, KC_BSPC, KC_SPC , KC_RASE, KC_LALT
+ KC_LALT, LOWER , KC_BSPC, KC_SPC , RAISE, KC_LALT
// `--------+--------+--------' `--------+--------+--------'
),
@@ -83,9 +94,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, KC_A , KC_O , KC_E , KC_U , KC_I , KC_D , KC_H , KC_T , KC_N , KC_S ,KC_RCTL ,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- KC_LSFT, KC_DOT , KC_Q , KC_J , KC_K , KC_X , KC_NUMP, KC_ENT , KC_B , KC_M , KC_W , KC_V , KC_Z ,KC_RSFT ,
+ KC_LSFT, KC_DOT , KC_Q , KC_J , KC_K , KC_X , NUMPAD, KC_ENT , KC_B , KC_M , KC_W , KC_V , KC_Z ,KC_RSFT ,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- KC_LALT, KC_LOWR, KC_BSPC, KC_SPC , KC_RASE, KC_LALT
+ KC_LALT, LOWER, KC_BSPC, KC_SPC , RAISE, KC_LALT
// `--------+--------+--------' `--------+--------+--------'
),
@@ -97,37 +108,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E , KC_I , KC_O , SE_ODIA,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_NUMP, KC_ENT , KC_K , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , NUMPAD, KC_ENT , KC_K , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- KC_LALT, KC_LOWR, KC_BSPC, KC_SPC , KC_RASE, KC_LALT
+ KC_LALT, LOWER, KC_BSPC, KC_SPC , RAISE, KC_LALT
// `--------+--------+--------' `--------+--------+--------'
),
-[_WORKMAN] = LAYOUT(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- KC_DEL , KC_APP , KC_VOLD, KC_MUTE, KC_VOLU, KC_LGUI, KC_GRV , KC_MPRV, KC_MPLY, KC_MNXT, KC_DOWN, KC_ESC ,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_TAB , KC_Q , KC_W , KC_R , KC_W KC_B , KC_J , KC_F , KC_U , KC_P , SE_ARNG, SE_ODIA,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LCTL, KC_A , KC_S , KC_H , KC_T , KC_G , KC_Y , KC_N , KC_E , KC_O , KC_I , KC_RCTL,
- //|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- KC_LSFT, KC_Z , KC_X , KC_M , KC_C , KC_V , KC_NUMP, KC_ENT , KC_K , KC_L , SE_ADIA, KC_DOT , KC_SLSH, KC_RSFT,
- //`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- KC_LALT, KC_LOWR, KC_BSPC, KC_SPC , KC_RASE, KC_LALT
- // `--------+--------+--------' `--------+--------+--------'
- ),
[_NUMPAD] = LAYOUT(
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
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_MEH1, KC_BTN2, KC_MS_U, KC_BTN1, KC_CATDEL, KC_PIPE, KC_P7 , KC_P8 , KC_P9 , KC_SLSH, ,
+ _______, KC_MEH1, KC_BTN2, KC_MS_U, KC_BTN1, KC_CATDEL, KC_PIPE, KC_P7 , KC_P8 , KC_P9 , KC_SLSH, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- , KC_MEH4, KC_MS_L, KC_MS_D, KC_MS_R, KC_TSKMGR, KC_COMM, KC_P4 , KC_P5 , KC_P6 , KC_MINS, ,
+ _______, KC_MEH4, KC_MS_L, KC_MS_D, KC_MS_R, KC_TSKMGR, KC_COMM, KC_P4 , KC_P5 , KC_P6 , KC_MINS, _______,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- , KC_MEH5, KC_ACL0, KC_ACL1, KC_ACL2, KC_MEH3, , KC_PENT , KC_DOT , KC_P1 , KC_P2 , KC_P3 , KC_P0 , ,
+ _______, KC_MEH5, KC_ACL0, KC_ACL1, KC_ACL2, KC_MEH3, _______, KC_PENT , KC_DOT , KC_P1 , KC_P2 , KC_P3 , KC_P0 , _______,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- KC_LALT , KC_LOWR, KC_BSPC, , KC_P0 , KC_NLCK
+ KC_LALT , LOWER, KC_BSPC, _______, RAISE, KC_NLCK
// `--------+--------+--------' `--------+--------+--------'
),
@@ -136,33 +134,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
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_CAPS, KC_PGUP, KC_UP , KC_PGDN, KC_ESC, KC_RCBR, KC_EXLM, KC_ASTR, KC_LPRN, KC_UNDS, ,
+ _______, KC_CAPS, KC_PGUP, KC_UP , KC_PGDN, KC_ESC, KC_RCBR, KC_EXLM, KC_ASTR, KC_LPRN, KC_UNDS, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- , KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_RPRN, KC_QUES, SE_LBRC, SE_RBRC, KC_LABK, ,
+ _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_RPRN, KC_QUES, SE_LBRC, SE_RBRC, KC_LABK, _______,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- , KC_ENT , , , , KC_DEL , , , KC_RABK, SE_LABK, SE_LCBR, SE_RCBR, SE_RABK, ,
+ _______, KC_ENT , _______, _______, _______, KC_DEL , _______, _______, KC_RABK, SE_LABK, SE_LCBR, SE_RCBR, SE_RABK, _______,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- , , , , ,
+ _______, _______, _______, _______, _______, _______
// `--------+--------+--------' `--------+--------+--------'
),
[_RAISE] = LAYOUT(
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- SE_TILD, KC_EXLM, KC_GRV , KC_EQL , KC_DLR , KC_PERC, SE_PND , SE_EURO , SE_YEN, SE_RCBR, KC_RPRN, ,
+ SE_TILD, KC_EXLM, KC_GRV , KC_EQL , KC_DLR , KC_PERC, SE_PND , SE_EURO , SE_YEN, SE_RCBR, KC_RPRN, _______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- , SE_PIPE , SE_AT , KC_HASH, KC_DQT , KC_PERC, KC_PIPE, KC_7 , KC_8 , KC_9 , KC_PMNS, KC_PSLS,
+ _______ , SE_PIPE , SE_AT , KC_HASH, KC_DQT , KC_PERC, KC_PIPE, KC_7 , KC_8 , KC_9 , KC_PMNS, KC_PSLS,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- , SE_BSLS, SE_TILD, SE_SLSH, KC_AMPR, KC_BSLS, KC_COMM, KC_4 , KC_5 , KC_6 , KC_PPLS, KC_PAST,
+ _______ , SE_BSLS, SE_TILD, SE_SLSH, KC_AMPR, KC_BSLS, KC_COMM, KC_4 , KC_5 , KC_6 , KC_PPLS, KC_PAST,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------|
- , KC_PIPE, SE_CURR, KC_PLUS, KC_CIRC, KC_TILD, , KC_PENT , KC_DOT , KC_1 , KC_2 , KC_3 , KC_0 , KC_PEQL,
+ _______ , KC_PIPE, SE_CURR, KC_PLUS, KC_CIRC, KC_TILD, _______ , KC_PENT , KC_DOT , KC_1 , KC_2 , KC_3 , KC_0 , KC_PEQL,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------'
- , , KC_DEL , , ,
+ _______ , _______ , KC_DEL , _______, _______, _______
// `--------+--------+--------' `--------+--------+--------'
),
[_ADJUST] = LAYOUT(
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- GAMING , DVORAK, WORKMAN, COLEMAK, QWERTY , RESET, _______, _______, _______, _______, KC_PWR, RESET,
+ _______, GAMING , DVORAK , COLEMAK , QWERTY , RESET, _______, _______, _______, _______, KC_PWR, RESET,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, _______, _______,LGUI(KC_UP),_______,LALT(KC_F4), _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
@@ -176,42 +174,52 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-layer_state_t layer_state_set_user(layer_state_t state) {
- return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
+
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
- if (record->event.pressed) {
- set_single_persistent_default_layer(_QWERTY);
- }
+ if (record->event.pressed) {set_single_persistent_default_layer(_QWERTY);}
return false;
+
case DVORAK:
- if (record->event.pressed) {
- set_single_persistent_default_layer(_DVORAK);
- }
+ if (record->event.pressed) {set_single_persistent_default_layer(_DVORAK);}
return false;
+
case NUMPAD:
- if (record->event.pressed) {
- set_single_persistent_default_layer(_NUMPAD);
- }
+ if (record->event.pressed) {layer_invert(_NUMPAD);}
return false;
+
case COLEMAK:
- if (record->event.pressed) {
- set_single_persistent_default_layer(_COLEMAK);
- }
+ if (record->event.pressed) {set_single_persistent_default_layer(_COLEMAK);}
return false;
- case WORKMAN:
+
+ case GAMING:
+ if (record->event.pressed) {set_single_persistent_default_layer(_GAMING);}
+ return false;
+
+ case LOWER:
if (record->event.pressed) {
- set_single_persistent_default_layer(_WORKMAN);
+ layer_on(_LOWER);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
+ }
+ else {
+ layer_off(_LOWER);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
return false;
- case GAMING:
+
+ case RAISE:
if (record->event.pressed) {
- set_single_persistent_default_layer(_GAMING);
+ layer_on(_RAISE);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
+ }
+ else {
+ layer_off(_RAISE);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
return false;
+
}
return true;
}