summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/ergodox_ez/keymaps/bocaj/config.h21
-rw-r--r--keyboards/ergodox_ez/keymaps/bocaj/keymap.c340
-rw-r--r--keyboards/ergodox_ez/keymaps/bocaj/readme.md48
-rw-r--r--layouts/community/ergodox/bocaj/config.h6
-rw-r--r--layouts/community/ergodox/bocaj/keymap.c246
-rw-r--r--layouts/community/ergodox/bocaj/rules.mk (renamed from keyboards/ergodox_ez/keymaps/bocaj/rules.mk)1
-rw-r--r--users/bocaj/bocaj.c177
-rw-r--r--users/bocaj/bocaj.h (renamed from keyboards/ergodox_ez/keymaps/bocaj/bocaj.h)119
-rw-r--r--users/bocaj/config.h33
-rw-r--r--users/bocaj/readme.md14
-rw-r--r--users/bocaj/rules.mk5
-rw-r--r--users/bocaj/tap_dances.c65
-rw-r--r--users/bocaj/tap_dances.h7
13 files changed, 611 insertions, 471 deletions
diff --git a/keyboards/ergodox_ez/keymaps/bocaj/config.h b/keyboards/ergodox_ez/keymaps/bocaj/config.h
deleted file mode 100644
index 59605bc256..0000000000
--- a/keyboards/ergodox_ez/keymaps/bocaj/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef USERSPACE_CONFIG_H
- #define USERSPACE_CONFIG_H
-
- #ifndef QMK_KEYS_PER_SCAN
- #define QMK_KEYS_PER_SCAN 4
- #endif // QMK KEYS PER SCAN
-
- // this makes it possible to do rolling combos (zx) with keys that
- // convert to other keys on hold (z becomes ctrl when you hold it,
- // and when this option isn't enabled, z rapidly followed by x
- // actually sends Ctrl-x. That's bad.)
- #define IGNORE_MOD_TAP_INTERRUPT
- #define PERMISSIVE_HOLD
- #undef PREVENT_STUCK_MODIFIERS
-
- // Disable action_get_macro and fn_actions, since we don't use these
- // and it saves on space in the firmware.
- #define NO_ACTION_MACRO
- #define NO_ACTION_FUNCTION
-
-#endif // !USERSPACE_CONFIG_H
diff --git a/keyboards/ergodox_ez/keymaps/bocaj/keymap.c b/keyboards/ergodox_ez/keymaps/bocaj/keymap.c
deleted file mode 100644
index 07117f1164..0000000000
--- a/keyboards/ergodox_ez/keymaps/bocaj/keymap.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-#include "bocaj.h"
-
-#ifdef UNICODEMAP_ENABLE
-#include "bocaj_unicode.h"
-#endif // UNICODEMAP_ENABLE
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Software Workman / 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-----+-----+-----+-------!
- | ADJST | 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 | VRS | UP | LFT | .---------------. .---------------. ! RGT | DWN | RSE | LWR | ADJ |
- '------------------------------' | APP | HOME | ! PGUP | ESC | '------------------------------'
- .-------+-------+-------! !-------+-------+-------.
- ! SPACE ! | END | ! PGDN | ! ENTER !
- ! / ! BSPCE !-------! !-------! TAB ! / !
- | LOWER | | COPY | ! PASTE | | RAISE |
- '-----------------------' '-----------------------'
-*/
- [_SWRKMN] = LAYOUT_ergodox_pretty_wrapper(
- KC_ESC, ______________________NUMBER_LEFT________________________, JJ_ARRW, KC_MINUS, ______________________NUMBER_RIGHT_______________________, KC_EQUAL,
- KC_DEL, _______________________SWORKMAN_L1_______________________, KC_LPRN, KC_RPRN, _______________________SWORKMAN_R1_______________________, KC_BSLS,
- KC_ADJS,_______________________SWORKMAN_L2_______________________, _______________________SWORKMAN_R2_______________________, KC_QUOTE,
- KC_LSFT,_______________________SWORKMAN_L3_______________________, HYP_LBK, MEH_RBK, _______________________SWORKMAN_R3_______________________, KC_RSFT,
- ___________________ERGODOX_BOTTOM_LEFT___________________, ___________________ERGODOX_BOTTOM_RIGHT__________________,
- ______________________ERGODOX_THUMBS_____________________
- ),
-/* Hardware 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-----+-----+-----+-------!
- | ADJST | 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 |
- '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
- | GAME | NUM | VRS | UP | LFT | .---------------. .---------------. ! RGT | DWN | RSE | LWR | ADJ |
- '------------------------------' | APP | HOME | ! PGUP | ESC | '------------------------------'
- .-------+-------+-------! !-------+-------+-------.
- ! SPACE ! | END | ! PGDN | ! ENTER !
- ! / ! BSPCE !-------! !-------! TAB ! / !
- | LOWER | | COPY | ! PASTE | | RAISE |
- '-----------------------' '-----------------------'
-*/
- [_HWRKMN] = LAYOUT_ergodox_pretty_wrapper(
- KC_ESC, ______________________NUMBER_LEFT________________________, JJ_ARRW, KC_MINUS, ______________________NUMBER_RIGHT_______________________, KC_EQUAL,
- KC_DEL, _______________________HWORKMAN_L1_______________________, KC_LPRN, KC_RPRN, _______________________HWORKMAN_R1_______________________, KC_BSLS,
- KC_ADJS,_______________________HWORKMAN_L2_______________________, _______________________HWORKMAN_R2_______________________, KC_QUOTE,
- KC_LSFT,_______________________HWORKMAN_L3_______________________, HYP_LBK, MEH_RBK, _______________________HWORKMAN_R3_______________________, KC_RSFT,
- ___________________ERGODOX_BOTTOM_LEFT___________________, ___________________ERGODOX_BOTTOM_RIGHT__________________,
- ______________________ERGODOX_THUMBS_____________________
- ),
-/* Lower - http://www.keyboard-layout-editor.com/#/gists/f1d745a88d1c48ab55e095efd9e7a43a
- .---------------------------------------------. .---------------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 | | ! | F6 | F7 | F8 | F9 | F10 | |
- !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
- | ` | 1 | 2 | 3 | 4 | 5 | | ! | 6 | 7 | 8 | 9 | 0 | |
- !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
- | | | | | | |-------! !-------! | | | | | |
- !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
- | | | | | | | | ! | | | | | | |
- '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
- | | | | | | .---------------. .---------------. ! | | | | |
- '------------------------------' | | | ! | | '------------------------------'
- .-------+-------+-------! !-------+-------+-------.
- ! ! | | ! | ! !
- ! ! !-------! !-------! ! !
- | | | | ! | | |
- '-----------------------' '-----------------------'
-*/
- [_LOWER] = LAYOUT_ergodox_pretty_wrapper(
- _______,_______________________FUNC_LEFT_________________________, _______, _______, _______________________FUNC_RIGHT________________________, _______,
- KC_GRV ,______________________NUMBER_LEFT________________________, _______, _______, ______________________NUMBER_RIGHT_______________________, _______,
- _______,_________________________________________________________, _________________________________________________________, _______,
- _______,_________________________________________________________, _______, _______, _________________________________________________________, _______,
- _________________________________________________________, _________________________________________________________,
- ______________________ERGODOX_THUMBS_____________________
- ),
-/* Raise - http://www.keyboard-layout-editor.com/#/gists/e0f591ec2ce9f24675a02d15c7048b25
- .---------------------------------------------. .---------------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 | | ! _ | F6 | F7 | F8 | F9 | F10 | |
- !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
- | ~ | ! | @ | # | $ | % | | ! | ^ | & | * | ( | ) | |
- !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
- | | | | | | |-------! !-------! | | | | | |
- !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
- | | | | | | | | ! | | | | | | |
- '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
- | | | | | | .---------------. .---------------. ! | | | | |
- '------------------------------' | | | ! | | '------------------------------'
- .-------+-------+-------! !-------+-------+-------.
- ! ! | | ! | ! !
- ! ! !-------! !-------! ! !
- | | | | ! | | |
- '-----------------------' '-----------------------'
-*/
- [_RAISE] = LAYOUT_ergodox_pretty_wrapper(
- _______,_______________________FUNC_LEFT_________________________, _______, KC_UNDS, _______________________FUNC_RIGHT________________________, _______,
- KC_TILD,______________________SPECIAL_LEFT_______________________, _______, _______, ______________________SPECIAL_RIGHT______________________, _______,
- _______,_________________________________________________________, _________________________________________________________, _______,
- _______,_________________________________________________________, _______, _______, _________________________________________________________, _______,
- _________________________________________________________, _________________________________________________________,
- ______________________ERGODOX_THUMBS_____________________
- ),
- /* Adjust - http://www.keyboard-layout-editor.com/#/gists/dedeae17b35a5d5f745a42aaea78f007
- .---------------------------------------------. .---------------------------------------------.
- | | | | | | | EPRM | ! EPRM | | | | | | |
- !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
- | | | | | | | | ! | | 7 | 8 | 9 | * | |
- !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
- | | 🔇 | 🔉 | 🔊 | LCK | |-------! !-------! | 4 | 5 | 6 | + | SWRKM |
- !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
- | | | | | | | | ! | | 1 | 2 | 3 | - | HWRKM |
- '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
- | | | | | | .---------------. .---------------. ! 0 | . | , | = | |
- '------------------------------' | | | ! | | '------------------------------'
- .-------+-------+-------! !-------+-------+-------.
- ! ! | | ! | ! !
- ! ! !-------! !-------! ! !
- | | | | ! | | |
- '-----------------------' '-----------------------'
-*/
- [_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
- XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, KC_EPRM, KC_EPRM, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX,
- XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PAST, XXXXXXX,
- _______,KC__MUTE, KC__VOLDOWN, KC__VOLUP, MC_LOCK, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_SWRK,
- XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS, KC_HWRK,
- XXXXXXX,_______,XXXXXXX,XXXXXXX,XXXXXXX, KC_KP_0, KC_PDOT, KC_COMM, KC_PEQL, _______,
- ______________________ERGODOX_THUMBS_____________________
- ),
-// Diablo - http://www.keyboard-layout-editor.com/#/gists/28476e4237e77d4835ac8a9d7e5f9b2c
- [_DIABLO] = LAYOUT_ergodox_pretty_wrapper(
- KC_ESC , KC_V , KC_D ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- KC_TAB , KC_S , KC_I , KC_F , KC_T , KC_J ,XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, XXXXXXX, XXXXXXX,
- KC_Q , KC_1 , KC_2 , KC_3 , KC_4 , KC_M , XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, XXXXXXX, XXXXXXX,
- KC_LSFT,KC_D3_1 ,KC_D3_2 ,KC_D3_3 ,KC_D3_4 ,XXXXXXX ,XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, XXXXXXX, XXXXXXX,
- _______,ALT_T(KC_Z) ,KC_G ,KC_Y ,XXXXXXX , KC_KP_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,
- XXXXXXX, XXXXXXX,
- KC_BTN1,KC_BTN2,KC_DIABLO_CLEAR, XXXXXXX,XXXXXXX,XXXXXXX
- )
-};
-
-// Defines actions for my custom keycodes
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- // KC_COPY and KC_PASTE have problems with different hardware/software mappings
- // e.g. If the mappings conflict, KC_COPY will send Cmd+M which minimizes the
- // window and is very annoying. JJ_COPY and JJ_PASTE fix this by sending the
- // raw character rather than the KC_* code
- case JJ_COPY:
- if (!record->event.pressed) {
- SEND_STRING(SS_LGUI("c"));
- }
- return false;
- break;
- case JJ_PASTE:
- if (!record->event.pressed) {
- SEND_STRING(SS_LGUI("v"));
- }
- return false;
- break;
- case JJ_ARRW:
- if (!record->event.pressed) {
- SEND_STRING("->");
- }
- return false;
- break;
- case KC_SWRK:
- if (!record->event.pressed) {
- set_single_persistent_default_layer(_SWRKMN);
- layer_move(_SWRKMN);
- ergodox_blink_all_leds();
- ergodox_blink_all_leds();
- }
- return false;
- break;
- case KC_HWRK:
- if (!record->event.pressed) {
- set_single_persistent_default_layer(_HWRKMN);
- layer_move(_HWRKMN);
- ergodox_blink_all_leds();
- ergodox_blink_all_leds();
- }
- return false;
- break;
- case KC_EPRM:
- if (!record->event.pressed) {
- ergodox_blink_all_leds();
- eeconfig_init();
- }
- return false;
- break;
- case MC_LOCK:
- if (!record->event.pressed) {
- layer_move(_HWRKMN);
- SEND_STRING(SS_LCTRL(SS_LGUI("q")));
- }
- return false;
- break;
- case KC_DIABLO_CLEAR:
-#ifdef TAP_DANCE_ENABLE
- if (record->event.pressed) {
- uint8_t dtime;
- for (dtime = 0; dtime < 4; dtime++) {
- diablo_key_time[dtime] = diablo_times[0];
- }
- }
-#endif // TAP_DANCE_ENABLE
- return false;
- break;
- }
- return true;
-}
-
-void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
-
-// Diablo III Fun stuff
-//define diablo macro timer variables
-uint16_t diablo_timer[4];
-uint8_t diablo_times[] = { 0, 1, 3, 5, 10, 30 };
-uint8_t diablo_key_time[4];
-
-// has the correct number of seconds elapsed (as defined by diablo_times)
-bool check_dtimer(uint8_t dtimer) { return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true; };
-
-// Cycle through the times for the macro, starting at 0, for disabled.
-// Max of six values, so don't exceed
-void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
- if (state->count >= 7) {
- diablo_key_time[diablo_key] = diablo_times[0];
- reset_tap_dance(state);
- } else {
- diablo_key_time[diablo_key] = diablo_times[state->count - 1];
- }
-}
-
-// Would rather have one function for all of this, but no idea how to do that...
-void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 0); }
-void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 1); }
-void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 2); }
-void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 3); }
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
- // tap once to disable, and more to enable timed micros
- [TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
- [TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
- [TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
- [TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
-};
-
-// Sends the key press to system, but only if on the Diablo layer
-void send_diablo_keystroke(uint8_t diablo_key) {
- if (biton32(layer_state) == _DIABLO) {
- switch (diablo_key) {
- case 0:
- tap(KC_1); break;
- case 1:
- tap(KC_2); break;
- case 2:
- tap(KC_3); break;
- case 3:
- tap(KC_4); break;
- }
- }
-}
-
-// Checks each of the 4 timers/keys to see if enough time has elapsed
-// Runs the "send string" command if enough time has passed, and resets the timer.
-void run_diablo_macro_check(void) {
- uint8_t dtime;
- for (dtime = 0; dtime < 4; dtime++) {
- if (check_dtimer(dtime) && diablo_key_time[dtime]) {
- diablo_timer[dtime] = timer_read();
- send_diablo_keystroke(dtime);
- }
- }
-}
-
-void matrix_scan_user(void) {
- 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) {
- /*
- Lights are treated as binary here for easy identification.
- LED1 = 4; LED2 = 2; LED1 = 1
- This allows for up to 8 identified layers (default layers being no lights on)
- Which is way more than I should ever need
- */
- case _LOWER:
- ergodox_right_led_3_on();
- ergodox_right_led_3_set(10); // Default brightness is deadly in a dark room
- break;
- case _RAISE:
- ergodox_right_led_2_on();
- ergodox_right_led_2_set(10);
- break;
- case _ADJUST:
- ergodox_right_led_2_on();
- ergodox_right_led_2_set(10);
- ergodox_right_led_3_on();
- ergodox_right_led_3_set(10);
- break;
- case _DIABLO:
- ergodox_right_led_1_on();
- ergodox_right_led_1_set(10);
- break;
- default:
- // none
- break;
- }
- #ifdef TAP_DANCE_ENABLE
- run_diablo_macro_check();
- #endif
-};
diff --git a/keyboards/ergodox_ez/keymaps/bocaj/readme.md b/keyboards/ergodox_ez/keymaps/bocaj/readme.md
deleted file mode 100644
index 9d5aa60501..0000000000
--- a/keyboards/ergodox_ez/keymaps/bocaj/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Ergodox EZ Layout by JacobJerrell
-
-My personal Ergodox EZ layout.
-
-## Summary
-
-Contains two base layers because I carry my keyboard between different machines and occassionally use the machines without this keyboard. A side-effect to using it in this manner (with a non-QWERTY layout) is that software/hardware mappings conflict so this allows a quick (2-buttons) to get the keyboard to a compatible layer
-
-## Layers
-
-| Layer | Purpose |
-| ----- | ------- |
-| 0 | [Hardware Workman](#hardware-workman) - For OS mapped to QWERTY |
-| 1 | [Software Workman](#software-workman) - For OS mapped to Workman |
-| 2 | [Lower](#lower) |
-| 3 | [Raise](#raise) |
-| 4 | [Adjust](#adjust) |
-| 5 | [Diablo III](#diablo-iii) |
-
-### Hardware Workman
-
-For easy plug and play into QWERTY machines
-![Hardware Workman](https://imgur.com/HHMIOEf.png)
-
-### Software Workman
-
-To switch to when I was previously using the laptop keyboard with software mapped to Workman. Or so other people can take the Ergodox for a spin.
-![Software Workman](https://imgur.com/WnSci7o.png)
-
-### Lower
-
-Reveals F1-12 keys and brings numkeys down.
-![Lowered](https://imgur.com/mGfjwcn.png)
-
-### Raise
-
-Reveals F1-F12 keys and gives shifted numkeys.
-![Raised](https://imgur.com/NC96Jus.png)
-
-### Adjust
-
-Numpad, Wipe EEPROM, OSX Volume Control, OSX Lockscreen, and Default Layer Switching.
-![Adjusted](https://imgur.com/aQtOxZU.png)
-
-### Diablo III
-
-Arranged to make playing on a laptop much more enjoyable. Credit for the D1-4 macros (as well as much of the ideas in this layout goes to Drashna)
-![Diablo III](https://imgur.com/5eQcDOQ.png)
diff --git a/layouts/community/ergodox/bocaj/config.h b/layouts/community/ergodox/bocaj/config.h
new file mode 100644
index 0000000000..78350f6033
--- /dev/null
+++ b/layouts/community/ergodox/bocaj/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#undef PRODUCT
+#define PRODUCT BocajEZ - Frankensteined ErgoDox EZ
diff --git a/layouts/community/ergodox/bocaj/keymap.c b/layouts/community/ergodox/bocaj/keymap.c
new file mode 100644
index 0000000000..fbe0fca653
--- /dev/null
+++ b/layouts/community/ergodox/bocaj/keymap.c
@@ -0,0 +1,246 @@
+/*
+Copyright 2018 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
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+#include "bocaj.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Hardware 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 |
+ '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ | GAME | NUM | LWR | UP | LFT | .---------------. .---------------. ! RGT | DWN | | | ADJ |
+ '------------------------------' | APP | HOME | ! PGUP | ESC | '------------------------------'
+ .-------+-------+-------! !-------+-------+-------.
+ ! ! | END | ! PGDN | ! ENTER !
+ ! SPACE ! BSPCE !-------! !-------! TAB ! / !
+ | | | COPY | ! PASTE | | LOWER |
+ '-----------------------' '-----------------------'
+*/
+ [_HWRKMN] = LAYOUT_ergodox_pretty_wrapper(
+ KC_ESC, _______________________NUMBER_LEFT_______________________, JJ_ARRW, KC_MINUS,_______________________NUMBER_RIGHT______________________, KC_EQUAL,
+ KC_DEL, _______________________HWORKMAN_L1_______________________, KC_LPRN, KC_RPRN, _______________________HWORKMAN_R1_______________________, KC_BSLS,
+ KC_NUMS,_______________________HWORKMAN_L2_______________________, _______________________HWORKMAN_R2_______________________, KC_QUOTE,
+ KC_LSFT,_______________________HWORKMAN_L3_______________________, HYP_LBK, MEH_RBK, _______________________HWORKMAN_R3_______________________, KC_RSFT,
+ ___________________ERGODOX_BOTTOM_LEFT___________________, ___________________ERGODOX_BOTTOM_RIGHT__________________,
+ ______________________ERGODOX_THUMBS_____________________
+ ),
+/* Software Workman / 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 |
+ '-----------------------' '-----------------------'
+*/
+ [_SWRKMN] = LAYOUT_ergodox_pretty_wrapper(
+ KC_ESC, _______________________NUMBER_LEFT_______________________, JJ_ARRW, KC_MINUS,_______________________NUMBER_RIGHT______________________, KC_EQUAL,
+ KC_DEL, _______________________SWORKMAN_L1_______________________, KC_LPRN, KC_RPRN, _______________________SWORKMAN_R1_______________________, KC_BSLS,
+ KC_NUMS,_______________________SWORKMAN_L2_______________________, _______________________SWORKMAN_R2_______________________, KC_QUOTE,
+ KC_LSFT,_______________________SWORKMAN_L3_______________________, HYP_LBK, MEH_RBK, _______________________SWORKMAN_R3_______________________, KC_RSFT,
+ ___________________ERGODOX_BOTTOM_LEFT___________________, ___________________ERGODOX_BOTTOM_RIGHT__________________,
+ ______________________ERGODOX_THUMBS_____________________
+ ),
+/* Lower - http://www.keyboard-layout-editor.com/#/gists/f1d745a88d1c48ab55e095efd9e7a43a
+ .---------------------------------------------. .---------------------------------------------.
+ | ESC | | | | | | -> | ! - | | | | | | = |
+ !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
+ | DEL | ! | @ | # | $ | % | ( | ! ) | ^ | & | * | ( | ) | \ |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | ` | 1 | 2 | 3 | 4 | 5 |-------! !-------! 6 | 7 | 8 | 9 | 0 | ' |
+ !-------+-----+-----+-----x-----x-----! HYP ! ! MEH !-----x-----x-----+-----+-----+-------!
+ | SHIFT | | | | | | [ | ! ] | | | | | | SHIFT |
+ '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ | GAME | NUM | LWR | UP | LFT | .---------------. .---------------. ! RGT | DWN | | | ADJ |
+ '------------------------------' | APP | HOME | ! PGUP | ESC | '------------------------------'
+ .-------+-------+-------! !-------+-------+-------.
+ ! ! | END | ! PGDN | ! ENTER !
+ ! SPACE ! BSPCE !-------! !-------! TAB ! / !
+ | | | COPY | ! PASTE | | LOWER |
+ '-----------------------' '-----------------------'
+*/
+ [_LOWER] = LAYOUT_ergodox_pretty_wrapper(
+ _______,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, _______, _______, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, _______,
+ _______,_______________________SPECIAL_LEFT______________________, _______, _______, _______________________SPECIAL_RIGHT_____________________, _______,
+ KC_GRV ,_______________________NUMBER_LEFT_______________________, _______________________NUMBER_RIGHT______________________, _______,
+ _______,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, _______, _______, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, _______,
+ _________________________________________________________, _________________________________________________________,
+ ______________________ERGODOX_THUMBS_____________________
+ ),
+ /* Adjust - http://www.keyboard-layout-editor.com/#/gists/dedeae17b35a5d5f745a42aaea78f007
+ .---------------------------------------------. .---------------------------------------------.
+ | | | | | | | EPRM | ! EPRM | | | | | | |
+ !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
+ | | | | | | | | ! | | | | | | |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | | 🔇 | 🔉 | 🔊 | LCK | |-------! !-------! | | | | | SWRKM |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | | | | | | | | ! | | | | | | HWRKM |
+ '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ | | | | | | .---------------. .---------------. ! | | | | |
+ '------------------------------' | | | ! | | '------------------------------'
+ .-------+-------+-------! !-------+-------+-------.
+ ! ! | | ! | ! !
+ ! ! !-------! !-------! ! !
+ | | | | ! | | |
+ '-----------------------' '-----------------------'
+*/
+ [_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
+ XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, KC_EPRM, KC_EPRM, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX,
+ XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX,KC__MUTE, KC__VOLDOWN, KC__VOLUP, MC_LOCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SWRK,
+ XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HWRK,
+ XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+ ______________________ERGODOX_THUMBS_____________________
+ ),
+ [_NUMS] = LAYOUT_ergodox_pretty_wrapper(
+ XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX,
+ XXXXXXX,XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PAST, XXXXXXX,
+ _______,XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, XXXXXXX,
+ LM_SHFT,XXXXXXX, XXXXXXX, XXXXXXX, JJ_COPY, JJ_PSTE, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS, XXXXXXX,
+ XXXXXXX,_______,XXXXXXX,XXXXXXX,XXXXXXX, KC_KP_0, KC_PDOT, KC_COMM, KC_PEQL, XXXXXXX,
+ _______, _______, _______,_______,
+ _______, _______,
+ KC_LALT,KC_LGUI,_______, _______,_______,_______
+ ),
+ [_NMOD] = LAYOUT_ergodox_pretty_wrapper(
+ XXXXXXX,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX,
+ XXXXXXX,XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX,
+ XXXXXXX,XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX,
+ LM_SHFT,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX,
+ XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, _______, _______, _______, _______, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,
+ XXXXXXX, XXXXXXX,
+ KC_LALT,KC_LGUI,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX
+ ),
+// Diablo - http://www.keyboard-layout-editor.com/#/gists/28476e4237e77d4835ac8a9d7e5f9b2c
+ [_DIABLO] = LAYOUT_ergodox_pretty_wrapper(
+ KC_ESC , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ KC_TAB , KC_Q ,ALT_T(KC_S), KC_I , KC_F , KC_J ,KC_MINS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ KC_LOCK, KC_1 , KC_2 , KC_3 , KC_4 ,KC_DCLR , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ KC_LSFT, KC_D3_1 , KC_D3_2 , KC_D3_3 , KC_D3_4 , KC_T ,KC_MINS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX , XXXXXXX , XXXXXXX , KC_M , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,
+ XXXXXXX, XXXXXXX,
+ KC_BTN1,KC_BTN2,KC_ENTER, XXXXXXX,XXXXXXX,XXXXXXX
+ )
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+ uint8_t default_layer = 0;
+ default_layer = eeconfig_read_default_layer();
+ switch (keycode) {
+ case KC_SWRK:
+ if (!record->event.pressed) {
+ set_single_persistent_default_layer(_SWRKMN);
+ layer_move(default_layer);
+ ergodox_blink_all_leds();
+ ergodox_blink_all_leds();
+ }
+ return false;
+ break;
+ case KC_HWRK:
+ if (!record->event.pressed) {
+ set_single_persistent_default_layer(_HWRKMN);
+ layer_move(default_layer);
+ ergodox_blink_all_leds();
+ ergodox_blink_all_leds();
+ }
+ return false;
+ break;
+ case KC_EPRM:
+ if (!record->event.pressed) {
+ ergodox_blink_all_leds();
+ eeconfig_init();
+ }
+ return false;
+ break;
+ case MC_LOCK:
+ if (!record->event.pressed) {
+ layer_move(default_layer);
+ SEND_STRING(SS_LCTRL(SS_LGUI("q")));
+ }
+ return false;
+ break;
+ }
+ return true;
+}
+
+void matrix_init_keymap(void) {};
+
+void matrix_scan_keymap(void) {
+ 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) {
+ /*
+ Lights are treated as binary here for easy identification.
+ LED1 = 4; LED2 = 2; LED1 = 1
+ This allows for up to 8 identified layers (default layers being no lights on)
+ Which is way more than I should ever need
+ */
+ 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 _NUMS:
+ ergodox_right_led_2_on();
+ ergodox_right_led_2_set(10);
+ ergodox_right_led_3_on();
+ ergodox_right_led_3_set(10);
+ break;
+ case _NMOD:
+ ergodox_right_led_1_on();
+ ergodox_right_led_1_set(10);
+ ergodox_right_led_2_on();
+ ergodox_right_led_2_set(10);
+ ergodox_right_led_3_on();
+ ergodox_right_led_3_set(10);
+ break;
+ case _DIABLO:
+ ergodox_right_led_1_on();
+ ergodox_right_led_1_set(10);
+ break;
+ default:
+ // none
+ break;
+ }
+ /* #ifdef TAP_DANCE_ENABLE
+ run_diablo_macro_check();
+ #endif */
+};
diff --git a/keyboards/ergodox_ez/keymaps/bocaj/rules.mk b/layouts/community/ergodox/bocaj/rules.mk
index b667841a18..037bca2b67 100644
--- a/keyboards/ergodox_ez/keymaps/bocaj/rules.mk
+++ b/layouts/community/ergodox/bocaj/rules.mk
@@ -3,3 +3,4 @@ COMMAND_ENABLE = no
SWAP_HANDS_ENABLE = no
TAP_DANCE_ENABLE = yes
EXTRAKEY_ENABLE = no
+KEY_LOCK_ENABLE = yes
diff --git a/users/bocaj/bocaj.c b/users/bocaj/bocaj.c
new file mode 100644
index 0000000000..6df6e3bbfa
--- /dev/null
+++ b/users/bocaj/bocaj.c
@@ -0,0 +1,177 @@
+#include "bocaj.h"
+#include "eeprom.h"
+#include "version.h"
+#include "tap_dances.h"
+
+static uint16_t copy_paste_timer;
+userspace_config_t userspace_config;
+
+/* *** *** *** *** *
+ * Helper Functions *
+ * *** *** *** *** */
+void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
+
+// Add reconfigurable functions here, for keymap customization
+// This allows for a global, userspace functions, and continued
+// customization of the keymap. Use _keymap instead of _user
+// functions in the keymaps
+__attribute__ ((weak))
+void matrix_init_keymap(void) {}
+
+__attribute__ ((weak))
+void startup_keymap(void) {}
+
+__attribute__ ((weak))
+void suspend_power_down_keymap(void) {}
+
+__attribute__ ((weak))
+void suspend_wakeup_init_keymap(void) {}
+
+__attribute__ ((weak))
+void matrix_scan_keymap(void) {}
+
+__attribute__ ((weak))
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+ return true;
+}
+
+__attribute__ ((weak))
+bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
+ return true;
+}
+
+
+__attribute__ ((weak))
+uint32_t layer_state_set_keymap (uint32_t state) {
+ return state;
+}
+
+__attribute__ ((weak))
+uint32_t default_layer_state_set_keymap (uint32_t state) {
+ return state;
+}
+
+__attribute__ ((weak))
+void led_set_keymap(uint8_t usb_led) {}
+
+// Call user matrix init, set default RGB colors and then
+// call the keymap's init function
+void matrix_init_user(void) {
+ userspace_config.raw = eeprom_read_byte(EECONFIG_USERSPACE);
+ matrix_init_keymap();
+}
+
+void startup_user (void) {
+ startup_keymap();
+}
+
+void suspend_power_down_user(void)
+{
+ suspend_power_down_keymap();
+}
+
+void suspend_wakeup_init_user(void)
+{
+ suspend_wakeup_init_keymap();
+ #ifdef KEYBOARD_ergodox_ez
+ wait_ms(10);
+ #endif
+}
+
+// No global matrix scan code, so just run keymap's matrix
+// scan function
+void matrix_scan_user(void) {
+ static bool has_ran_yet;
+ if (!has_ran_yet) {
+ has_ran_yet = true;
+ startup_user();
+ }
+
+#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code.
+ run_diablo_macro_check();
+#endif // TAP_DANCE_ENABLE
+
+ matrix_scan_keymap();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ /* uint8_t default_layer = 0;
+ default_layer = eeconfig_read_default_layer(); */
+ switch (keycode) {
+ case JJ_COPY:
+ if (!record->event.pressed) {
+ SEND_STRING(SS_LGUI("c"));
+ }
+ return false;
+ break;
+ case JJ_PSTE:
+ if (!record->event.pressed) {
+ SEND_STRING(SS_LGUI("v"));
+ }
+ return false;
+ break;
+ case JJ_ARRW:
+ if (!record->event.pressed) {
+ SEND_STRING("->");
+ }
+ return false;
+ break; /*
+ case KC_SWRK:
+ if (!record->event.pressed) {
+ set_single_persistent_default_layer(_SWRKMN);
+ layer_move(default_layer);
+ //ergodox_blink_all_leds();
+ //ergodox_blink_all_leds();
+ }
+ return false;
+ break;
+ case KC_HWRK:
+ if (!record->event.pressed) {
+ set_single_persistent_default_layer(_HWRKMN);
+ layer_move(default_layer);
+ //ergodox_blink_all_leds();
+ //ergodox_blink_all_leds();
+ }
+ return false;
+ break;
+ case KC_EPRM:
+ if (!record->event.pressed) {
+ //ergodox_blink_all_leds();
+ eeconfig_init();
+ }
+ return false;
+ break;
+ case MC_LOCK:
+ if (!record->event.pressed) {
+ layer_move(default_layer);
+ SEND_STRING(SS_LCTRL(SS_LGUI("q")));
+ }
+ return false;
+ break; */
+ case KC_DCLR:
+#ifdef TAP_DANCE_ENABLE
+ if (record->event.pressed) {
+ uint8_t dtime;
+ for (dtime = 0; dtime < 4; dtime++) {
+ diablo_key_time[dtime] = diablo_times[0];
+ }
+ }
+#endif // !TAP_DANCE_ENABLE
+ return false;
+ break;
+ case KC_CCCV:
+ if (record->event.pressed) {
+ copy_paste_timer = timer_read();
+ } else {
+ if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy
+ SEND_STRING(SS_LGUI("c"));
+ } else {
+ SEND_STRING(SS_LGUI("v"));
+ }
+ }
+ return false;
+ break;
+ }
+ return process_record_keymap(keycode, record);
+}
+
diff --git a/keyboards/ergodox_ez/keymaps/bocaj/bocaj.h b/users/bocaj/bocaj.h
index 2c41c01aa8..7b537397f0 100644
--- a/keyboards/ergodox_ez/keymaps/bocaj/bocaj.h
+++ b/users/bocaj/bocaj.h
@@ -1,94 +1,89 @@
-/*
-Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+#ifndef USERSPACE
+#define USERSPACE
#include "quantum.h"
-// Layers
-enum layers {
- _SWRKMN = 0,
- _HWRKMN,
+/* *** *** *** *** *** *
+ * Define layer names *
+ * *** *** *** *** *** */
+enum userspace_layers {
+ _HWRKMN = 0,
+ _SWRKMN,
_LOWER,
- _RAISE,
_ADJUST,
+ _NUMS,
+ _NMOD,
_DIABLO
};
+#define EECONFIG_USERSPACE (uint8_t *)19
+typedef union {
+ uint8_t raw;
+} userspace_config_t;
-
-enum custom_keycodes {
- KC_EPRM = SAFE_RANGE,
+/* *** *** *** *** *** *** *
+ * Define Custom Keycodes *
+ * *** *** *** *** *** *** */
+enum userspace_custom_keycodes {
+ KC_EPRM = SAFE_RANGE, // can always be here
KC_SWRK,
KC_HWRK,
KC_VRSN,
JJ_COPY,
- JJ_PASTE,
+ JJ_PSTE,
JJ_ARRW,
+ KC_CCCV,
MC_LOCK,
- KC_DIABLO_CLEAR,
- KC_NMPD
-// UC_FLIP
+ KC_DCLR,
+ NEW_SAFE_RANGE //use "NEWPLACEHOLDER for keymap specific codes
};
// Space Cadet Hyper/Meh and [/]
#define HYP_LBK ALL_T(KC_LBRACKET)
#define MEH_RBK MEH_T(KC_RBRACKET)
-#define KC_LWSP LT(_LOWER, KC_SPACE)
-#define KC_RSEN LT(_RAISE, KC_ENTER)
+// Layout beauti-/simpli-fication
+#define KC_LWEN LT(_LOWER, KC_ENTER)
#define KC_ADJS TT(_ADJUST)
-
+#define KC_NUMS TT(_NUMS)
+#define LM_SHFT LM(_NMOD, MOD_LSFT)
#define XXXXXXX KC_NO
#define _______ KC_TRNS
+void tap(uint16_t keycode);
+
+/* *** *** *** *** *** *** *
+ * Diablo 3 Macro Handling *
+ * *** *** *** *** *** *** */
+
+// If Tap Dancing is enabled, we manage that here.
+// If it is not, then we define the KC_D3_# codes gracefully
#ifdef TAP_DANCE_ENABLE
enum {
TD_D3_1 = 0,
TD_D3_2,
TD_D3_3,
- TD_D3_4
+ TD_D3_4,
};
-#endif // TAP_DANCE_ENABLE
-// Custom Keycodes for Diablo 3 layer
-// But since TD() doesn't work when tap dance is disabled
-// We use custom codes here, so we can substitute the right stuff
-#ifdef TAP_DANCE_ENABLE
#define KC_D3_1 TD(TD_D3_1)
#define KC_D3_2 TD(TD_D3_2)
#define KC_D3_3 TD(TD_D3_3)
#define KC_D3_4 TD(TD_D3_4)
-#else // TAP_DANCE_ENABLE
+#else // !TAP_DANCE_ENABLE
#define KC_D3_1 KC_1
#define KC_D3_2 KC_2
#define KC_D3_3 KC_3
#define KC_D3_4 KC_4
#endif // TAP_DANCE_ENABLE
-//define diablo macro timer variables
-extern uint16_t diablo_timer[4];
-extern uint8_t diablo_times[];
-extern uint8_t diablo_key_time[4];
-
-
-void run_diablo_macro_check(void);
-
+// Wrapper for handling of keymap 'blocks'
+// not 100% sure what this first part does. Credit to Drashna
+#if (!defined(LAYOUT) && defined(KEYMAP))
+#define LAYOUT KEYMAP
+#endif
#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__)
-
/* Pretty Layout
.---------------------------------------------. .---------------------------------------------.
| 1 | 2 | 3 | 4 | 5 | 6 | 7 | ! 8 | 9 | 10 | 11 | 12 | 13 | 14 |
@@ -108,18 +103,6 @@ void run_diablo_macro_check(void);
'-----------------------' '-----------------------'
*/
-#define ______________________NUMBER_LEFT________________________ KC_1, KC_2, KC_3, KC_4, KC_5
-#define ______________________NUMBER_RIGHT_______________________ KC_6, KC_7, KC_8, KC_9, KC_0
-
-#define ______________________SPECIAL_LEFT_______________________ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC
-#define ______________________SPECIAL_RIGHT______________________ KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN
-
-#define _______________________FUNC_LEFT_________________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
-#define _______________________FUNC_RIGHT________________________ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
-
-#define _________________________________________________________ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-#define XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-
#define _______________________SWORKMAN_L1_______________________ KC_Q, KC_W, KC_E, KC_R, KC_T
#define _______________________SWORKMAN_L2_______________________ KC_A, SFT_T(KC_S), GUI_T(KC_D), ALT_T(KC_F), KC_G
#define _______________________SWORKMAN_L3_______________________ CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B
@@ -137,10 +120,22 @@ void run_diablo_macro_check(void);
#define _______________________HWORKMAN_R2_______________________ KC_Y, ALT_T(KC_N), GUI_T(KC_E), SFT_T(KC_O), KC_I
#define _______________________HWORKMAN_R3_______________________ KC_K, KC_L, KC_COMM, KC_DOT, CTL_T(KC_SLASH)
-#define ___________________ERGODOX_BOTTOM_LEFT___________________ TT(_DIABLO), TT(_ADJUST), XXXXXXX, KC_UP, KC_LEFT
-#define ___________________ERGODOX_BOTTOM_RIGHT__________________ KC_RIGHT, KC_DOWN, TT(_RAISE), TT(_LOWER), TT(_ADJUST)
+#define ___________________ERGODOX_BOTTOM_LEFT___________________ TT(_DIABLO), KC_NUMS, TT(_LOWER), KC_UP, KC_LEFT
+#define ___________________ERGODOX_BOTTOM_RIGHT__________________ KC_RIGHT, KC_DOWN, XXXXXXX, XXXXXXX, TT(_ADJUST)
+
+#define _______________________NUMBER_LEFT_______________________ KC_1, KC_2, KC_3, KC_4, KC_5
+#define _______________________NUMBER_RIGHT______________________ KC_6, KC_7, KC_8, KC_9, KC_0
+
+#define _______________________SPECIAL_LEFT______________________ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC
+#define _______________________SPECIAL_RIGHT_____________________ KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN
+
+#define _________________________________________________________ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+#define XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
// LEFT | RIGHT
#define ______________________ERGODOX_THUMBS_____________________ KC_APP,KC_HOME, KC_PGUP,KC_ESC, \
KC_END, KC_PGDOWN, \
- KC_LWSP,KC_BSPACE,JJ_COPY, JJ_PASTE,KC_TAB,KC_RSEN
+ KC_SPACE,KC_BSPACE,JJ_COPY, JJ_PSTE,KC_TAB,KC_LWEN
+
+
+#endif // !USERSPACE
diff --git a/users/bocaj/config.h b/users/bocaj/config.h
new file mode 100644
index 0000000000..ce5ec65d62
--- /dev/null
+++ b/users/bocaj/config.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#ifndef QMK_KEYS_PER_SCAN
+ #define QMK_KEYS_PER_SCAN 4
+#endif // QMK KEYS PER SCAN
+
+// this makes it possible to do rolling combos (zx) with keys that
+// convert to other keys on hold (z becomes ctrl when you hold it,
+// and when this option isn't enabled, z rapidly followed by x
+// actually sends Ctrl-x. That's bad.)
+#define IGNORE_MOD_TAP_INTERRUPT
+#undef PERMISSIVE_HOLD
+#define PREVENT_STUCK_MODIFIERS
+
+#ifdef TAPPING_TERM
+#undef TAPPING_TERM
+#endif // TAPPING_TERM
+#define TAPPING_TERM 175
+
+// Disable action_get_macro and fn_actions, since we don't use these
+// and it saves on space in the firmware.
+#ifndef NO_DEBUG
+#define NO_DEBUG
+#endif // !NO_DEBUG
+#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
+#define NO_PRINT
+#endif // !NO_PRINT
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define DISABLE_LEADER
+
+#define MACRO_TIMER 5
diff --git a/users/bocaj/readme.md b/users/bocaj/readme.md
new file mode 100644
index 0000000000..bab6d7337f
--- /dev/null
+++ b/users/bocaj/readme.md
@@ -0,0 +1,14 @@
+Copyright 2018 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
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/users/bocaj/rules.mk b/users/bocaj/rules.mk
new file mode 100644
index 0000000000..17d2772a7c
--- /dev/null
+++ b/users/bocaj/rules.mk
@@ -0,0 +1,5 @@
+SRC += bocaj.c
+
+ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
+ SRC += tap_dances.c
+endif
diff --git a/users/bocaj/tap_dances.c b/users/bocaj/tap_dances.c
new file mode 100644
index 0000000000..10767db453
--- /dev/null
+++ b/users/bocaj/tap_dances.c
@@ -0,0 +1,65 @@
+#include "bocaj.h"
+#include "tap_dances.h"
+
+
+//define diablo macro timer variables
+uint16_t diablo_timer[4];
+uint8_t diablo_times[] = { 0, 1, 3, 5, 10, 30 };
+uint8_t diablo_key_time[4];
+
+// has the correct number of seconds elapsed (as defined by diablo_times)
+bool check_dtimer(uint8_t dtimer) { return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true; };
+
+// Cycle through the times for the macro, starting at 0, for disabled.
+// Max of six values, so don't exceed
+void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
+ if (state->count >= 7) {
+ diablo_key_time[diablo_key] = diablo_times[0];
+ reset_tap_dance(state);
+ } else {
+ diablo_key_time[diablo_key] = diablo_times[state->count - 1];
+ }
+}
+
+// Would rather have one function for all of this, but no idea how to do that...
+void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 0); }
+void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 1); }
+void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 2); }
+void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 3); }
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+ // tap once to disable, and more to enable timed micros
+ [TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
+ [TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
+ [TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
+ [TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
+};
+
+// Sends the key press to system, but only if on the Diablo layer
+void send_diablo_keystroke(uint8_t diablo_key) {
+ if (biton32(layer_state) == _DIABLO) {
+ switch (diablo_key) {
+ case 0:
+ tap(KC_1); break;
+ case 1:
+ tap(KC_2); break;
+ case 2:
+ tap(KC_3); break;
+ case 3:
+ tap(KC_4); break;
+ }
+ }
+}
+
+// Checks each of the 4 timers/keys to see if enough time has elapsed
+// Runs the "send string" command if enough time has passed, and resets the timer.
+void run_diablo_macro_check(void) {
+ uint8_t dtime;
+ for (dtime = 0; dtime < 4; dtime++) {
+ if (check_dtimer(dtime) && diablo_key_time[dtime]) {
+ diablo_timer[dtime] = timer_read();
+ send_diablo_keystroke(dtime);
+ }
+ }
+}
diff --git a/users/bocaj/tap_dances.h b/users/bocaj/tap_dances.h
new file mode 100644
index 0000000000..8935753f6c
--- /dev/null
+++ b/users/bocaj/tap_dances.h
@@ -0,0 +1,7 @@
+//define diablo macro timer variables
+extern uint16_t diablo_timer[4];
+extern uint8_t diablo_times[];
+extern uint8_t diablo_key_time[4];
+
+
+void run_diablo_macro_check(void);