From 3076f86dc11d346d07c63e5fb11702817d7034e7 Mon Sep 17 00:00:00 2001
From: Jacob Jerrell <jacob.jerrell@gmail.com>
Date: Sun, 6 Dec 2020 00:30:27 -0600
Subject: Bocaj - Third Annual Refactor (Redux) (#10295)

* Reset everything to upstream, reapply Bocaj changes

* Bocaj - address PR comments

* Just in time changes

* Bocaj - Several adjustments after using the layout for a while
---
 layouts/community/ergodox/bocaj/config.h  |   2 -
 layouts/community/ergodox/bocaj/keymap.c  | 307 ++++++++++++++----------------
 layouts/community/ergodox/bocaj/readme.md |  47 ++---
 layouts/community/ergodox/bocaj/rules.mk  |  23 ++-
 4 files changed, 175 insertions(+), 204 deletions(-)

(limited to 'layouts/community/ergodox/bocaj')

diff --git a/layouts/community/ergodox/bocaj/config.h b/layouts/community/ergodox/bocaj/config.h
index bc1d20a626..621ae784cf 100644
--- a/layouts/community/ergodox/bocaj/config.h
+++ b/layouts/community/ergodox/bocaj/config.h
@@ -1,6 +1,4 @@
 #pragma once
 
-#include QMK_KEYBOARD_CONFIG_H
-
 #define LEADER_TIMEOUT 250
 #define LEADER_PER_KEY_TIMING
diff --git a/layouts/community/ergodox/bocaj/keymap.c b/layouts/community/ergodox/bocaj/keymap.c
index cb78e7aae7..ba105a8f1d 100644
--- a/layouts/community/ergodox/bocaj/keymap.c
+++ b/layouts/community/ergodox/bocaj/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
+Copyright 2020 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
 
 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
@@ -15,182 +15,161 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
 #include "bocaj.h"
 
-#define LAYOUT_ergodox_pretty_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-  ) \
-  LAYOUT_ergodox_pretty_wrapper( \
-      KC_ESC,  __________________NUMBER_LEFT_______________, JJ_ARRW,                 KC_MINS,  __________________NUMBER_RIGHT______________, KC_EQUAL,  \
-      KC_DEL,  K01,        K02,        K03,        K04, K05, KC_LPRN,                 KC_RPRN,  K06, K07,        K08,        K09,        K0A, KC_BSLASH, \
-      KC_NUMS, K11, SFT_T(K12),        K13, ALT_T(K14), K15,                                    K16, ALT_T(K17), K18,     SFT_T(K19),    K1A, KC_QUOT,   \
-      OS_LSFT, CTL_T(K21), K22,        K23,        K24, K25, HYP_LBK,                 MEH_RBK,  K26, K27,        K28,        K29, CTL_T(K2A), KC_RSFT,   \
-       KC_GAME,KC_NUMS,    TT(_LOWER), KC_UP,  KC_LEFT,                                            KC_RIGHT,   KC_DOWN,    UC_DISA,KC_GAME, KC_ADJS,     \
-                                                             KC_APP,KC_HOME,    KC_END,KC_ESC,           \
-                                                                    UC_FLIP,    UC_TABL,                \
-                                                 KC_SPACE,KC_BSPACE,KC_LEAD,    UC_SHRG,KC_TAB,KC_LWEN                          \
-)
-
-#define LAYOUT_ergodox_pretty_base_wrapper(...)       LAYOUT_ergodox_pretty_base(__VA_ARGS__)
+/*
+ * The `LAYOUT_ergodox_pretty_base` macro is a template to allow the use of
+ * identical modifiers for the default layouts (eg QWERTY, Colemak, Dvorak,
+ * etc), so that there is no need to set them up for each layout, and modify
+ * all of them if I want to change them.  This helps to keep consistency and
+ * ease of use. K## is a placeholder to pass through the individual keycodes
+ */
+#define LAYOUT_ergodox_bocaj(...)       WRAPPER_ergodox_bocaj(__VA_ARGS__)
+#define LAYOUT_ergodox_bocaj_WIN(...)   WRAPPER_ergodox_bocaj_WIN(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Workman - http://www.keyboard-layout-editor.com/#/gists/7a07cb982ec3597ba3e3d947554225f1
-                .---------------------------------------------.                                 .---------------------------------------------.
-                |  ESC  |  1  |  2  |  3  |  4  |  5  |   ->  |                                 !   -   |  6  |  7  |  8  |  9  |  0  |   =   |
-                !-------+-----+-----+-----+-----+-------------!                                 !-------+-----+-----+-----+-----+-----+-------!
-                |  DEL  |  Q  |  D  |  R  |  W  |  B  |   (   |                                 !   )   |  J  |  F  |  U  |  P  |  ;  |   \   |
-                !-------+-----+-----+-----x-----x-----!       !                                 !       !-----x-----x-----+-----+-----+-------!
-                |  NUMS |  A  |  S  |  H  |  T  |  G  |-------!                                 !-------!  Y  |  N  |  E  |  O  |  I  |   '   |
-                !-------+-----+-----+-----x-----x-----!  HYP  !                                 !  MEH  !-----x-----x-----+-----+-----+-------!
-                | SHIFT |  Z  |  X  |  M  |  C  |  V  |   [   |                                 !   ]   |  K  |  L  |  ,  |  .  |  /  | SHIFT |
-                '-------+-----+-----+-----+-----+-------------'                                 '-------------+-----+-----+-----+-----+-------'
-                 |      | NUM | LWR |  UP | LFT | .---------------.                         .---------------. ! RGT | DWN |     |GAME | ADJ  |
-                 '------------------------------' |   APP | HOME  |                         !  PGUP |  ESC  | '------------------------------'
-                                          .-------+-------+-------!                         !-------+-------+-------.
-                                          !       !       |  END  |                         !  PGDN |       ! ENTER !
-                                          ! SPACE ! BSPCE !-------!                         !-------!  TAB  !   /   !
-                                          |       |       | COPY  |                         ! PASTE |       | LOWER |
-                                          '-----------------------'                         '-----------------------'
-*/
-  [_WORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
-                 _________________WORKMAN_L1_________________,         _________________WORKMAN_R1_________________,
-                 _________________WORKMAN_L2_________________,         _________________WORKMAN_R2_________________,
-                 _________________WORKMAN_L3_________________,         _________________WORKMAN_R3_________________
-  ),
-  [_WINWORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
-                 _________________WORKMAN_L1_________________,         _________________WORKMAN_R1_________________,
-                 ________________WWORKMAN_L2_________________,         ________________WWORKMAN_R2_________________,
-                 _________________WORKMAN_L3_________________,         _________________WORKMAN_R3_________________
-  ),
-/* QWERTY - http://www.keyboard-layout-editor.com/#/gists/b6c016a22a9d31381a276a603a42fe5f
-                 .---------------------------------------------.                               .---------------------------------------------.
-                 |  ESC  |  1  |  2  |  3  |  4  |  5  |   ->  |                               !   -   |  6  |  7  |  8  |  9  |  0  |   =   |
-                 !-------+-----+-----+-----+-----+-------------!                               !-------+-----+-----+-----+-----+-----+-------!
-                 |  DEL  |  Q  |  W  |  E  |  R  |  T  |   (   |                               !   )   |  Y  |  U  |  I  |  O  |  P  |   \   |
-                 !-------+-----+-----+-----x-----x-----!       !                               !       !-----x-----x-----+-----+-----+-------!
-                 |  NUMS |  A  |  S  |  D  |  F  |  G  |-------!                               !-------!  H  |  J  |  K  |  L  |  ;  |   '   |
-                 !-------+-----+-----+-----x-----x-----!  HYP  !                               !  MEH  !-----x-----x-----+-----+-----+-------!
-                 | SHIFT |  Z  |  X  |  C  |  V  |  B  |   [   |                               !   ]   |  N  |  M  |  ,  |  .  |  /  | SHIFT |
-                 '-------+-----+-----+-----+-----+-------------'                               '-------------+-----+-----+-----+-----+-------'
-                  | GAME | NUM | LWR |  UP | LFT | .---------------.                       .---------------. ! RGT | DWN |     |     | ADJ  |
-                  '------------------------------' |   APP | HOME  |                       !  PGUP |  ESC  | '------------------------------'
-                                           .-------+-------+-------!                       !-------+-------+-------.
-                                           !       !       |  END  |                       !  PGDN |       ! ENTER !
-                                           ! SPACE ! BSPCE !-------!                       !-------!  TAB  !   /   !
-                                           |       |       | COPY  |                       ! PASTE |       | LOWER |
-                                           '-----------------------'                       '-----------------------'
-*/
-  [_QWERTY] = LAYOUT_ergodox_pretty_base_wrapper(
-                 _________________QWERTY_L1__________________,         _________________QWERTY_R1__________________,
-                 _________________QWERTY_L2__________________,         _________________QWERTY_R2__________________,
-                 _________________QWERTY_L3__________________,         _________________QWERTY_R3__________________
-  ),
-  [_LOWER] = LAYOUT_ergodox_pretty_wrapper(
-    KC_F11 ,__________________FUNCTION_LEFT_____________, _______,    _______, __________________FUNCTION_RIGHT____________,  KC_F12,
-    _______, _______, _______,  KC_UP, _______,  _______, _______,    _______, _______,   KC_7,    KC_8,    KC_9,   KC_PAST, _______,
-   LM_GRAVE, _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______,                      _______,   KC_4,    KC_5,    KC_6,   KC_PPLS, _______,
-    OS_LSFT,____________________BLANK___________________, _______,    _______, _______,   KC_1,    KC_2,    KC_3,   KC_PMNS, _______,
-      ____________________BLANK___________________,                                       KC_0,    KC_PDOT, KC_COMM,KC_PEQL, _______,
-                                                _______, _______,      _______, _______,
-                                                         _______,      _______,
-                                       _______, _______, _______,      _______, _______, _______
-  ),
-/* Adjust - http://www.keyboard-layout-editor.com/#/gists/dedeae17b35a5d5f745a42aaea78f007
-            .---------------------------------------------.                                              .---------------------------------------------.
-            | MAKE  |     |     |     |     |     | RESET |                                              !  EPRM |     |     |     |     |     |       |
-            !-------+-----+-----+-----+-----+-------------!                                              !-------+-----+-----+-----+-----+-----+-------!
-            |       |     |     |     |     |     |       |                                              !       |     |     |     |     |     |       |
-            !-------+-----+-----+-----x-----x-----!       !                                              !       !-----x-----x-----+-----+-----+-------!
-            |       | 🔇  |  🔉  | 🔊  | LCK |     |-------!                                              !-------!     |     |     |     |     | QWRTY |
-            !-------+-----+-----+-----x-----x-----!       !                                              !       !-----x-----x-----+-----+-----+-------!
-            |       |     |     |     |     |     |       |                                              !       |     |     |     |     | WIN | WRKMN |
-            '-------+-----+-----+-----+-----+-------------'                                              '-------------+-----+-----+-----+-----+-------'
-             |      |     |     |     |     | .---------------.                                      .---------------. !     |     |     |     |      |
-             '------------------------------' |       |       |                                      !       |       | '------------------------------'
-                                      .-------+-------+-------!                                      !-------+-------+-------.
-                                      !       !       |       |                                      !       |       !       !
-                                      !       !       !-------!                                      !-------!       !       !
-                                      |       |       |       |                                      !       |       |       |
-                                      '-----------------------'                                      '-----------------------'
-*/
-  [_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
-    KC_MAKE,  ____________________BLANK___________________,  KC_RST,    KC_EPRM, ____________________BLANK___________________, XXXXXXX,
-    _______,  ____________________BLANK___________________, _______,    _______, ____________________BLANK___________________, XXXXXXX,
-    _______,KC__MUTE,KC__VOLDOWN,KC__VOLUP,MC_LOCK,_______,                      ____________________BLANK___________________, KC_MQWR,
-    _______,  ____________________BLANK___________________, _______,    _______, _______, _______, _______, _______,  KC_WWRK, KC_MWRK,
-      ____________________BLANK___________________,                                     ____________________BLANK___________________,
-                                                  _______, _______,      _______, _______,
-                                                           _______,      _______,
-                                         _______, _______, _______,      _______, _______, _______
-  ),
-  [_DIABLO] = LAYOUT_ergodox_pretty_wrapper(
-             KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,   KC_NO,                   KC_NO,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_NO,   KC_NO,
-             KC_TAB,  KC_S,    KC_F,    KC_I,    KC_M,    KC_T,    KC_ENTER,                KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-             KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_P,                                      KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-             KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,    KC_LOCK,                 KC_NO,   KC_N,    KC_M,     KC_NO,   KC_NO,   KC_NO,   KC_NO,
-             _______, KC_NO,   KC_NO,   KC_NO,   KC_NO,                                                         KC_NO,    KC_NO,   KC_NO,   KC_TRNS, KC_NO,
-                                                             KC_L,    KC_J,                 KC_NO,   KC_NO,
-                                                                      KC_F,                 KC_NO,
-                                     SFT_T(KC_SPACE),  ALT_T(KC_Q),   KC_DCLR,              KC_PGDN, KC_DEL,  KC_ENT
-  )
+
+    [_WORKMAN] = LAYOUT_ergodox_bocaj(
+        KC_ESC, ________________NUMBER_LEFT________________, KC_ARRW,     KC_MINS, ________________NUMBER_RIGHT_______________, KC_EQUAL,
+        KC_DEL, _________________WORKMAN_L1________________, KC_LPRN,     KC_RPRN, _________________WORKMAN_R1________________, KC_BSLS,
+       _______, _________________WORKMAN_L2________________,                       _________________WORKMAN_R2________________, KC_QUOT,
+       KC_LSFT, _________________WORKMAN_L3________________, KC_LBRC,     KC_RBRC, _________________WORKMAN_R3________________, _______,
+        MO_MOD, KC_PGUP, KC_HOME, KC_UP, KC_LEFT,                                          KC_RIGHT, KC_DOWN, KC_END, KC_PGDN, WORKMAN,
+                                              KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                     KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                  KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_WWORKMAN] = LAYOUT_ergodox_bocaj_WIN(
+        KC_ESC, ________________NUMBER_LEFT________________, KC_ARRW,     KC_MINS, ________________NUMBER_RIGHT_______________, KC_EQUAL,
+        KC_DEL, _________________WORKMAN_L1________________, KC_LPRN,     KC_RPRN, _________________WORKMAN_R1________________, KC_BSLS,
+       _______, _________________WORKMAN_L2________________,                       _________________WORKMAN_R2________________, KC_QUOT,
+       KC_LSFT, _________________WORKMAN_L3________________, KC_LBRC,     KC_RBRC, _________________WORKMAN_R3________________, _______,
+        MO_MOD, KC_PGUP, KC_HOME, KC_UP, KC_LEFT,                                          KC_RIGHT, KC_DOWN, KC_END, KC_PGDN, WORKMAN,
+                                              KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                     KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                  KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_LOWER] = LAYOUT_ergodox_bocaj(
+        KC_GRV, _______, _______, _______, _______,  _______, _______,     _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, KC_UP,   _______,  _______, _______,     _______, _______, KC_7,    KC_8,    KC_9,    KC_BSLS, _______,
+       _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______,                       _______, KC_4,    KC_5,    KC_6,    KC_ASTR, _______,
+       _______, _______, _______, _______, _______,  _______, _______,     _______, _______, KC_1,    KC_2,    KC_3,    KC_PLUS, _______,
+       _______, _______, _______, _______,  _______,                                         KC_0,    KC_DOT,  KC_COMM, KC_MINS, _______,
+                                               KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                      KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                   KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_RAISE] = LAYOUT_ergodox_bocaj(
+        KC_TILD, _________________RAISE_L1__________________, _______,         _______, _________________RAISE_R1__________________, _______,
+         KC_F11, _________________RAISE_L2__________________, _______,         _______, _________________RAISE_R2__________________, KC_F12,
+        _______, _________________RAISE_L3__________________,                           _________________RAISE_R3__________________, _______,
+        _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, _______, _______,         _______, ___________________BLANK___________________, _______,
+        ___________________BLANK___________________,                                             ___________________BLANK___________________,
+                                                 KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                        KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                     KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_ADJUST] = LAYOUT_ergodox_pretty(
+        KC_MAKE, _______,  _______,     _______,   _______, _______, _______,       _______, _______, _______, _______, _______, _______, KC_RST,
+        VRSN,    _______,  _______,     _______,   _______, _______, _______,       _______, _______, _______, _______, _______, _______, EEP_RST,
+        _______, KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, KC_MNXT,                         _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______,     _______,   _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______,     _______,   _______,                                           _______, _______, _______, _______, _______,
+                                              KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                     KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                  KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    // Wrapping Mouse-Wheel Keys with `X_T()` style functions seems
+    // to break the mouse button. So we can't use the wrapper here.
+    [_MOD] = LAYOUT_ergodox_pretty(
+        _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_WH_D, _______, _______, _______,           _______, _______, _______, KC_MS_U, _______, _______, _______,
+        _______, _______, KC_WH_L, KC_WH_U, KC_WH_R, _______,                             _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_ACL0,                                               KC_ACL1, KC_ACL2, _______, _______, _______,
+                                                 _______,_______, /* <- LHS/RHS -> */ _______,_______,
+                                                         _______, /* <- LHS/RHS -> */ _______,
+                                         KC_BTN1,KC_BTN2,_______, /* <- LHS/RHS -> */ _______,KC_BTN3,KC_BTN4
+    )
+
 };
+// clang-format on
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
+    return true;
 }
 
 void matrix_init_keymap(void) {};
 
