Skip to content

Commit

Permalink
Just one colemak.
Browse files Browse the repository at this point in the history
  • Loading branch information
@winder
winder committed Dec 4, 2021
1 parent 6145d7a commit 6eb7917
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 18 deletions.
2 changes: 0 additions & 2 deletions keyboards/sofle/keymaps/keyhive_via/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ for more options.
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17

#define DYNAMIC_KEYMAP_LAYER_COUNT 5

// Disabled to save space
#define NO_ACTION_ONESHOT // -332
#define NO_ACTION_MACRO // -0
Expand Down
20 changes: 10 additions & 10 deletions keyboards/sofle/keymaps/keyhive_via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
#include "oled.c"
#include "encoder.c"

#define BASE_LAYERS 3
// Base layer is the number of layers CYCLE selects from.
#define BASE_LAYERS 2

enum custom_keycodes {
PLACEHOLDER = SAFE_RANGE, // can always be here (4 bytes)
CYCLE_L // cycle BASE_LAYERS (62 bytes)
CYCLE // cycle through first BASE_LAYERS (62 bytes)
};

enum custom_layers {
_QWERTY,
_COLEMAK,
_COLEMAK_DH,
_LOWER,
_RAISE
};
Expand Down Expand Up @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LGUI,KC_LALT ,KC_LCTRL,MO(_LOWER), KC_ENT , KC_SPC ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
),
/*
* COLEMAK
* COLEMAK - Vanilla
* ,-----------------------------------------. ,-----------------------------------------.
* | ` | 1 | 2 | 3 | 4 | 5 |-------. E ,-------| 6 | 7 | 8 | 9 | 0 | ` |
* |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
Expand All @@ -75,14 +75,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | |/ / \ \ | | | | |
* `-----------------------------------' '------''---------------------------'
*/

/*
[_COLEMAK] = LAYOUT_via(
KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV ,
KC_ESC , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_VOLU, KC_PGUP, KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_BSPC,
KC_TAB , KC_A , KC_R , KC_S , KC_T , KC_D , KC_MUTE, KC_NO , KC_H , KC_N , KC_E , KC_I , KC_O , KC_QUOT,
KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_VOLD, KC_PGDN, KC_N , KC_M , KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LGUI, KC_LALT,KC_LCTRL,MO(_LOWER), KC_ENT , KC_SPC ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
),
*/

/*
* COLEMAK-DH
Expand All @@ -99,8 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | |/ / \ \ | | | | |
* `-----------------------------------' '------''---------------------------'
*/

[_COLEMAK_DH] = LAYOUT_via(
[_COLEMAK] = LAYOUT_via(
KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV ,
KC_ESC , KC_Q , KC_W , KC_F , KC_P , KC_B , KC_VOLU, KC_PGUP, KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_BSPC,
KC_TAB , KC_A , KC_R , KC_S , KC_T , KC_G , KC_MUTE, KC_NO , KC_M , KC_N , KC_E , KC_I , KC_O , KC_QUOT,
Expand All @@ -126,7 +126,7 @@ 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_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_F12 ,
_______, KC_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
_______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
_______, KC_EQL , KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* RAISE
Expand All @@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------' '------''---------------------------'
*/
[_RAISE] = LAYOUT_via(
CYCLE_L, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______,
CYCLE, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______,
_______, KC_INS , KC_PSCR, KC_APP , XXXXXXX , XXXXXXX, _______, _______, KC_PGUP, _______, KC_UP , _______, _______, KC_BSPC,
_______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX , KC_CAPS, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_BSPC,
_______, KC_UNDO, KC_CUT , KC_COPY, KC_PASTE, XXXXXXX, _______, _______, XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, _______,
Expand All @@ -160,7 +160,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}

switch (keycode) {
case CYCLE_L:
case CYCLE:
set_single_persistent_default_layer((1+get_highest_layer(default_layer_state)) % BASE_LAYERS);
break;
}
Expand Down
8 changes: 2 additions & 6 deletions keyboards/sofle/keymaps/keyhive_via/oled.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ static void print_status_narrow(void) {
case 1: // _COLEMAK
oled_write_ln_P(PSTR("Clmk\n"), false);
break;
case 2: // _COLEMAK_DH
oled_write_ln_P(PSTR("Clmk\n DH"), false);
break;
default:
oled_write_P(PSTR("Mod"), false);
break;
Expand All @@ -53,13 +50,12 @@ static void print_status_narrow(void) {
switch (get_highest_layer(layer_state)) {
case 0: // _QWERTY
case 1: // _COLEMAK
case 2: // _COLEMAK_DH
oled_write_P(PSTR("Base\n"), false);
break;
case 3:
case 2:
oled_write_P(PSTR("Lower"), false);
break;
case 4:
case 3:
oled_write_P(PSTR("Raise"), false);
break;
default:
Expand Down

0 comments on commit 6eb7917

Please sign in to comment.