]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
[Keymap] Updating crkbd RGB keymap implementation & ninjonas userspace updates (...
authorJonas Avellana <14019120+ninjonas@users.noreply.github.com>
Mon, 30 Sep 2019 17:50:27 +0000 (11:50 -0600)
committerDrashna Jaelre <drashna@live.com>
Mon, 30 Sep 2019 17:50:27 +0000 (10:50 -0700)
* [keymap] Updating crkbd RGB implementation & ninjonas userspace updates

* [chore] adding process_record_oled method to process_records.h

16 files changed:
keyboards/crkbd/keymaps/ninjonas/README.md
keyboards/crkbd/keymaps/ninjonas/config.h
keyboards/crkbd/keymaps/ninjonas/keymap.c
keyboards/crkbd/keymaps/ninjonas/rgb.c [deleted file]
keyboards/crkbd/keymaps/ninjonas/rules.mk
keyboards/hotdox/keymaps/ninjonas/README.md
keyboards/hotdox/keymaps/ninjonas/keymap.c
keyboards/lily58/keymaps/ninjonas/README.md
keyboards/lily58/keymaps/ninjonas/keymap.c
keyboards/pinky/3/keymaps/ninjonas/README.md
keyboards/pinky/3/keymaps/ninjonas/keymap.c
users/ninjonas/README.md
users/ninjonas/ninjonas.h
users/ninjonas/oled.c
users/ninjonas/process_records.c
users/ninjonas/process_records.h

index 24889a221d58fe407ab7983971b5befae4584301..4d7434fa7a6fe9c0ee1ff74f5fb35f4de5f40afd 100644 (file)
@@ -51,7 +51,7 @@ More information about the crkbd keyboard can be found [here](https://thomasbaar
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
   //         ,        , KC_BRID,    Next,   VolUp,       ,           PgDn,    Left,    Down,   Right,  K_LOCK,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-  //         ,        ,        ,    Prev,   VolDn,      [,              ],        ,        ,  M_CODE,  M_ZOOM, M_PYNV,
+  //         ,        ,        ,    Prev,   VolDn,      [,              ],        ,        ,  M_CODE,  M_XXX1, M_PYNV,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
                                  //     ,        ,       ,               ,        ,
                                  //`---------------------'      `---------------------'
index ef7ff6c5568a1b87d2bca1f2695097650eca2730..5d214466231a19b90a5587edc469e48413f19e5a 100644 (file)
@@ -32,16 +32,60 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_FORCE_HOLD
 
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #undef RGBLIGHT_ANIMATIONS   // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    #define RGBLED_NUM 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
+    #define RGB_MATRIX_HUE_STEP 10
+    #define RGB_MATRIX_SAT_STEP 10
+    #define RGB_MATRIX_VAL_STEP 10
+    #define RGB_MATRIX_SPD_STEP 10
+    // #define RGB_MATRIX_KEYPRESSES 
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+    
+    // BEGIN: Disable RGB Effects
+    //#define DISABLE_RGB_MATRIX_SOLID_COLOR
+    //#define DISABLE_RGB_MATRIX_ALPHAS_MODS
+    //#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define DISABLE_RGB_MATRIX_BREATHING
+    #define DISABLE_RGB_MATRIX_BAND_SAT
+    #define DISABLE_RGB_MATRIX_BAND_VAL
+    // #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    #define DISABLE_RGB_MATRIX_CYCLE_ALL
+    #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #define DISABLE_RGB_MATRIX_DUAL_BEACON
+    #define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #define DISABLE_RGB_MATRIX_RAINDROPS
+    #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+
+    // BEGIN: RGB_MATRIX_FRAMEBUFFER_EFFECTS
+    #define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+    // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+    // END: RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+    // BEGIN: RGB_MATRIX_KEYPRESSES
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define DISABLE_RGB_MATRIX_SPLASH
+    #define DISABLE_RGB_MATRIX_MULTISPLASH
+    #define DISABLE_RGB_MATRIX_SOLID_SPLASH
+    #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+    // END: RGB_MATRIX_KEYPRESSES
+    // END: Disable RGB Effects
 #endif 
 
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
index 6d19345c44e8dba7ef4396fae49d73a1d02aab55..21f83cc78e6306984866961a1114ba84bb7a30f4 100644 (file)
@@ -40,11 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_wrapper(
   //,----------------------------------------------------.      ,----------------------------------------------------.
-     XXXXXXX, XXXXXXX, _________MEDIA_1_________,  K_CSCN,       _______________NAV_1______________,  XXXXXXX, K_MDSH,
+      M_XXX2,  M_XXX3, _________MEDIA_1_________,  K_CSCN,       _______________NAV_1______________,  XXXXXXX, K_MDSH,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-     XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX,       _______________NAV_2______________,   K_LOCK, XXXXXXX,
+      M_XXX4,  M_XXX5, _________MEDIA_2_________, XXXXXXX,       _______________NAV_2______________,   K_LOCK, XXXXXXX,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-     _______,  M_SHFT, _________MEDIA_3_________,  T_LBRC,         T_RBRC, _______, XXXXXXX,  M_CODE,  M_ZOOM, M_PYNV,
+     KC_LSFT,  M_SHFT, _________MEDIA_3_________,  T_LBRC,         T_RBRC,    KC_M, XXXXXXX,  M_CODE,  M_XXX1, M_PYNV,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
                                     _______,_______,_______,     _______,_______,_______
                                  //`---------------------'      `---------------------'
@@ -66,9 +66,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,----------------------------------------------------.      ,----------------------------------------------------.
        M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK,  DVORAK, QWERTY,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-       M_VRSN,  M_MALL, XXXXXXX, RGB_SAI, RGB_HUI, RGB_VAI,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       M_VRSN,  M_MALL, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-       M_FLSH, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_VAD,       RGB_M_P, RGB_M_B,RGB_M_SW, XXXXXXX, XXXXXXX, XXXXXXX,
+       M_FLSH, XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD,       RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
                                     _______,_______,_______,     _______,_______,_______
                                  //`---------------------'      `---------------------'
diff --git a/keyboards/crkbd/keymaps/ninjonas/rgb.c b/keyboards/crkbd/keymaps/ninjonas/rgb.c
deleted file mode 100644 (file)
index f9ac3a8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#include QMK_KEYBOARD_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;
-
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void keyboard_post_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
\ No newline at end of file
index 92e18ed6e2aa71529e3fd9515f8c724887899a17..95cc3fed367d8301e802919aa90a92c647b0fa9b 100644 (file)
@@ -1,11 +1,7 @@
-RGBLIGHT_ENABLE = yes
+RGB_MATRIX_ENABLE = WS2812
 MOUSEKEY_ENABLE = no
 OLED_DRIVER_ENABLE = yes
 LINK_TIME_OPTIMIZATION_ENABLE = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        rgb.c
index b289651a8daebecf515e2bc9fd0310fc2365f611..5cbfacf9f5a82d5b0dd805295c7b63f104315d33 100644 (file)
@@ -43,7 +43,7 @@ This keymap is designed based off my typing habits and is subject to change. Inf
  * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |       |   N  |   M  |   ,  |   .  |  /   |   =    |
  * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
- *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_ZOOM|M_PYNV|
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
  *   `----------------------------------'                                        `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |  Up  | Down |       | Left | Right|
index 248a4320a1473c9b5b825199be204c4597491887..7a505b4e1be158739718e115d34827f98121815e 100644 (file)
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |       |   N  |   M  |   ,  |   .  |  /   |   =    |
  * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
- *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_ZOOM|M_PYNV|
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
  *   `----------------------------------'                                        `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |  Up  | Down |       | Left | Right|
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO,  _____________________QWERTY_R1______________________,
                 _____________________QWERTY_R2______________________,
         T_RBRC, _____________________QWERTY_R3______________________,
-                ________MOD_RIGHT________, M_ZOOM, M_PYNV,
+                ________MOD_RIGHT________, M_XXX1, M_PYNV,
                 // RIGHT THUMB
                 KC_LEFT, KC_RGHT,
                 KC_PGUP,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
  * | LShift |   ;  |   Q  |   J  |   K  |   X  |      |           |       |   B  |   M  |   W  |   V  |  Z   |   =    |
  * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
- *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_ZOOM|M_PYNV|
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
  *   `----------------------------------'                                        `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |  Up  | Down |       | Left | Right|
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO,  _____________________DVORAK_R1______________________,
                 _____________________DVORAK_R2______________________,
         T_RBRC, _____________________DVORAK_R3______________________,
-                ________MOD_RIGHT________, M_ZOOM, M_PYNV,
+                ________MOD_RIGHT________, M_XXX1, M_PYNV,
                 // RIGHT THUMB
                 KC_LEFT, KC_RGHT,
                 KC_PGUP,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|  [   |           |   ]   |------+------+------+------+------+--------|
  * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |       |   K  |   M  |   ,  |   .  |   /  |   =    |
  * `--------+------+------+------+------+-------------'           `--------------+------+------+------+------+--------'
- *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_ZOOM|M_PYNV|
+ *   |M_SHFT|      | Alt  |     | Ctl  |                                        | BkSP | Del  |LOWER |M_XXX1|M_PYNV|
  *   `----------------------------------'                                        `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |  Up  | Down |       | Left | Right|
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_NO,  _____________________COLEMAK_R1_____________________,
                 _____________________COLEMAK_R2_____________________,
         T_RBRC, _____________________COLEMAK_R3_____________________,
-                ________MOD_RIGHT________, M_ZOOM, M_PYNV,
+                ________MOD_RIGHT________, M_XXX1, M_PYNV,
                 // RIGHT THUMB
                 KC_LEFT, KC_RGHT,
                 KC_PGUP,
index ef6322db4dde00cca217c7baf5a5fd470daeca86..8622528400458b711d9eea6854ed3fea5288b61d 100644 (file)
@@ -3,8 +3,6 @@
 ## Keymap
 This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](../../../../users/ninjonas).
 
-> Make sure you update QMK's lily58 config.h TAPPING_TERM to 200ms or this won't compile
-
 More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342)
 
 ### QWERTY
@@ -71,7 +69,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
  * |------+------+------+-------+------+------|                    |------+------+------+------+-------+------|
  * |      |      |KC_BRID| Next |VolUp |      |-------.    ,-------| PgDn | Left | Down |Right |K_LOCK |      |
  * |------+------+------+-------+------+------|       |    |       |------+------+------+------+-------+------|
- * |M_SHFT|      |      | Prev  |VolDn |      |-------|    |-------|      |      |      |      |M_ZOOM |M_PYNV|
+ * |M_SHFT|      |      | Prev  |VolDn |      |-------|    |-------|      |      |      |      |       |M_PYNV|
  * `------------------------------------------/       /     \      \------------------------------------------'
  *                    |      |      |      | /       /       \      \  |      |M_CODE|      |
  *                    |      |      |      |/       /         \      \ |      |      |      |
index 5ef607564e84d0e0497a8af880f3ee7fba3e3297..6c6a41b3b7a685294e62279bd6d3d25a03f79890 100644 (file)
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+-------+------+------|                    |------+------+------+------+-------+------|
  * |      |      |KC_BRID| Next |VolUp |      |-------.    ,-------| PgDn | Left | Down |Right |K_LOCK |      |
  * |------+------+------+-------+------+------|       |    |       |------+------+------+------+-------+------|
- * |M_SHFT|      |      | Prev  |VolDn |      |-------|    |-------|      |      |      |      |M_ZOOM |M_PYNV|
+ * |      |M_SHFT|      | Prev  |VolDn |      |-------|    |-------|      | M    |      |      |       |M_PYNV|
  * `------------------------------------------/       /     \      \------------------------------------------'
  *                    |      |      |      | /       /       \      \  |      |M_CODE|      |
  *                    |      |      |      |/       /         \      \ |      |      |      |
@@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT_wrapper( \
        _____________________FUNC_LEFT______________________,                     _____________________FUNC_RIGHT_____________________, \
-       _______, _______, _________MEDIA_1_________, _______,                     _______________NAV_1______________, _______,  K_MDSH, \
-       _______, _______, _________MEDIA_2_________, _______,                     _______________NAV_2______________, K_LOCK,  _______, \
-       M_SHFT,  _______, _________MEDIA_3_________, _______, _______,   _______, _______, _______, _______, _______, M_ZOOM,  M_PYNV, \
+        M_XXX2,  M_XXX3, _________MEDIA_1_________, _______,                     _______________NAV_1______________, _______,  K_MDSH, \
+        M_XXX4,  M_XXX5, _________MEDIA_2_________, _______,                     _______________NAV_2______________,  K_LOCK, _______, \
+       _______,  M_SHFT, _________MEDIA_3_________, _______, _______,   _______, _______,    KC_M, _______, _______,  M_XXX1,  M_PYNV, \
                                   __________________________________,   _______, _______, M_CODE,  _______ \
        ),
 
index 4546b164c770802524a6cfb49712ec80aaca1a0b..d47fdd995bb2769619caf41328f2566f3a999152 100644 (file)
@@ -58,7 +58,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co
 |---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
 |         |         |         |    BriDn|     Next|    VolUp|         |  |         |     PgDn|     Left|     Down|    Right|   K_LOCK|         |
 |---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-|   M_SHFT|         |         |         |     Prev|    VolDn|         |  |         |         |         |         |         |   M_ZOOM|   M_PYNV|
+|   M_SHFT|         |         |         |     Prev|    VolDn|         |  |         |         |         |         |         |         |   M_PYNV|
 `---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------'
                               |         |         |         |         |  |         |         |   M_CODE|         |
                               `---------------------------------------'  `---------------------------------------'
index d2cca166576db0874f78b121976c270fafd14e73..b7d9f2fa7563ff644cbd7b658343d32eceedcfe3 100644 (file)
@@ -61,11 +61,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_wrapper(
   //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-       XXXXXXX,  XXXXXXX,  _________MEDIA_1_________,    XXXXXXX,   K_CSCN,     XXXXXXX, _______________NAV_1______________,      XXXXXXX,  K_MDSH,
+       M_XXX2,   M_XXX3,  _________MEDIA_1_________,    XXXXXXX,   K_CSCN,     XXXXXXX, _______________NAV_1______________,      XXXXXXX,  K_MDSH,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-       XXXXXXX,  XXXXXXX,  _________MEDIA_2_________,    XXXXXXX,  XXXXXXX,     XXXXXXX, _______________NAV_2______________,       K_LOCK,  XXXXXXX,
+       M_XXX4,   M_XXX5,  _________MEDIA_2_________,    XXXXXXX,  XXXXXXX,     XXXXXXX, _______________NAV_2______________,       K_LOCK,  XXXXXXX,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-        M_SHFT,  XXXXXXX,  _________MEDIA_3_________,    XXXXXXX,  _______,     _______,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,   M_ZOOM,   M_PYNV,
+       XXXXXXX,   M_SHFT,  _________MEDIA_3_________,    XXXXXXX,  _______,     _______,  XXXXXXX,     KC_M,  XXXXXXX,  XXXXXXX,   M_XXX1,   M_PYNV,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
                                         __________________________________,     _______,  _______,   M_CODE,  _______
                                 //`---------------------------------------'  `---------------------------------------'
index fb14bfe6c26c1e6424d7d17cd4f7f89b6c997e12..32ccdc699f72bf269e6e6932115ff750aed58049 100644 (file)
@@ -16,7 +16,7 @@ See: https://docs.qmk.fm/#/feature_userspace
 - [Lily58](../../keyboards/lily58/keymaps/ninjonas)
 
 ## Features
-### [Keys](ninjonas.h#L40)
+### [Keys](ninjonas.h#L37)
 |Code | Description |
 |---|---|
 |K_LOCK | MacOS shortcut to execute lock command  + ctrl + Q |
@@ -25,7 +25,7 @@ See: https://docs.qmk.fm/#/feature_userspace
 |K_RAPP | MacOS shortcut to switch apps to the right |
 |K_LAPP | MacOS shortcut to switch apps to the left |
 
-### [Layers](ninjonas.h#L47)
+### [Layers](ninjonas.h#L44)
 |Code | Description |
 |---|---|
 |LT_LOW | Tap for ENTER, hold for RAISE |
@@ -34,7 +34,7 @@ See: https://docs.qmk.fm/#/feature_userspace
 |LM_LOW | Dedicated key to momentarily toggle to use LOWER layer |
 |LM_RAI | Dedicated key to momentarily toggle to use RAISE layer |
 
-### [Layout Blocks](ninjonas.h#L53)
+### [Layout Blocks](ninjonas.h#L50)
 Predefined keyboard layout templates to speed up configuring split keyboards
 
 |Code | Description |
@@ -59,6 +59,7 @@ Predefined keyboard layout templates to speed up configuring split keyboards
 |M_VRSN | macro to send QMK version |
 |M_SHFT | Sends  + alt + shift to a keycode to activate [ShiftIt](https://github.com/fikovnik/ShiftIt) |
 |M_CODE | Opens [Visual Studio Code](https://code.visualstudio.com/) on current directory |
+|M_XXX1 to M_XXX5 | Reserved for secret macros see [Secrets](#secrets)  |
 
 ### [Tap-Dance](tap_dances.h)
 |Code | Description |
@@ -73,21 +74,29 @@ Predefined keyboard layout templates to speed up configuring split keyboards
 |T_Q | Tap for Q, double tap for  + Q |
 
 ### Secrets
-There's times where you have macros you don't want to share like emails, passwords 😱, & and private strings. Based off [drashna's secret macros](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md), it's now possible to do this. All you need to do is create a `secrets.c` file. Below is an example of how this is used.
+There's times where you have macros you don't want to share like emails, an address you need but you always forget, passwords 😱, & and private strings. Based off [drashna's secret macros](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md), it's now possible to do this. All you need to do is create a `secrets.c` file. Below is an example of how this is used.
 
 ```c
 // secrets.c
-#include "ninjonas.h"
+#include "ninjonas.h" 
+
+static const char * const secret[] = {
+  "BLANK1",
+  "BLANK2",
+  "BLANK3",
+  "BLANK4",
+  "BLANK5"
+};
 
 bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    // Sends zoom URL
-    case M_ZOOM:
+    case M_XXX1...M_XXX5:
       if (record->event.pressed) {
-        SEND_STRING("SECRET_STRING_HERE" SS_TAP(X_ENTER));
+        send_string(secret[keycode - M_XXX1]);
       }
       break;
   }
   return true;
 }
+
 ```
\ No newline at end of file
index 227534c2594559a6bdd1af93fcfc6a1939aaa1aa..fdba683702f45b83146cfb22e60fc6af93068329 100644 (file)
@@ -26,9 +26,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 #define _QWERTY 0
 #define _DVORAK 1
index 837d497ab3049730315dc80b592d5e49a3289d02..8a9c9959366f28dac6e159b8c67eb204b1fa8559 100644 (file)
@@ -7,10 +7,10 @@
 static uint16_t oled_timer = 0;
 extern uint8_t is_master;
 
-bool process_record_oled(uint16_t keycode, keyrecord_t *record) { 
+bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         oled_timer = timer_read();
-    }      
+    }
     return true;
 }
 
@@ -48,6 +48,7 @@ void render_mod_status(uint8_t modifiers) {
 
 void render_status(void){
   render_default_layer_state();
+  oled_write_P(PSTR("\n"), false);
   render_layer_state();
   render_mod_status(get_mods()|get_oneshot_mods());
 }
@@ -70,12 +71,13 @@ void oled_task_user(void) {
     #ifndef SPLIT_KEYBOARD
     else { oled_on(); }
     #endif
-    
+
     if (is_master) {
-        render_status();     
+        render_status();
     } else {
-        render_logo();       
-        oled_scroll_left();  
+        oled_write_P(PSTR("\n"), false);
+        render_logo();
+        oled_scroll_left();
     }
 }
 
index e1960aaa3e5797970eb3576190bad3d596faf6c5..6ec5be597882af9da96711a17716e5414ad4ea98 100644 (file)
@@ -12,18 +12,16 @@ bool process_record_oled(uint16_t keycode, keyrecord_t *record) { return true; }
 #endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    #ifdef OLED_DRIVER_ENABLE
-    process_record_oled(keycode, record);
-    #endif
-  }
+  #ifdef OLED_DRIVER_ENABLE
+  process_record_oled(keycode, record);
+  #endif
 
   switch (keycode) {
 
     // Sends pyenv to activate 'jira' environment
     case M_PYNV:
       if (record->event.pressed) {
-        SEND_STRING("pyenv activate jira" SS_TAP(X_ENTER));
+        SEND_STRING("pyenv activate jira\n");
       }
       break;
 
index 37d88d0cad00f51cc266ba4bcf90650f6be2f428..07babdd583258d3cbb4b5233354069f84d5c5f3e 100644 (file)
@@ -7,7 +7,6 @@ enum custom_keycodes {
   DVORAK,
   COLEMAK,
   // Custom Macros
-  M_ZOOM,
   M_PYNV,
   M_SHFT,
   M_MAKE,
@@ -15,11 +14,16 @@ enum custom_keycodes {
   M_FLSH,
   M_VRSN,
   M_CODE,
+  // Secret Macros
+  M_XXX1,
+  M_XXX2,
+  M_XXX3,
+  M_XXX4,
+  M_XXX5,
 };
 
-#ifdef SSD1306OLED
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-#endif
-
 bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
+#ifdef OLED_DRIVER_ENABLE
+bool process_record_oled(uint16_t keycode, keyrecord_t *record);
+#endif