+// Runs whenever there is a layer state change.
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+
+    uint8_t layer = get_highest_layer(state);
+    switch (layer) {
+        case _LOWER:
+            ergodox_right_led_3_on();
+            break;
+        case _MOD:
+            ergodox_right_led_2_on();
+            break;
+        case _RAISE:
+            ergodox_right_led_1_on();
+            break;
+        case _ADJUST:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            break;
+        default:
+            break;
+    }
+
+    ergodox_right_led_1_set(25);
+    ergodox_right_led_2_set(25);
+    ergodox_right_led_3_set(25);
+
+    return state;
+};
+
 void matrix_scan_keymap(void) {
-  uint8_t modifiers = get_mods();
-  uint8_t led_usb_state = host_keyboard_leds();
-  uint8_t one_shot = get_oneshot_mods();
-  uint8_t layer = biton32(layer_state);
-
-  ergodox_board_led_off();
-  ergodox_right_led_1_off();
-  ergodox_right_led_2_off();
-  ergodox_right_led_3_off();
-
-  switch (layer) {
-    case _WORKMAN:
-    case _QWERTY:
-    case _WINWORKMAN:
-      if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
-        ergodox_right_led_1_on();
-        ergodox_right_led_1_set( 25 );
-      }
-      if (modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK || modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK) {
+    uint8_t modifiers = get_mods();
+    uint8_t led_usb_state = host_keyboard_leds();
+    uint8_t one_shot = get_oneshot_mods();
+    uint8_t layer_is_workman = layer_state_is(_WORKMAN);
+
+    if ((modifiers) && (layer_is_workman)) {
+        if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
+            ergodox_right_led_1_on();
+            ergodox_right_led_1_set( 25 );
+        } else {
+            ergodox_right_led_1_off();
+        }
         if ((modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) && (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK)) {
-          ergodox_right_led_2_on();
-          ergodox_right_led_2_set( 50 );
+            ergodox_right_led_2_on();
+            ergodox_right_led_2_set( 50 );
+        } else if ((modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) || (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK)) {
+            ergodox_right_led_2_on();
+            ergodox_right_led_2_set( 10 );
+        } else {
+            ergodox_right_led_2_off();
+        }
+        if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
+            ergodox_right_led_3_on();
+            ergodox_right_led_3_set( 10 );
         } else {
-          ergodox_right_led_2_on();
-          ergodox_right_led_2_set( 10 );
+            ergodox_right_led_3_off();
         }
-      }
-      if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
-        ergodox_right_led_3_on();
-        ergodox_right_led_3_set( 10 );
-      }
-      break;
-    case _LOWER:
-      ergodox_right_led_3_on();
-      ergodox_right_led_3_set(10); // Default brightness is deadly in a dark room
-      break;
-    case _ADJUST:
-      ergodox_right_led_2_on();
-      ergodox_right_led_2_set(10);
-      break;
-    case _DIABLO:
-      ergodox_right_led_1_on();
-      ergodox_right_led_1_set(10);
-      break;
-    default:
-      // none
-      break;
-  }
+    } else if (!(modifiers) && (layer_is_workman)) {
+        ergodox_right_led_1_off();
+        ergodox_right_led_2_off();
+        ergodox_right_led_3_off();
+    }
 };
