From e6a13e0b1c543bfe15f8ae94557456c9c1a92556 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Tue, 17 Nov 2020 07:26:44 +0900
Subject: [Keymap] clean up helix:five_rows keymap (#10866)
* Makes the OLED driver used by the helix:five_rows keymap switchable.
* use TOP/drivers/oled/oled_driver.c
`make HELIX=stdole helix:five_rows`
* use helix/local_drivers/ssd1306.c
`make HELIX=oled helix:five_rows`
* Separated the OLED related code from keymap.c and moved it to oled_display.c.
* scan rate without OLED
* make HELIX=verbose,dispoff,scan helix/rev2:five_rows
use Helix original code
text data bss dec hex filename
18880 58 235 19173 4ae5 .build/helix_rev2_five_rows.elf
matrix scan frequency: 1590
* make HELIX=verbose,dispoff,scan,sc helix/rev2:five_rows
use split_common code
text data bss dec hex filename
18554 40 231 18825 4989 .build/helix_rev2_five_rows.elf
matrix scan frequency: 1202
* scan rate with helix/local_drivers/ssd1306.c
* make HELIX=verbose,dispoff,scan,oled helix/rev2:five_rows
use Helix original code
text data bss dec hex filename
24048 196 342 24586 600a .build/helix_rev2_five_rows.elf
matrix scan frequency: 739
* make HELIX=verbose,dispoff,scan,sc,oled helix/rev2:five_rows
use split_common code
text data bss dec hex filename
23750 176 338 24264 5ec8 .build/helix_rev2_five_rows.elf
matrix scan frequency: 642
* scan rate with drivers/oled/oled_driver.c
* make HELIX=verbose,dispoff,scan,stdole helix/rev2:five_rows
use Helix original code
text data bss dec hex filename
24590 210 798 25598 63fe .build/helix_rev2_five_rows.elf
matrix scan frequency: 293
* make HELIX=verbose,dispoff,scan,sc,stdole helix/rev2:five_rows
use split_common code
text data bss dec hex filename
24290 190 794 25274 62ba .build/helix_rev2_five_rows.elf
matrix scan frequency: 277
* clean up helix/rev2/keymaps/five_rows/keymap.c
* update five_rows/oled_display.c
* update helix/rev2/keymaps/five_rows/keymap.c: remove LAYOUT_kc()
* Ported the keymap from helix/rev2:five_rows to helix/rev3_5rows:five_rows.
* update five_rows/oled_display.c
* add License comment
---
keyboards/helix/rev2/keymaps/five_rows/keymap.c | 587 +++++++++---------------
1 file changed, 229 insertions(+), 358 deletions(-)
(limited to 'keyboards/helix/rev2/keymaps/five_rows/keymap.c')
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index fcc5c4bbef..a2ec108624 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -1,199 +1,234 @@
+/* Copyright 2020 mtei
+ *
+ * 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 "util.h"
#include "bootloader.h"
#ifdef PROTOCOL_LUFA
#include "lufa.h"
#include "split_util.h"
#endif
-#ifdef AUDIO_ENABLE
- #include "audio.h"
-#endif
-#ifdef SSD1306OLED
- #include "ssd1306.h"
-#endif
#ifdef CONSOLE_ENABLE
#include
#endif
+#include "layer_number.h"
extern keymap_config_t keymap_config;
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
extern uint8_t is_master;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
- _QWERTY = 0,
- _COLEMAK,
- _DVORAK,
- _EUCALYN,
- _KEYPAD,
- _AUX,
- _KAUX,
- _LOWER,
- _RAISE,
- _PADFUNC,
- _ADJUST,
-};
-
enum custom_keycodes {
QWERTY = SAFE_RANGE,
COLEMAK,
DVORAK,
EUCALYN,
KEYPAD,
- KC_xEISU,
- KC_xKANA,
- KC_ZERO2,
+ xEISU,
+ xKANA,
+ ZERO2,
RGBRST
};
+#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
+
//Macros
#define KC_LOWER MO(_LOWER)
-#define KC_RABS LT(_RAISE,KC_BSPC)
-#define KC_RAEN LT(_RAISE,KC_ENT)
-#define KC_FF12 LT(_PADFUNC,KC_F12)
-#define KC_____ _______
-#define KC_XXXX XXXXXXX
+#define XXXX XXXXXXX
+#define ____ _______
#define KC_ADJ MO(_ADJUST)
#define KC_LSMI LSFT(KC_MINS)
#define KC_LSEQ LSFT(KC_EQL)
#define KC_LSRB LSFT(KC_RBRC)
#define KC_LSLB LSFT(KC_LBRC)
-#define ___ _______
+
+#define _1_2_3_4_5 KC_1, KC_2, KC_3, KC_4, KC_5
+#define _6_7_8_9_0 KC_6, KC_7, KC_8, KC_9, KC_0
+#define L_LOWER2_CAPS_LALT_LGUI_SPC_RABS \
+ KC_LOWER, KC_LOWER, KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, LT(_RAISE,KC_BSPC)
+#define R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+ LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_LOWER, KC_LOWER
+
#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BS |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | Ctrl |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | ` | ' | N | M | , | . | / | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Lower | Lower| Caps | Alt | GUI | Space| BS | Enter| Space| GUI | Alt | Menu |Lower |Lower |
- * `-------------------------------------------------------------------------------------------------'
+ * ,-----------------------------------. ,-----------------------------------.
+ * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BS |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Ctrl| A | S | D | F | G | | H | J | K | L | ; |Ctrl |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Shift| Z | X | C | V | B | ` | ' | N | M | , | . | / |Shift|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Lower|Lower|Caps | Alt | GUI |Space| BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+ * `-----------------------------------------------------------------------------------'
*/
- [_QWERTY] = LAYOUT_kc( \
- ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, \
- TAB, Q, W, E, R, T, Y, U, I, O, P, BSLS, \
- LCTL, A, S, D, F, G, H, J, K, L, SCLN, RCTL, \
- LSFT, Z, X, C, V, B, GRV, QUOT, N, M, COMM, DOT, SLSH, RSFT, \
- LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS, RAEN, SPC, RGUI, RALT, APP,LOWER, LOWER \
- ),
+#define _Q_W_E_R_T KC_Q, KC_W, KC_E, KC_R, KC_T
+#define _Y_U_I_O_P KC_Y, KC_U, KC_I, KC_O, KC_P
+#define _A_S_D_F_G KC_A, KC_S, KC_D, KC_F, KC_G
+#define _H_J_K_L_SCLN KC_H, KC_J, KC_K, KC_L, KC_SCLN
+#define _Z_X_C_V_B KC_Z, KC_X, KC_C, KC_V, KC_B
+#define _N_M_COMM_DOT_SLSH KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+ [_QWERTY] = LAYOUT_wrapper( \
+ KC_ESC, _1_2_3_4_5, _6_7_8_9_0, KC_BSPC, \
+ KC_TAB, _Q_W_E_R_T, _Y_U_I_O_P, KC_BSLS, \
+ KC_LCTL, _A_S_D_F_G, _H_J_K_L_SCLN, KC_RCTL, \
+ KC_LSFT, _Z_X_C_V_B, KC_GRV, KC_QUOT, _N_M_COMM_DOT_SLSH, KC_RSFT, \
+ L_LOWER2_CAPS_LALT_LGUI_SPC_RABS, R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+ ),
/* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | R | S | T | D | | H | N | E | I | O | Ctrl |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | ` | ' | K | M | , | . | / | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Lower | Lower| Caps | Alt | GUI | Space| BS | Enter| Space| GUI | Alt | Menu |Lower |Lower |
- * `-------------------------------------------------------------------------------------------------'
+ * ,-----------------------------------. ,-----------------------------------.
+ * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BS |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Ctrl| A | R | S | T | D | | H | N | E | I | O |Ctrl |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Shift| Z | X | C | V | B | ` | ' | K | M | , | . | / |Shift|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Lower|Lower|Caps | Alt | GUI |Space| BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+ * `-----------------------------------------------------------------------------------'
*/
- [_COLEMAK] = LAYOUT_kc( \
- ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, \
- TAB, Q, W, F, P, G, J, L, U, Y, SCLN, BSLS, \
- LCTL, A, R, S, T, D, H, N, E, I, O, RCTL, \
- LSFT, Z, X, C, V, B, GRV, QUOT, K, M, COMM, DOT, SLSH, RSFT, \
- LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS, RAEN, SPC, RGUI, RALT, APP,LOWER, LOWER \
- ),
+#define _Q_W_F_P_G KC_Q, KC_W, KC_F, KC_P, KC_G
+#define _J_L_U_Y_SCLN KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define _A_R_S_T_D KC_A, KC_R, KC_S, KC_T, KC_D
+#define _H_N_E_I_O KC_H, KC_N, KC_E, KC_I, KC_O
+#define _Z_X_C_V_B KC_Z, KC_X, KC_C, KC_V, KC_B
+#define _K_M_COMM_DOT_SLSH KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+ [_COLEMAK] = LAYOUT_wrapper( \
+ KC_ESC, _1_2_3_4_5, _6_7_8_9_0, KC_BSPC, \
+ KC_TAB, _Q_W_F_P_G, _J_L_U_Y_SCLN, KC_BSLS, \
+ KC_LCTL, _A_R_S_T_D, _H_N_E_I_O, KC_RCTL, \
+ KC_LSFT, _Z_X_C_V_B, KC_GRV, KC_QUOT, _K_M_COMM_DOT_SLSH, KC_RSFT, \
+ L_LOWER2_CAPS_LALT_LGUI_SPC_RABS, R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+ ),
/* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | ' | , | . | P | Y | | F | G | C | R | L | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | U | I | | D | H | T | N | S | Ctrl |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | ` | / | B | M | W | V | Z | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Lower | Lower| Caps | Alt | GUI | Space| BS | Enter| Space| GUI | Alt | Menu |Lower |Lower |
- * `-------------------------------------------------------------------------------------------------'
+ * ,-----------------------------------. ,-----------------------------------.
+ * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BS |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Tab | ' | , | . | P | Y | | F | G | C | R | L | \ |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Ctrl| A | O | E | U | I | | D | H | T | N | S |Ctrl |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Shift| ; | Q | J | K | X | ` | / | B | M | W | V | Z |Shift|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Lower|Lower|Caps | Alt | GUI |Space| BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+ * `-----------------------------------------------------------------------------------'
*/
- [_DVORAK] = LAYOUT_kc( \
- ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, \
- TAB, QUOT, COMM, DOT, P, Y, F, G, C, R, L, BSLS, \
- LCTL, A, O, E, U, I, D, H, T, N, S, RCTL, \
- LSFT, SCLN, Q, J, K, X, GRV, SLSH, B, M, W, V, Z, RSFT, \
- LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS, RAEN, SPC, RGUI, RALT, APP,LOWER, LOWER \
- ),
+#define _QUOT_COMM_DOT_P_Y KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
+#define _F_G_C_R_L KC_F, KC_G, KC_C, KC_R, KC_L
+#define _A_O_E_U_I KC_A, KC_O, KC_E, KC_U, KC_I
+#define _D_H_T_N_S KC_D, KC_H, KC_T, KC_N, KC_S
+#define _SCLN_Q_J_K_X KC_SCLN, KC_Q, KC_J, KC_K, KC_X
+#define _B_M_W_V_Z KC_B, KC_M, KC_W, KC_V, KC_Z
+
+ [_DVORAK] = LAYOUT_wrapper( \
+ KC_ESC, _1_2_3_4_5, _6_7_8_9_0, KC_BSPC, \
+ KC_TAB, _QUOT_COMM_DOT_P_Y, _F_G_C_R_L, KC_BSLS, \
+ KC_LCTL, _A_O_E_U_I, _D_H_T_N_S, KC_RCTL, \
+ KC_LSFT, _SCLN_Q_J_K_X, KC_GRV, KC_SLSH, _B_M_W_V_Z, KC_RSFT, \
+ L_LOWER2_CAPS_LALT_LGUI_SPC_RABS, R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+ ),
/* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | , | . | ; | | M | R | D | Y | P | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | I | U | | G | T | K | S | N | Ctrl |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | F | ` | ' | B | H | J | L | / | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Lower | Lower| Caps | Alt | GUI | Space| BS | Enter| Space| GUI | Alt | Menu |Lower |Lower |
- * `-------------------------------------------------------------------------------------------------'
+ * ,-----------------------------------. ,-----------------------------------.
+ * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BS |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Tab | Q | W | , | . | ; | | M | R | D | Y | P | \ |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | Ctrl| A | O | E | I | U | | G | T | K | S | N |Ctrl |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Shift| Z | X | C | V | F | ` | ' | B | H | J | L | / |Shift|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Lower|Lower|Caps | Alt | GUI |Space| BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+ * `-----------------------------------------------------------------------------------'
*/
- [_EUCALYN] = LAYOUT_kc( \
- ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, \
- TAB, Q, W, COMM, DOT, SCLN, M, R, D, Y, P, BSLS, \
- LCTL, A, O, E, I, U, G, T, K, S, N, RCTL, \
- LSFT, Z, X, C, V, F, GRV, QUOT, B, H, J, L, SLSH, RSFT, \
- LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS, RAEN, SPC, RGUI, RALT, APP,LOWER, LOWER \
- ),
+#define _Q_W_COMM_DOT_SCLN KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
+#define _M_R_D_Y_P KC_M, KC_R, KC_D, KC_Y, KC_P
+#define _A_O_E_I_U KC_A, KC_O, KC_E, KC_I, KC_U
+#define _G_T_K_S_N KC_G, KC_T, KC_K, KC_S, KC_N
+#define _Z_X_C_V_F KC_Z, KC_X, KC_C, KC_V, KC_F
+#define _B_H_J_L_SLSH KC_B, KC_H, KC_J, KC_L, KC_SLSH
+
+ [_EUCALYN] = LAYOUT_wrapper( \
+ KC_ESC, _1_2_3_4_5, _6_7_8_9_0, KC_BSPC, \
+ KC_TAB, _Q_W_COMM_DOT_SCLN, _M_R_D_Y_P, KC_BSLS, \
+ KC_LCTL, _A_O_E_I_U, _G_T_K_S_N, KC_RCTL, \
+ KC_LSFT, _Z_X_C_V_F, KC_GRV, KC_QUOT, _B_H_J_L_SLSH, KC_RSFT, \
+ L_LOWER2_CAPS_LALT_LGUI_SPC_RABS, R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+ ),
/* Keypad
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | / | * | Del | F1 | F6 | | F1 | F6 | Del | Tab | / | * |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | 7 | 8 | 9 | BS | F2 | F7 | | F2 | F7 | BS | 7 | 8 | 9 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | 4 | 5 | 6 | - | F3 | F8 | | F3 | F8 | - | 4 | 5 | 6 |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | 1 | 2 | 3 | + | F4 | F9 | F11 | F11 | F4 | F9 | + | 1 | 2 | 3 |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | 0 | , | . | Enter| F5 | F10 | F12 | F12 | F5 | F10 | Enter| 0 | , | . |
- * `-------------------------------------------------------------------------------------------------'
+ * ,-----------------------------------. ,-----------------------------------.
+ * | Tab | / | * | Del | F1 | F6 | | F1 | F6 | Del | Tab | / | * |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | 7 | 8 | 9 | BS | F2 | F7 | | F2 | F7 | BS | 7 | 8 | 9 |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | 4 | 5 | 6 | - | F3 | F8 | | F3 | F8 | - | 4 | 5 | 6 |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | 1 | 2 | 3 | + | F4 | F9 | F11 | F11 | F4 | F9 | + | 1 | 2 | 3 |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | 0 | , | . |Enter| F5 | F10| F12 | F12 | F5 | F10|Enter| 0 | , | . |
+ * `-----------------------------------------------------------------------------------'
*/
- [_KEYPAD] = LAYOUT_kc( \
- TAB, PSLS, PAST, DEL, F1, F6, F1, F6, DEL, TAB, PSLS, PAST, \
- KP_7, KP_8, KP_9, BSPC, F2, F7, F2, F7, BSPC, KP_7, KP_8, KP_9, \
- KP_4, KP_5, KP_6, PMNS, F3, F8, F3, F8, PMNS, KP_4, KP_5, KP_6, \
- KP_1, KP_2, KP_3, PPLS, F4, F9, F11, F11, F4, F9, PPLS, KP_1, KP_2, KP_3, \
- KP_0, COMM, PDOT, PENT, F5, F10, FF12, FF12, F5, F10, PENT, KP_0, COMM, PDOT \
- ),
+#define KP_TOP KC_TAB, KC_PSLS, KC_PAST
+#define KP_789 KC_KP_7, KC_KP_8, KC_KP_9
+#define KP_456 KC_KP_4, KC_KP_5, KC_KP_6
+#define KP_123 KC_KP_1, KC_KP_2, KC_KP_3
+#define KP_BTM KC_KP_0, KC_COMM, KC_PDOT
+#define F_1_6 KC_F1, KC_F6
+#define F_2_7 KC_F2, KC_F7
+#define F_3_8 KC_F3, KC_F8
+#define F_4_9 KC_F4, KC_F9
+#define F_510 KC_F5, KC_F10
+#define FF12 LT(_PADFUNC,KC_F12)
+
+ [_KEYPAD] = LAYOUT_wrapper( \
+ KP_TOP, KC_DEL, F_1_6, F_1_6, KC_DEL, KP_TOP, \
+ KP_789, KC_BSPC, F_2_7, F_2_7, KC_BSPC, KP_789, \
+ KP_456, KC_PMNS, F_3_8, F_3_8, KC_PMNS, KP_456, \
+ KP_123, KC_PPLS, F_4_9, KC_F11, KC_F11, F_4_9, KC_PPLS, KP_123, \
+ KP_BTM, KC_PENT, F_510, FF12, FF12, F_510, KC_PENT, KP_BTM \
+ ),
/* AUX modifier key layer
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | | | | | | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | 00 | | | | | | | | | | | 00 | |
- * `-------------------------------------------------------------------------------------------------'
+ * ,-----------------------------------. ,-----------------------------------.
+ * | | | | | | | | | | | | | |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | | | | | | | | | | | | | |
+ * |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----|
+ * | | | | | | | | | | | | | |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | | | | | | | | | | | | | | |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | | 00 | | | | | | | | | | | 00 | |
+ * `-----------------------------------------------------------------------------------'
*/
- [_KAUX] = LAYOUT_kc( \
+ [_KAUX] = LAYOUT( \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
- ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ZERO2,____ \
+ ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____ \
),
/* Keypad function layer
@@ -209,12 +244,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | | | |
* `-------------------------------------------------------------------------------------------------'
*/
- [_PADFUNC] = LAYOUT_kc( \
- XXXX, XXXX, XXXX, PAUS, SLCK, PSCR, PSCR, SLCK, PAUS, XXXX, XXXX, XXXX, \
- XXXX, XXXX, XXXX, HOME, UP, PGUP, PGUP, UP, HOME, XXXX, XXXX, XXXX, \
- XXXX, DEL, INS, LEFT, DOWN, RGHT, LEFT, DOWN, RGHT, INS, DEL, XXXX, \
- XXXX, XXXX, XXXX, END, XXXX, PGDN, ADJ, ADJ, PGDN, XXXX, END, XXXX, XXXX, XXXX, \
- XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX \
+#define _PAUS_SLCK_PSCR KC_PAUS, KC_SLCK, KC_PSCR
+#define _PSCR_SLCK_PAUS KC_PSCR, KC_SLCK, KC_PAUS
+#define _HOME_UP_PGUP KC_HOME, KC_UP, KC_PGUP
+#define _PGUP_UP_HOME KC_PGUP, KC_UP, KC_HOME
+#define _DEL_INS_LEFT_DOWN_RGHT KC_DEL, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT
+#define _LEFT_DOWN_RGHT_INS_DEL KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL
+#define _PGDN_ADJ_ADJ_PGDN KC_PGDN, KC_ADJ, KC_ADJ, KC_PGDN
+
+ [_PADFUNC] = LAYOUT_wrapper( \
+ XXXX, XXXX, XXXX, _PAUS_SLCK_PSCR, _PSCR_SLCK_PAUS, XXXX, XXXX, XXXX, \
+ XXXX, XXXX, XXXX, _HOME_UP_PGUP, _PGUP_UP_HOME, XXXX, XXXX, XXXX, \
+ XXXX, _DEL_INS_LEFT_DOWN_RGHT, _LEFT_DOWN_RGHT_INS_DEL, XXXX, \
+ XXXX, XXXX, XXXX, KC_END, XXXX, _PGDN_ADJ_ADJ_PGDN, XXXX, KC_END, XXXX, XXXX, XXXX, \
+ XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX \
),
/* Lower
@@ -230,12 +273,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | PrtSc| | | | | | | | | PrtSc| | |
* `-------------------------------------------------------------------------------------------------'
*/
- [_LOWER] = LAYOUT_kc( \
- XXXX, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, \
- XXXX, XXXX, PAUS, SLCK, INS, XXXX, XXXX, INS, SLCK, PAUS, XXXX, F12, \
- ____, HOME, XXXX, UP, DEL, PGUP, PGUP, DEL, UP, XXXX, HOME, ____, \
- ____, END, LEFT, DOWN, RGHT, PGDN, XXXX, XXXX, PGDN, LEFT, DOWN, RGHT, END, ____, \
- ____, ____, PSCR, ____, ____, ____, ADJ, ADJ, ____, ____, ____, PSCR, ____, ____ \
+#define _F1_F2_F3_F4_F5 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
+#define _F6_F7_F8_F9_F10_F11 KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11
+#define _PAUS_SLCK_INS KC_PAUS, KC_SLCK, KC_INS
+#define _INS_SLCK_PAUS KC_INS, KC_SLCK, KC_PAUS
+#define _ADJ_ADJ KC_ADJ, KC_ADJ
+#define _UP_DEL_PGUP KC_UP, KC_DEL, KC_PGUP
+#define _PGUP_DEL_UP KC_PGUP, KC_DEL, KC_UP
+#define _END_LEFT_DOWN_RGHT_PGDN KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
+#define _PGDN_LEFT_DOWN_RGHT_END KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
+
+ [_LOWER] = LAYOUT_wrapper( \
+ XXXX, _F1_F2_F3_F4_F5, _F6_F7_F8_F9_F10_F11, \
+ XXXX, XXXX, _PAUS_SLCK_INS, XXXX, XXXX, _INS_SLCK_PAUS, XXXX, KC_F12, \
+ ____, KC_HOME, XXXX, _UP_DEL_PGUP, _PGUP_DEL_UP, XXXX, KC_HOME, ____, \
+ ____, _END_LEFT_DOWN_RGHT_PGDN, XXXX, XXXX, _PGDN_LEFT_DOWN_RGHT_END, ____, \
+ ____, ____, KC_PSCR, ____, ____, ____, _ADJ_ADJ, ____, ____, ____, KC_PSCR, ____, ____ \
),
/* Raise
@@ -251,12 +304,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | | | |
* `-------------------------------------------------------------------------------------------------'
*/
- [_RAISE] = LAYOUT_kc( \
+#define _LSMI_MINS KC_LSMI, KC_MINS
+#define _EQL_LSEQ KC_EQL, KC_LSEQ
+#define _LSLB_LBRC KC_LSLB, KC_LBRC
+#define _RBRC_LSRB KC_RBRC, KC_LSRB
+#define _MNXT_VOLD_VOLU_MPLY KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+
+ [_RAISE] = LAYOUT_wrapper( \
XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \
- XXXX, XXXX, XXXX, XXXX, LSMI, MINS, EQL, LSEQ, XXXX, XXXX, XXXX, XXXX, \
- ____, XXXX, XXXX, XXXX, LSLB, LBRC, RBRC, LSRB, XXXX, XXXX, XXXX, ____, \
- ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA,MNXT, VOLD, VOLU, MPLY, ____, \
- ADJ, ADJ, XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX, ADJ, ADJ \
+ XXXX, XXXX, XXXX, XXXX, _LSMI_MINS, _EQL_LSEQ, XXXX, XXXX, XXXX, XXXX, \
+ ____, XXXX, XXXX, XXXX, _LSLB_LBRC, _RBRC_LSRB, XXXX, XXXX, XXXX, ____, \
+ ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA, _MNXT_VOLD_VOLU_MPLY, ____, \
+ _ADJ_ADJ, XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX, _ADJ_ADJ \
),
/* Adjust (Lower + Raise)
@@ -276,8 +335,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, KEYPAD, DVORAK, COLEMAK, EUCALYN, QWERTY, QWERTY, EUCALYN, COLEMAK, DVORAK, KEYPAD, XXXXXXX, \
XXXXXXX, RESET, RGBRST, RGB_TOG, AU_ON, AG_SWAP, AG_SWAP, AU_ON, RGB_TOG, RGBRST, XXXXXXX, XXXXXXX, \
RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, AU_OFF, AG_NORM, AG_NORM, AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, \
- RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, ___,___, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
- _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ___,___, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
+ RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
+ _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
),
/* AUX modifier key layer
@@ -293,12 +352,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | BS | Enter| | | | | | | |
* `-------------------------------------------------------------------------------------------------'
*/
- [_AUX] = LAYOUT_kc( \
+#define _BSPC_RAEN KC_BSPC, LT(_RAISE,KC_ENT)
+ [_AUX] = LAYOUT_wrapper( \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
- ____, ____, ____, ____, ____, BSPC, RAEN, ____, ____, ____, ____, ____, ____, ____ \
+ ____, ____, ____, ____, ____, _BSPC_RAEN, ____, ____, ____, ____, ____, ____, ____ \
)
};
@@ -307,28 +367,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#endif
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_dvorak[][2] = SONG(DVORAK_SOUND);
-float tone_colemak[][2] = SONG(COLEMAK_SOUND);
-float tone_plover[][2] = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
-#endif
+int current_default_layer;
-static int current_default_layer;
-
-uint32_t default_layer_state_set_kb(uint32_t state) {
- // 1<<_QWERTY - 1 == 1 - 1 == _QWERTY (=0)
- // 1<<_COLEMAK - 1 == 2 - 1 == _COLEMAK (=1)
- current_default_layer = state - 1;
- // 1<<_DVORAK - 2 == 4 - 2 == _DVORAK (=2)
- if ( current_default_layer == 3 ) current_default_layer -= 1;
- // 1<<_EUCALYN - 5 == 8 - 5 == _EUCALYN (=3)
- if ( current_default_layer == 7 ) current_default_layer -= 4;
- // 1<<_KEYPAD - 12 == 16 - 12 == _KEYPAD (=4)
- if ( current_default_layer == 15 ) current_default_layer -= 11;
+uint32_t default_layer_state_set_user(uint32_t state) {
+ current_default_layer = biton32(state);
return state;
}
@@ -351,56 +393,41 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
update_base_layer(_QWERTY);
}
return false;
break;
case COLEMAK:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_colemak);
- #endif
update_base_layer(_COLEMAK);
}
return false;
break;
case DVORAK:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_dvorak);
- #endif
update_base_layer(_DVORAK);
}
return false;
break;
case EUCALYN:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_dvorak);
- #endif
update_base_layer(_EUCALYN);
}
return false;
break;
case KEYPAD:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_dvorak);
- #endif
update_base_layer(_KEYPAD);
}
return false;
break;
- case KC_ZERO2:
+ case ZERO2:
if (record->event.pressed) {
SEND_STRING("00");
}
return false;
break;
- case KC_xEISU:
+ case xEISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG2);
@@ -412,7 +439,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
- case KC_xKANA:
+ case xKANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG1);
@@ -437,161 +464,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
void matrix_init_user(void) {
- #ifdef AUDIO_ENABLE
- startup_user();
- #endif
- //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
- #ifdef SSD1306OLED
- iota_gfx_init(!has_usb()); // turns on the display
- #endif
-}
-
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
- _delay_ms(20); // gets rid of tick
-}
-
-void shutdown_user()
-{
- _delay_ms(150);
- stop_all_notes();
-}
-
-void music_on_user(void)
-{
- music_scale_user();
-}
-
-void music_scale_user(void)
-{
- PLAY_SONG(music_scale);
-}
-
-#endif
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
- iota_gfx_task(); // this is what updates the display continuously
+ INIT_HELIX_OLED(); /* define in layer_number.h */
}
-
-void matrix_update(struct CharacterMatrix *dest,
- const struct CharacterMatrix *source) {
- if (memcmp(dest->display, source->display, sizeof(dest->display))) {
- memcpy(dest->display, source->display, sizeof(dest->display));
- dest->dirty = true;
- }
-}
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
- static char logo[]={
- 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
- 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
- 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
- 0};
- matrix_write(matrix, logo);
-#ifdef RGBLIGHT_ENABLE
- char buf[30];
- if (RGBLIGHT_MODES > 1 && rgblight_config.enable) {
- snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
- rgblight_config.mode,
- rgblight_config.hue/RGBLIGHT_HUE_STEP,
- rgblight_config.sat/RGBLIGHT_SAT_STEP,
- rgblight_config.val/RGBLIGHT_VAL_STEP);
- matrix_write(matrix, buf);
- }
-#endif
- //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-static const char Qwerty_name[] PROGMEM = " Qwerty";
-static const char Colemak_name[] PROGMEM = " Colemak";
-static const char Dvorak_name[] PROGMEM = " Dvorak";
-static const char Eucalyn_name[] PROGMEM = " Eucalyn";
-static const char Keypad_name[] PROGMEM = " Keypad";
-
-static const char AUX_name[] PROGMEM = ":AUX";
-static const char KAUX_name[] PROGMEM = ":00";
-static const char Padfunc_name[] PROGMEM = ":PadFunc";
-static const char Lower_name[] PROGMEM = ":Func";
-static const char Raise_name[] PROGMEM = ":Extra";
-static const char Adjust_name[] PROGMEM = ":Adjust";
-
-static const char *layer_names[] = {
- [_QWERTY] = Qwerty_name,
- [_COLEMAK] = Colemak_name,
- [_DVORAK] = Dvorak_name,
- [_EUCALYN]= Eucalyn_name,
- [_KEYPAD] = Keypad_name,
- [_AUX] = AUX_name,
- [_KAUX] = KAUX_name,
- [_LOWER] = Lower_name,
- [_RAISE] = Raise_name,
- [_PADFUNC]= Padfunc_name,
- [_ADJUST] = Adjust_name
-};
-
-void render_status(struct CharacterMatrix *matrix) {
-
- // Render to mode icon
- static char logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
- if(keymap_config.swap_lalt_lgui==false){
- matrix_write(matrix, logo[0][0]);
- matrix_write_P(matrix, PSTR("\n"));
- matrix_write(matrix, logo[0][1]);
- }else{
- matrix_write(matrix, logo[1][0]);
- matrix_write_P(matrix, PSTR("\n"));
- matrix_write(matrix, logo[1][1]);
- }
-
- // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
- int name_num;
- uint32_t lstate;
- matrix_write_P(matrix, layer_names[current_default_layer]);
- matrix_write_P(matrix, PSTR("\n"));
- for( lstate = layer_state, name_num = 0;
- lstate && name_num < sizeof(layer_names)/sizeof(char *);
- lstate >>=1, name_num++ ) {
- if( (lstate & 1) != 0 ) {
- if( layer_names[name_num] ) {
- matrix_write_P(matrix, layer_names[name_num]);
- }
- }
- }
-
- // Host Keyboard LED Status
- char led[40];
- snprintf(led, sizeof(led), "\n%s %s %s",
- (host_keyboard_leds() & (1<