diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/ergodox_infinity/config.h
index c08356cb06..0e64897cba 100644
--- a/keyboards/ergodox_infinity/config.h
+++ b/keyboards/ergodox_infinity/config.h
@@ -72,7 +72,6 @@ along with this program. If not, see .
#define SERIAL_LINK_THREAD_PRIORITY (NORMALPRIO - 1)
#define VISUALIZER_USER_DATA_SIZE 16
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 7df97bd01f..b1cfdf42fc 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -10,12 +10,13 @@
#define HALFQWERTY 1 // mirrored qwerty layer
#define DVORAK 2 // dvorak layer
#define HALFDVORAK 3 // mirrored dvorak layer
+//no layer 4
#define SYMB 5 // symbols
#define HALFSYMB 6 // media keys
#define PLVR 7 // steno plover layout
-#define SHORTCUTS 8 //layer with shortcut keys
-#define MDIA 9
-
+#define SHORTCUTS 8 //layer with shortcut keys and other layer nav
+#define FUNCTION 9 //all F-keys, all day
+#define PROPERSTENO 10 //real steno layout
enum custom_keycodes {
PLACEHOLDER = SAFE_RANGE, // can always be here
@@ -28,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: qwerty
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | ` | | \ | 6 | 7 | 8 | 9 | 0 | BSPC |
+ * | ESC | 1 | 2 | 3 | 4 | 5 | RMB | | \ | 6 | 7 | 8 | 9 | 0 | BSPC |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | TAB | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | ' |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -39,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |LCTRL|ALT |CTLShTab|CTL-TAB| LGui| | RGui| UP | DOWN | ALT | RCTRL |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * |Symbol|Dvorak| |Plover|HalfSymb|
+ * |Symbol|LMB | |Plover|HalfSymb|
* ,------|------|------| |------+--------+------.
* | | |MU_TOG| | PgUp | | |
* | Space|DELETE|------| |------| Tab |Enter |
@@ -50,21 +51,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[QWERTY] = LAYOUT_ergodox( // layer 0 : default
// left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRAVE,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC,
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_BTN2,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_EQL,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MINUS,
KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), MO(SHORTCUTS),
- TG(SYMB), TG(DVORAK),
+ KC_LGUI, KC_BTN1,
MU_ON,
- LT(HALFQWERTY, KC_SPACE),KC_DEL,KC_END,
+ KC_SPACE,KC_DEL,KC_END,
// right hand
- KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_BTN2, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLASH,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT,
- MO(MDIA), KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
- TG(PLVR), TG(MDIA),
+ MO(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
+ KC_BTN1, KC_RGUI,
MU_OFF,
KC_PGDN,KC_TAB, LT(HALFQWERTY, KC_ENT)
),
@@ -93,25 +94,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[HALFQWERTY] = LAYOUT_ergodox( // layer 0 : default
// left hand
- KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_BSLS,
- KC_BSLS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_RBRC,
+ KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_TRNS,
+ KC_BSLS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_LBRC,
KC_ENT, KC_SCLN, KC_L, KC_K, KC_J, KC_H,
- KC_LSFT, KC_SLASH, KC_DOT, KC_COMM,KC_M, KC_N, KC_EQL,
+ KC_LSFT, KC_SLASH, KC_DOT, KC_COMM,KC_M, KC_N, KC_RBRC,
KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS,
- KC_TRNS, KC_TRANSPARENT,
+ KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRANSPARENT,KC_DEL,KC_END,
// right hand
- KC_GRAVE, KC_5, KC_4, KC_3, KC_2, KC_1, KC_BSPC,
- KC_LBRC, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_BSLS,
+ KC_TRNS, KC_5, KC_4, KC_3, KC_2, KC_1, KC_BSPC,
+ KC_MINUS, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_BSLS,
KC_G, KC_F, KC_D, KC_S, KC_A, KC_ENT,
- KC_MINUS,KC_B, KC_V, KC_C, KC_X, KC_Z, KC_RSFT,
+ KC_EQL,KC_B, KC_V, KC_C, KC_X, KC_Z, KC_RSFT,
KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
KC_TRANSPARENT, KC_TRNS,
KC_TRNS,
KC_PGDN,KC_TAB, KC_TRANSPARENT
),
-/* Keymap 3: dvorak
+/* Keymap 2: dvorak
*
* ,--------------------------------------------------. ,--------------------------------------------------.
* | ESC | 1 | 2 | 3 | 4 | 5 | ` | | \ | 6 | 7 | 8 | 9 | 0 | BSPC |
@@ -134,24 +135,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
// Otherwise, it needs KC_*
-[DVORAK] = LAYOUT_ergodox( // layer 0 : default
+[DVORAK] = LAYOUT_ergodox( // layer 2 : dvorak
// left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRAVE,
- KC_TAB, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_LBRC,
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
+ KC_TAB, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_MINUS,
KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_MINUS,
+ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_EQL,
KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS,
- TG(SYMB), KC_TRANSPARENT,
- KC_TRNS,
- LT(HALFDVORAK, KC_SPACE),KC_DEL,KC_END,
+ KC_TRNS, KC_TRANSPARENT,
+ KC_UP,
+ LT(HALFDVORAK, KC_SPACE),KC_DEL,KC_DOWN,
// right hand
- KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH,
+ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_LBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH,
KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENT,
- KC_EQL,KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ KC_RBRC,KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
- KC_TRANSPARENT, TG(MDIA),
- KC_TRNS,
+ KC_TRANSPARENT, KC_TRANSPARENT,
+ KC_PGUP,
KC_PGDN,KC_TAB, LT(HALFDVORAK, KC_ENT)
),
/* Keymap 3: mirrored dvorak
@@ -179,23 +180,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[HALFDVORAK] = LAYOUT_ergodox( // layer 0 : default
// left hand
- KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_BSLS,
- KC_SLASH, KC_L, KC_R, KC_C, KC_G, KC_F, KC_RBRC,
+ KC_BSPC, KC_0, KC_9, KC_8, KC_7, KC_6, KC_TRNS,
+ KC_SLASH, KC_L, KC_R, KC_C, KC_G, KC_F, KC_LBRC,
KC_ENT, KC_S, KC_N, KC_T, KC_H, KC_D,
- KC_LSFT, KC_Z, KC_V, KC_W, KC_M, KC_B, KC_EQL,
+ KC_LSFT, KC_Z, KC_V, KC_W, KC_M, KC_B, KC_RBRC,
KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRNS,
KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRNS,
- KC_TRANSPARENT,KC_DEL,KC_END,
+ KC_TRANSPARENT,KC_ENT,KC_TRNS,
// right hand
- KC_GRAVE, KC_5, KC_4, KC_3, KC_2, KC_5, KC_ESC,
- KC_LBRC, KC_Y, KC_P, KC_DOT, KC_COMM,KC_P, KC_TAB,
+ KC_TRNS, KC_5, KC_4, KC_3, KC_2, KC_5, KC_ESC,
+ KC_MINUS, KC_Y, KC_P, KC_DOT, KC_COMM,KC_P, KC_TAB,
KC_I, KC_U, KC_E, KC_O, KC_A, KC_BSPC,
- KC_MINUS,KC_X, KC_K, KC_J, KC_Q, KC_SCLN, KC_RSFT,
+ KC_EQL,KC_X, KC_K, KC_J, KC_Q, KC_SCLN, KC_RSFT,
KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
KC_TRANSPARENT, KC_TRNS,
KC_TRNS,
- KC_PGDN,KC_TAB, KC_TRANSPARENT
+ KC_TRNS,KC_TAB, KC_TRANSPARENT
),
/* Keymap 5: Symbol Layer
*
@@ -235,8 +236,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_DOWN, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_KP_ENTER,
KC_NO,KC_AMPR,KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_PLUS, KC_NO,
KC_TRNS,KC_DOT, KC_0, KC_KP_EQUAL, KC_NO,
- KC_NO, KC_TRNS,
- KC_NO,
+ BL_OFF, KC_TRNS,
+ BL_ON,
KC_NO, KC_NO, LT(HALFSYMB, KC_ENT)
),
/* Keymap 6: Mirrored Symbol Layer
@@ -263,7 +264,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// SYMBOLS
[HALFSYMB] = LAYOUT_ergodox(
// left hand
- KC_BSPC, KC_F12, KC_F11, KC_F10, KC_F9, KC_F8, KC_F7,
+ KC_BSPC, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
KC_NO,KC_NO,KC_KP_7, KC_KP_8, KC_KP_9,KC_KP_ASTERISK,KC_KP_SLASH,
KC_ENTER,KC_NO,KC_KP_4, KC_KP_5, KC_KP_6,KC_KP_MINUS,
KC_NO,KC_NO,KC_KP_1, KC_KP_2, KC_KP_3,KC_KP_PLUS,KC_KP_ENTER,
@@ -272,7 +273,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRANSPARENT,KC_NO,KC_NO,
// right hand
- KC_F6, KC_F5, KC_F4, KC_F3, KC_F2, KC_F1, KC_BSPC,
+ KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_BSPC,
KC_NO,KC_PIPE,KC_LCBR,KC_RCBR, KC_SLASH, KC_BSLS, KC_NO,
KC_GRV,KC_LPRN,KC_RPRN, KC_SCLN, KC_QUOT, KC_NO,
KC_NO, KC_TILD,KC_LBRC,KC_RBRC, KC_EQL, KC_MINUS, KC_NO,
@@ -281,7 +282,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_NO, KC_NO, KC_TRANSPARENT
),
-
/* Keymap 7: Steno for Plover from https://github.com/shayneholmes/tmk_keyboard/commit/11290f8489013018f778627db725160c745e75bd
*
* ,--------------------------------------------------. ,--------------------------------------------------.
@@ -304,13 +304,142 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `--------------------'
*/
-[PLVR] = LAYOUT_ergodox( // layout: layer 4: Steno for Plover
+[PLVR] = KEYMAP( // layout: layer 7: Steno for Plover
+ // left hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
+ KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T,
+ KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_TRNS,
+ KC_NO,
+ KC_C, KC_V, KC_NO,
+ // right hand
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
+ KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_NO, KC_N, KC_M
+),
+
+/* Keymap 8: shortcuts
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | ESC | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | BSPC |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | TAB | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | BkSp | A | S | D | F | G |------| |------| H | J | K | L | ; |ENTER |
+ * |--------+------+------+------+------+------| - | | = |------+------+------+------+------+--------|
+ * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * |LCTRL|ALT |CTLShTab|CTL-TAB| | | RGui| UP | DOWN | ALT | RCTRL |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * |SYMBOLS|Dvorak| |Steno |Plover|
+ * ,------|------|------| |------+--------+------.
+ * | | | Home | | PgUp | | |
+ * | Space|DELETE|------| |------| Tab |Enter |
+ * |mirror| | End | | PgDn | |mirror|
+ * `--------------------' `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[SHORTCUTS] = LAYOUT_ergodox( // layer 0 : default
+ // left hand
+ RGB_MODE_KNIGHT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
+ KC_TAB, LCTL(KC_Q), LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T), KC_NO,
+ KC_BSPC, LCTL(KC_A), LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G),
+ KC_LSFT, LCTL(KC_Z), LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B), KC_MINUS,
+ RESET, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRANSPARENT,
+ TG(SYMB), TG(DVORAK),
+
+ TG(FUNCTION),
+ KC_NO,KC_NO,KC_NO,
+// right hand
+ KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ TG(SYMB),LCTL(KC_Y),LCTL(KC_U),LCTL(KC_I),LCTL(KC_O),LCTL(KC_P),KC_BSLS,
+ LCTL(KC_H),LCTL(KC_J),LCTL(KC_K),LCTL(KC_L),LCTL(KC_SCLN),KC_ENT,
+ KC_EQL,LCTL(KC_N),LCTL(KC_M),LCTL(KC_COMM),LCTL(KC_DOT),LCTL(KC_SLASH),KC_RSFT,
+ KC_TRNS, KC_UP,KC_DOWN,KC_RALT, RESET,
+ TG(PROPERSTENO),TG(PLVR),
+ KC_NO,
+ KC_NO,KC_NO, KC_NO
+ ),
+ /* Keymap 9: Functions
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F1 | F2 | F3 | F4 | F5 | F6 |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | F7 | F8 | F9 | F10 | F11 | F12 | | | | F7 | F8 | F9 | F10 | F11 | F12 |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | F13 | F14 | F15 | F16 | F17 | F18 |------| |------| F13 | F14 | F15 | F16 | F17 | F18 |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | F19 | F20 | F21 | F22 | F23 | F24 | | | | F19 | F20 | F21 | F22 | F23 | F24 |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | c | v |------| |------| n | m |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+
+[FUNCTION] = LAYOUT_ergodox( // layout: layer 9
+ // left hand
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO,
+ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO,
+ KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
+ KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_NO, KC_NO, KC_NO,
+ // right hand
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
+ KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+ KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
+ KC_NO,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
+ KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_NO, KC_NO, KC_NO
+),
+ /* Keymap 10: Steno
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | q | w | e | r | t |------| |------| y | u | i | o | p | [ |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | a | s | d | f | g | | | | h | j | k | l | ; | ' |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | c | v |------| |------| n | m |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+
+[PROPERSTENO] = LAYOUT_ergodox( // layout: layer 10
// left hand
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, STN_N6, KC_NO,
STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1,
KC_NO, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
STN_A, STN_O, KC_NO,
@@ -324,135 +453,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_NO, STN_E, STN_U
),
-/* Keymap 8: shortcuts
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | BSPC |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | TAB | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | BkSp | A | S | D | F | G |------| |------| H | J | K | L | ; |ENTER |
- * |--------+------+------+------+------+------| - | | = |------+------+------+------+------+--------|
- * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCTRL|ALT |CTLShTab|CTL-TAB| | | RGui| UP | DOWN | ALT | RCTRL |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | Alt |Dvorak| |Plover|Alt |
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * | Space|DELETE|------| |------| Tab |Enter |
- * |mirror| | End | | PgDn | |mirror|
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[SHORTCUTS] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO,
- KC_TAB, LCTL(KC_Q), LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T), KC_NO,
- KC_BSPC, LCTL(KC_A), LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G),
- KC_LSFT, LCTL(KC_Z), LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B), KC_MINUS,
- KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRANSPARENT,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO,KC_NO,KC_NO,
- // right hand
- KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
- KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT,
- KC_TRNS, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
- KC_NO, KC_TRNS,
- KC_NO,
- KC_NO,KC_NO, KC_NO
- ),
- /* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | |LClick| MsUp |RClick| | | | | |LClick| MsUp |RClick| | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| |MsLeft|MsDown|MsRght| | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_WH_U,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_WH_L, KC_WH_R, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_WH_U, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
- KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_WH_L, KC_WH_R
-),
-/* Keymap 8: shortcuts
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | BSPC |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | TAB | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | BkSp | A | S | D | F | G |------| |------| H | J | K | L | ; |ENTER |
- * |--------+------+------+------+------+------| - | | = |------+------+------+------+------+--------|
- * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCTRL|ALT |CTLShTab|CTL-TAB| | | RGui| UP | DOWN | ALT | RCTRL |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | Alt |Dvorak| |Plover|Alt |
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * | Space|DELETE|------| |------| Tab |Enter |
- * |mirror| | End | | PgDn | |mirror|
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[SHORTCUTS] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO,
- KC_TAB, LCTL(KC_Q), LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T), KC_NO,
- KC_BSPC, LCTL(KC_A), LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G),
- KC_LSFT, LCTL(KC_Z), LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B), KC_MINUS,
- KC_LCTRL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), KC_TRANSPARENT,
- KC_NO, KC_NO,
-
- KC_NO,
- KC_NO,KC_NO,KC_NO,
- // right hand
- KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
- KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT,
- KC_RGUI, KC_UP,KC_DOWN,KC_RALT, KC_RCTRL,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO,KC_NO, KC_NO
- ),
};
const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c b/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c
index 7bd5a0783f..61a724c63f 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c
+++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/visualizer.c
@@ -18,15 +18,21 @@ along with this program. If not, see .
#include "default_animations.h"
#include "led_backlight_keyframes.h"
-#define ONESIDESCAN 9
-#define BOTHSIDESCAN 16
+#define NUM_ROWS LED_HEIGHT
+#define NUM_COLS LED_WIDTH
+
+#define ONESIDESCAN 10
+#define BOTHSIDESCAN 20
#define FULL_ON LUMA2COLOR(255)
#define THREE_QUARTER LUMA2COLOR(200)
#define HALF_ON LUMA2COLOR(150)
#define ONE_QUARTER LUMA2COLOR(50)
-#define CROSSFADE_TIME 8000
-bool KITT_scan_one_side_left_to_right(keyframe_animation_t* animation, visualizer_state_t* state);
-bool KITT_scan_one_side_right_to_left(keyframe_animation_t* animation, visualizer_state_t* state);
+
+#define CROSSFADE_TIME 500
+#define GRADIENT_TIME 3000
+bool led_backlight_keyframe_one_period_sweep(keyframe_animation_t* animation, visualizer_state_t* state);
+bool led_backlight_keyframe_half_period_sweep_to_on(keyframe_animation_t* animation, visualizer_state_t* state);
+bool led_backlight_keyframe_half_period_sweep_to_off(keyframe_animation_t* animation, visualizer_state_t* state);
keyframe_animation_t Fade_in_all_leds = {
.num_frames = 1,
.loop = false,
@@ -37,114 +43,272 @@ keyframe_animation_t Fade_in_all_leds = {
led_backlight_keyframe_fade_in_all,
},
};
+keyframe_animation_t decreasing_gradient = {
+ .num_frames = 8,
+ .loop = true,
+ .frame_lengths = {
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in)
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out)
+ 0, // normal leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in)
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out)
+ 0, // normal leds
+ },
+ .frame_functions = {
+ led_backlight_keyframe_one_period_sweep,
+ led_backlight_keyframe_mirror_orientation,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ led_backlight_keyframe_one_period_sweep,
+ led_backlight_keyframe_normal_orientation,
+
+ },
+};
+
+
+
+static uint8_t off_on_off_gradient(float t, float index, float num) {
+ const float two_pi = M_PI * 2.0f;
+ float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi;
+ float x = t * two_pi + normalized_index-M_PI;
+ if((1*M_PI) < x && x < (3*M_PI))
+ {
+ float v = 0.5 * (cosf(x) + 1.0f);
+ return (uint8_t)(255.0f * v);
+ }
+ else
+ {
+ return 0;
+ }
+}
+static uint8_t off_on_gradient(float t, float index, float num) {
+ const float two_pi = M_PI * 2.0f;
+ float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi;
+ float x = t * two_pi + normalized_index-M_PI;
+ float v;
+ if((1*M_PI) < x && x < (2*M_PI))
+ {
+ v = 0.5 * (cosf(x) + 1.0f);
+ }
+ else if(x >= (2*M_PI))
+ {
+ v = 1;
+ }
+ else
+ {
+ v = 0;
+ }
+ return (uint8_t)(255.0f * v);
+}
+static uint8_t on_off_gradient(float t, float index, float num) {
+ const float two_pi = M_PI * 2.0f;
+ float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi;
+ float x = t * two_pi + normalized_index-M_PI;
+ float v;
+ if((2*M_PI) < x && x < (3*M_PI))
+ {
+ v = 0.5 * (cosf(x) + 1.0f);
+
+ }
+ else if(x >= (3*M_PI))
+ {
+ v = 0;
+ }
+ else
+ {
+ v = 1;
+ }
+ return (uint8_t)(255.0f * v);
+}
+
+bool led_backlight_keyframe_one_period_sweep(keyframe_animation_t* animation, visualizer_state_t* state) {
+ (void)state;
+ float frame_length = animation->frame_lengths[animation->current_frame];
+ float current_pos = frame_length - animation->time_left_in_frame;
+ float t = current_pos / frame_length;
+ for (int i=0; i< NUM_COLS; i++) {
+ uint8_t color = off_on_off_gradient(t*2, i, NUM_COLS);
+ gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color));
+ }
+ return true;
+}
+
+bool led_backlight_keyframe_half_period_sweep_to_on(keyframe_animation_t* animation, visualizer_state_t* state) {
+ (void)state;
+ float frame_length = animation->frame_lengths[animation->current_frame];
+ float current_pos = frame_length - animation->time_left_in_frame;
+ float t = current_pos / frame_length;
+ for (int i=0; i< NUM_COLS; i++) {
+ uint8_t color = off_on_gradient(t*2, i, NUM_COLS);
+ gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color));
+ }
+ return true;
+}
+bool led_backlight_keyframe_half_period_sweep_to_off(keyframe_animation_t* animation, visualizer_state_t* state) {
+ (void)state;
+ float frame_length = animation->frame_lengths[animation->current_frame];
+ float current_pos = frame_length - animation->time_left_in_frame;
+ float t = current_pos / frame_length;
+ for (int i=0; i< NUM_COLS; i++) {
+ uint8_t color = on_off_gradient(t*2, i, NUM_COLS);
+ gdispGDrawLine(LED_DISPLAY, i, 0, i, NUM_ROWS - 1, LUMA2COLOR(color));
+ }
+ return true;
+}
+
+
/*
- * one set left to right. then reverse to go back.
- * | left side | right side | |
- |---|---|---|---|---|---|---|:-:|---|---|---|---|---|---|-------|
- | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | phase |
- _________________________________________________________________
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 |
- | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 2 |
- | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 3 |
- | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 4 |
- | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 5 |
- | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 6 |
- | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 7 |
- | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 0 | 8 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 0 | 9 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 0 | 10 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 0 | 11 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 0 | 12 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 0 | 13 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 14 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 15 |
- | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 16 |
- */
+ +---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
+| 0 | 1 | 2 | 3 | 4 | 5 | 6 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | phase |
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+| 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 |
+| 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 2 |
+| 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 3 |
+| 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 4 |
+| 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 5 |
+| 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 6 |
+| 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 7 |
+| 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 8 |
+| 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 0 | 9 |
+| 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 0 | 10 |
+| 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 0 | 11 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 0 | 12 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 0 | 13 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 14 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 5 | 15 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 4 | 16 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 3 | 17 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 18 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 19 |
+| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 20 |
++---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
+*/
#ifdef MASTER_IS_ON_RIGHT /*right side*/
-
-keyframe_animation_t KITT_Scanner_animation = {
- .num_frames = 2,
+keyframe_animation_t sweep_on_sweep_off_left_and_right = {
+ .num_frames = 12,
.loop = true,
.frame_lengths = {
- CROSSFADE_TIME * BOTHSIDESCAN,
- CROSSFADE_TIME * BOTHSIDESCAN,
+ 0,
+ 1,
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left off
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right off
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right off
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left off
+ 0, // normal leds
},
.frame_functions = {
- KITT_scan_one_side_left_to_right,
- KITT_scan_one_side_right_to_left,
+ led_backlight_keyframe_mirror_orientation,
+ led_backlight_keyframe_fade_out_all,
+ keyframe_no_operation,
+ led_backlight_keyframe_half_period_sweep_to_on,
+ keyframe_no_operation,
+ led_backlight_keyframe_half_period_sweep_to_off,
+ led_backlight_keyframe_normal_orientation,
+ led_backlight_keyframe_half_period_sweep_to_on,
+ keyframe_no_operation,
+ led_backlight_keyframe_half_period_sweep_to_off,
+ keyframe_no_operation,
+ led_backlight_keyframe_mirror_orientation,
+
+ },
+};
+keyframe_animation_t both_sides_fade_across = {
+ .num_frames = 10,
+ .loop = true,
+ .frame_lengths = {
+ 0,
+ 1,
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in)
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out)
+ 0, // normal leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in)
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out)
+ 0, // normal leds
+ },
+ .frame_functions = {
+ led_backlight_keyframe_mirror_orientation,
+ led_backlight_keyframe_fade_out_all,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ led_backlight_keyframe_one_period_sweep,
+ led_backlight_keyframe_normal_orientation,
+ led_backlight_keyframe_one_period_sweep,
+ led_backlight_keyframe_mirror_orientation,
+ keyframe_no_operation,
+ keyframe_no_operation,
},
};
-bool KITT_scan_one_side_left_to_right(keyframe_animation_t* animation, visualizer_state_t* state) {
- (void)state;
- float frame_length = animation->frame_lengths[animation->current_frame];
- float current_pos = frame_length - animation->time_left_in_frame;
- int phase = current_pos/(frame_length/BOTHSIDESCAN);
- int row = 0;
- gdispGClear(LED_DISPLAY, ONE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, 14-phase, row, FULL_ON);
- gdispGDrawPixel(LED_DISPLAY, 15-phase, row, THREE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, 16-phase, row, HALF_ON);
- gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER);
- return true;
-}
-
-bool KITT_scan_one_side_right_to_left(keyframe_animation_t* animation, visualizer_state_t* state) {
- (void)state;
- float frame_length = animation->frame_lengths[animation->current_frame];
- float current_pos = frame_length - animation->time_left_in_frame;
- int phase = current_pos/(frame_length/BOTHSIDESCAN);
- int row = 0;
- gdispGClear(LED_DISPLAY, ONE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, phase, row, FULL_ON);
- gdispGDrawPixel(LED_DISPLAY, phase-1, row, THREE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, phase-2, row, HALF_ON);
- gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER);
- return true;
-}
#else /*left side*/
-keyframe_animation_t KITT_Scanner_animation = {
- .num_frames = 2,
+keyframe_animation_t sweep_on_sweep_off_left_and_right = {
+ .num_frames = 10,
.loop = true,
.frame_lengths = {
- CROSSFADE_TIME * BOTHSIDESCAN,
- CROSSFADE_TIME * BOTHSIDESCAN,
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left off
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right off
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left on
+ gfxMillisecondsToTicks(GRADIENT_TIME), // right off
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left off
+ 0, // normal leds
},
.frame_functions = {
- KITT_scan_one_side_left_to_right,
- KITT_scan_one_side_right_to_left,
+ led_backlight_keyframe_half_period_sweep_to_on,
+ keyframe_no_operation,
+ led_backlight_keyframe_half_period_sweep_to_off,
+ keyframe_no_operation,
+ led_backlight_keyframe_mirror_orientation,
+ keyframe_no_operation,
+ led_backlight_keyframe_half_period_sweep_to_on,
+ keyframe_no_operation,
+ led_backlight_keyframe_half_period_sweep_to_off,
+ led_backlight_keyframe_normal_orientation,
+
+ },
+};
+keyframe_animation_t both_sides_fade_across = {
+ .num_frames = 8,
+ .loop = true,
+ .frame_lengths = {
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in)
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out)
+ 0, // normal leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in)
+ 0, // mirror leds
+ gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out)
+ 0, // normal leds
+ },
+ .frame_functions = {
+ led_backlight_keyframe_one_period_sweep,
+ led_backlight_keyframe_mirror_orientation,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ keyframe_no_operation,
+ led_backlight_keyframe_one_period_sweep,
+ led_backlight_keyframe_normal_orientation,
+
},
};
-bool KITT_scan_one_side_left_to_right(keyframe_animation_t* animation, visualizer_state_t* state) {
- (void)state;
- float frame_length = animation->frame_lengths[animation->current_frame];
- float current_pos = frame_length - animation->time_left_in_frame;
- int phase = current_pos/(frame_length/BOTHSIDESCAN);
- int row = 0;
- gdispGClear(LED_DISPLAY, ONE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, phase, row, FULL_ON);
- gdispGDrawPixel(LED_DISPLAY, phase-1, row, THREE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, phase-2, row, HALF_ON);
- gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER);
- return true;
-}
-bool KITT_scan_one_side_right_to_left(keyframe_animation_t* animation, visualizer_state_t* state) {
- (void)state;
- float frame_length = animation->frame_lengths[animation->current_frame];
- float current_pos = frame_length - animation->time_left_in_frame;
- int phase = current_pos/(frame_length/BOTHSIDESCAN);
- int row = 0;
- gdispGClear(LED_DISPLAY, ONE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, (14 - phase), row, FULL_ON);
- gdispGDrawPixel(LED_DISPLAY, 14 - (phase-1), row, THREE_QUARTER);
- gdispGDrawPixel(LED_DISPLAY, 14 - (phase-2), row, HALF_ON);
- gdispGDrawPixel(LED_DISPLAY, 6, row, ONE_QUARTER);
- return true;
-}
#endif
#define RED 0
@@ -170,19 +334,24 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) {
/* if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) {
saturation = 255;
} */
- if (state->status.layer & 0x200) {
+
+ if (state->status.layer & 0x400) {
+ state->target_lcd_color = LCD_COLOR(OCEAN, saturation, 0xFF);
+ state->layer_text = "STENOGRAPHY";
+ }
+ else if (state->status.layer & 0x200) {
state->target_lcd_color = LCD_COLOR(GREEN, saturation, 0xFF);
- state->layer_text = "MOUSE";
+ state->layer_text = "FUNCTION";
}
else if (state->status.layer & 0x100) {
state->target_lcd_color = LCD_COLOR(MAGENTA, saturation, 0xFF);
state->layer_text = "Shortcuts Layer";
+ stop_keyframe_animation(&sweep_on_sweep_off_left_and_right);
+ start_keyframe_animation(&led_test_animation);
}
else if (state->status.layer & 0x80) {
state->target_lcd_color = LCD_COLOR(VIOLET, saturation, 0xFF);
state->layer_text = "Plover";
- start_keyframe_animation(&KITT_Scanner_animation);
-
}
else if (state->status.layer & 0x40) {
state->target_lcd_color = LCD_COLOR(RASPBERRY, saturation, 0xFF);
@@ -199,6 +368,8 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) {
else if (state->status.layer & 0x4) {
state->target_lcd_color = LCD_COLOR(BLUE, saturation, 0xFF);
state->layer_text = "Dvorak";
+ stop_keyframe_animation(&led_test_animation);
+ start_keyframe_animation(&sweep_on_sweep_off_left_and_right);
}
else if (state->status.layer & 0x2) {
state->target_lcd_color = LCD_COLOR(ORANGE, saturation, 0xFF);
@@ -207,7 +378,7 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) {
else {
state->target_lcd_color = LCD_COLOR(YELLOW, saturation, 0xFF);
state->layer_text = "Qwerty";
- stop_keyframe_animation(&KITT_Scanner_animation);
+ stop_keyframe_animation(&led_test_animation);
start_keyframe_animation(&Fade_in_all_leds);
}
}