diff --git a/layouts/community/ergodox/bocaj/readme.md b/layouts/community/ergodox/bocaj/readme.md
index 901822722e..f8bce4e577 100644
--- a/layouts/community/ergodox/bocaj/readme.md
+++ b/layouts/community/ergodox/bocaj/readme.md
@@ -1,37 +1,28 @@
-# Bocaj Layout
+# Overview
 
-While I've put my own spin on most things, much of the credit for these ideas belongs to Drashna and/or the people he derived things from. Please see his [layout](../drashna/) and [userspace](../../../../users/drashna/) for lots of ideas and inspiration.
+This is my personal Ergodox EZ configuration, and my daily driver.
 
-## Layers Overview
+Most of the code resides in my userspace and is heavily based upon [Drashna's work](https://github.com/qmk/qmk_firmware/tree/master/users/drashna)... although considerably slimmed down.
 
-* Default
-  * Workman
-  * Qwerty
-  * Windows Workman (swaps GUI and CTRL buttons)
-* Lower
-  * F1-12 Top Row
-  * Grave / Layer Switch macro at Caps Lock position
-  * Navigation at QWERTY 'ESDF' position
-  * Numpad under right hand
-* Adjust
-  * Volume Control
-  * Mac Lock Macro
-  * Make / Reset/ EEPROM keys
-  * Default Layer changing keys
-  * Diablo Layer
-    * Moved shortcuts within left hands reach
-    * Macros to spam 1-4 every ~1 second
-    * Shift in thumb cluster to prevent pinky fatique
+## How to build
 
-## LEDs Overview
+Put simply:
+`make ergodox_ez:bocaj`
 
-* Used for _LOWER, _ADJUST, and _DIABLO layer indication
-* Used for Ctrl/GUI, Shift, and Alt indication when on a default layer
+On that note, I use a separate workspace when making changes to my layouts or userspace. In that repo, there is a tool that does this for me. See [JacobJerrell/qmk_layouts/tools/](https://github.com/JacobJerrell/qmk_layouts/tree/master/tools)
 
-## Wrappers Overview
+## Layers
 
-While it isn't a novel idea, I feel the need to mention it because it really appeals to me as a person that doesn't like repetitive code.
+* WORKMAN: No one uses this board but me and I've never had a reason to switch to QWERTY
+* LOWER:
+  * Left: Grave and navigation arrows
+  * Right: Numpad
+* RAISE:
+  * Symbols across the top, F-Keys on the second row
+* ADJUST
+  * Audio control, make/reset/version macros
+* MOD: mouse navigation
 
-We've all come to know and love the pretty wrapper for Ergodox because it makes for such a beautiful, self-documenting keymap. In this keymap, we are building ontop of the pretty wrapper to wrap our default layers with our keys that aren't unique to the layer.
+## Ergodox Specifics
 
-Now you can wrap your keymap with `LAYOUT_ergodox_pretty_base_wrapper()` and only feed it the alpha keys, having the top, side, bottom, and thumb clusters automatically filled in. If you make a key to any of the top, side, bottom, or thumb cluster keys, it will propegate to all layers that have this wrapper, or have KC_TRNS keycodes in the same location
+I don't have the underglow or backlit versions so the 3 LEDs on the right board are used for layer indication if not on the base layer. If you're on the base layer, they're used for mod-key indicators.
diff --git a/layouts/community/ergodox/bocaj/rules.mk b/layouts/community/ergodox/bocaj/rules.mk
index aa67ad9e21..88eaf39f8e 100644
--- a/layouts/community/ergodox/bocaj/rules.mk
+++ b/layouts/community/ergodox/bocaj/rules.mk
@@ -1,11 +1,14 @@
-AUTO_SHIFT_ENABLE = no
-COMMAND_ENABLE = no
-SWAP_HANDS_ENABLE = no
-TAP_DANCE_ENABLE = yes
-EXTRAKEY_ENABLE = no
-KEY_LOCK_ENABLE = yes
-LEADER_ENABLE = yes
+BOOTMAGIC_ENABLE   = yes
+TAP_DANCE_ENABLE   = no
+COMMAND_ENABLE     = no  # Commands for debug and configuration
+CONSOLE_ENABLE 	   = yes
+SPACE_CADET_ENABLE = no
+KEY_LOCK_ENABLE    = yes
+MOUSEKEY_ENABLE    = yes
+EXTRAKEY_ENABLE	   = yes
+LEADER_ENABLE	   = yes
 
-UNICODE_ENABLE    = yes
-UNICODEMAP_ENABLE = no
-UCIS_ENABLE = no
+UNICODE_ENABLE     = no
+UNICODEMAP_ENABLE  = no
+RGB_MATRIX_ENABLE  = no
+RGBLIGHT_ENABLE    = no
-- 
cgit v1.2.3