From 2a89134d8e939c86c5e9008f6ad77e15bb404c39 Mon Sep 17 00:00:00 2001
From: mechmerlin <mechmerlin@gmail.com>
Date: Fri, 10 Aug 2018 23:56:27 -0700
Subject: add some of my default layouts for the clueboard I got

---
 layouts/community/66_ansi/layout.json         |  5 ++++
 layouts/community/66_ansi/mechmerlin/keymap.c | 36 +++++++++++++++++++++++++++
 layouts/community/66_ansi/readme.md           |  3 +++
 3 files changed, 44 insertions(+)
 create mode 100644 layouts/community/66_ansi/layout.json
 create mode 100644 layouts/community/66_ansi/mechmerlin/keymap.c
 create mode 100644 layouts/community/66_ansi/readme.md

(limited to 'layouts')

diff --git a/layouts/community/66_ansi/layout.json b/layouts/community/66_ansi/layout.json
new file mode 100644
index 0000000000..60a3a47c00
--- /dev/null
+++ b/layouts/community/66_ansi/layout.json
@@ -0,0 +1,5 @@
+["~\n`","!\n1","@\n2","#\n3","$\n4","%\n5","^\n6","&\n7","*\n8","(\n9",")\n0","_\n-","+\n=",{w:2},"Backspace",{x:0.5},"Page Up"],
+[{w:1.5},"Tab","Q","W","E","R","T","Y","U","I","O","P","{\n[","}\n]",{w:1.5},"|\n\\",{x:0.5},"Page Down"],
+[{w:1.75},"Caps Lock","A","S","D","F","G","H","J","K","L",":\n;","\"\n'",{w:2.25},"Enter"],
+[{w:2.25},"Shift","Z","X","C","V","B","N","M","<\n,",">\n.","?\n/",{w:2.25},"Shift","Up"],
+[{w:1.25},"Ctrl",{w:1.25},"Win",{w:1.25},"Alt",{a:7,w:6.25},"",{a:4,w:1.25},"Alt","Fn",{w:1.25},"Ctrl","Left","Down","Right"]
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
new file mode 100644
index 0000000000..9baf238c73
--- /dev/null
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -0,0 +1,36 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+#define _BL 0
+#define _FL 1
+#define _CL 2
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT_66_ansi(
+  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,      KC_BSPC,           KC_PGUP, \
+  KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                KC_PGDN, \
+  KC_LCTL,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,      KC_ENT,                            \
+  KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,        KC_UP,           \
+  KC_LCTL,KC_LGUI,KC_LALT,                        KC_SPC,                                 MO(_FL),KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT_66_ansi(
+  KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,      KC_DEL,            KC_VOLU, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_MUTE,                KC_VOLD, \
+  KC_CAPS,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
+  _______,        _______,_______,_______,_______,_______,_______,KC_MUTE,KC_VOLU,KC_VOLD,_______,        _______,        KC_PGUP,         \
+  _______,_______,_______,                        _______,                                _______,_______,_______,KC_HOME,KC_PGDN,KC_END),
+
+  /* Keymap _CL: Control layer
+   */
+[_CL] = LAYOUT_66_ansi(
+  BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   _______,           RGB_VAI, \
+  RGB_TOG,_______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD, \
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
+  _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,         \
+  _______,_______,_______,                        RGB_MOD,                                _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
+};
diff --git a/layouts/community/66_ansi/readme.md b/layouts/community/66_ansi/readme.md
new file mode 100644
index 0000000000..7dee7387ab
--- /dev/null
+++ b/layouts/community/66_ansi/readme.md
@@ -0,0 +1,3 @@
+# 66_ansi
+
+    LAYOUT_66_ansi
-- 
cgit v1.2.3


From 7ad0f24efa3d15f25a18972b54311f651337e9f7 Mon Sep 17 00:00:00 2001
From: skullY <skullydazed@gmail.com>
Date: Sat, 11 Aug 2018 13:12:13 -0700
Subject: Move my keymap to the community folder

---
 layouts/community/66_ansi/skully/keymap.c  | 35 ++++++++++++++++++++++++++++++
 layouts/community/66_ansi/skully/readme.md |  3 +++
 2 files changed, 38 insertions(+)
 create mode 100644 layouts/community/66_ansi/skully/keymap.c
 create mode 100644 layouts/community/66_ansi/skully/readme.md

(limited to 'layouts')

diff --git a/layouts/community/66_ansi/skully/keymap.c b/layouts/community/66_ansi/skully/keymap.c
new file mode 100644
index 0000000000..0533886534
--- /dev/null
+++ b/layouts/community/66_ansi/skully/keymap.c
@@ -0,0 +1,35 @@
+#include QMK_KEYBOARD_H
+
+// Layer names
+#define _BL 0
+#define _FL 1
+#define _CL 2
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT_66_ansi(
+  KC_GESC,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,            KC_PGUP,
+  KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,        KC_PGDN,
+  KC_LCTL,      KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_ENT,
+  MO(_FL),           KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,         KC_UP,
+  KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,                                           KC_RGUI,  KC_RALT,KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT_66_ansi(
+  KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,             BL_STEP,
+  S(KC_TAB),  S(KC_Q),S(KC_W),S(KC_E),S(KC_R),S(KC_T),S(KC_Y),S(KC_U),S(KC_I),S(KC_O),S(KC_P),S(KC_LBRC),S(KC_RBRC),S(KC_BSLS),S(KC_PGDN),
+  S(KC_LCTL),   S(KC_A),MO(_CL),S(KC_D),S(KC_F),S(KC_G),S(KC_H),S(KC_J),S(KC_K),S(KC_L),S(KC_SCLN),S(KC_QUOT),S(KC_ENT),
+  MO(_FL),           S(KC_Z),S(KC_X),S(KC_C),S(KC_V),S(KC_B),S(KC_N),S(KC_M),S(KC_COMM),S(KC_DOT),S(KC_SLSH),KC_RSFT, KC_PGUP,
+  KC_LCTL,  KC_LALT,  KC_LGUI,  S(KC_SPC),                                        KC_RGUI,  KC_RALT,KC_RCTL,  KC_HOME,KC_PGDN,KC_END),
+
+  /* Keymap _CL: Control layer
+   */
+[_CL] = LAYOUT_66_ansi(
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,            RGB_VAI,
+  _______,    _______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_VAD,
+  _______,      _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+  MO(_FL),           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,         RGB_SAI,
+  _______,  _______,  _______,  RGB_MOD,                                          _______,  _______,_______,  RGB_HUD,RGB_SAD,RGB_HUI),
+};
diff --git a/layouts/community/66_ansi/skully/readme.md b/layouts/community/66_ansi/skully/readme.md
new file mode 100644
index 0000000000..63793b9ba0
--- /dev/null
+++ b/layouts/community/66_ansi/skully/readme.md
@@ -0,0 +1,3 @@
+# skullY's Clueboard Layout
+
+This layout is what I (@skullydazed) use on my personal Clueboards. I mostly use it for programming, CAD, and general typing.
-- 
cgit v1.2.3


From 1cdef7cd2f4c2b6ad90c80215bf42fb3e66f0cee Mon Sep 17 00:00:00 2001
From: skullydazed <skullydazed@users.noreply.github.com>
Date: Sat, 11 Aug 2018 14:28:01 -0700
Subject: Keymap: Add fauxclicky support to my keymap (#3625)

---
 layouts/community/66_ansi/skully/config.h  | 12 ++++++++++++
 layouts/community/66_ansi/skully/keymap.c  |  2 +-
 layouts/community/66_ansi/skully/readme.md |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 layouts/community/66_ansi/skully/config.h

(limited to 'layouts')

diff --git a/layouts/community/66_ansi/skully/config.h b/layouts/community/66_ansi/skully/config.h
new file mode 100644
index 0000000000..f51361866c
--- /dev/null
+++ b/layouts/community/66_ansi/skully/config.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#ifdef AUDIO_CLICKY
+    #define AUDIO_CLICKY_ON
+    #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f
+    #define AUDIO_CLICKY_FREQ_MIN 65.41f
+    #define AUDIO_CLICKY_FREQ_MAX 1046.5f
+    //#define AUDIO_CLICKY_FREQ_FACTOR 1.18921f
+    //#define AUDIO_CLICKY_FREQ_FACTOR 2.71828f  // e
+    #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio
+    #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f
+#endif
diff --git a/layouts/community/66_ansi/skully/keymap.c b/layouts/community/66_ansi/skully/keymap.c
index 0533886534..9337cfe02b 100644
--- a/layouts/community/66_ansi/skully/keymap.c
+++ b/layouts/community/66_ansi/skully/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 [_CL] = LAYOUT_66_ansi(
   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,            RGB_VAI,
-  _______,    _______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_VAD,
+  CK_TOGG,    _______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_VAD,
   _______,      _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
   MO(_FL),           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,         RGB_SAI,
   _______,  _______,  _______,  RGB_MOD,                                          _______,  _______,_______,  RGB_HUD,RGB_SAD,RGB_HUI),
diff --git a/layouts/community/66_ansi/skully/readme.md b/layouts/community/66_ansi/skully/readme.md
index 63793b9ba0..ad1a1e458d 100644
--- a/layouts/community/66_ansi/skully/readme.md
+++ b/layouts/community/66_ansi/skully/readme.md
@@ -1,3 +1,5 @@
 # skullY's Clueboard Layout
 
 This layout is what I (@skullydazed) use on my personal Clueboards. I mostly use it for programming, CAD, and general typing.
+
+On boards with audio I have faux-clicky enabled. I've tuned it to values I find pleasing, they kinda remind me of the "talking" in Mike Tyson's Punch Out.
-- 
cgit v1.2.3


From f0e0ca402c10fe2ade7129b28a0066bdf10d018d Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Sat, 11 Aug 2018 16:45:29 -0700
Subject: Keymap: copy skully's faux clicky mods (#3628)

---
 layouts/community/66_ansi/mechmerlin/config.h | 12 ++++++++++++
 layouts/community/66_ansi/mechmerlin/keymap.c |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 layouts/community/66_ansi/mechmerlin/config.h

(limited to 'layouts')

diff --git a/layouts/community/66_ansi/mechmerlin/config.h b/layouts/community/66_ansi/mechmerlin/config.h
new file mode 100644
index 0000000000..f51361866c
--- /dev/null
+++ b/layouts/community/66_ansi/mechmerlin/config.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#ifdef AUDIO_CLICKY
+    #define AUDIO_CLICKY_ON
+    #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f
+    #define AUDIO_CLICKY_FREQ_MIN 65.41f
+    #define AUDIO_CLICKY_FREQ_MAX 1046.5f
+    //#define AUDIO_CLICKY_FREQ_FACTOR 1.18921f
+    //#define AUDIO_CLICKY_FREQ_FACTOR 2.71828f  // e
+    #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio
+    #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f
+#endif
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 9baf238c73..b8142f9674 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CL] = LAYOUT_66_ansi(
   BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   _______,           RGB_VAI, \
   RGB_TOG,_______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD, \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
+  CK_TOGG,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,                             \
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,         \
   _______,_______,_______,                        RGB_MOD,                                _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
 };
-- 
cgit v1.2.3


From 05b7383703d9e7bb68f29765adf865ba78facf2d Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Mon, 13 Aug 2018 15:05:58 -0400
Subject: Keyboard: Refactor Levinson to use split common code (#3639)

* Migrate Levinson to use split_common code

* Update keymap
---
 layouts/community/ortho_4x12/bakingpy/config.h |  8 +--
 layouts/community/ortho_4x12/bakingpy/keymap.c | 76 +++++++++++++-------------
 layouts/community/ortho_4x12/bakingpy/rules.mk |  3 +-
 3 files changed, 41 insertions(+), 46 deletions(-)

(limited to 'layouts')

diff --git a/layouts/community/ortho_4x12/bakingpy/config.h b/layouts/community/ortho_4x12/bakingpy/config.h
index 77fa69ad78..a90f38001a 100644
--- a/layouts/community/ortho_4x12/bakingpy/config.h
+++ b/layouts/community/ortho_4x12/bakingpy/config.h
@@ -1,7 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include QMK_KEYBOARD_CONFIG_H
+#pragma once
 
 /* Use I2C or Serial, not both */
 
@@ -9,7 +6,6 @@
 // #define USE_I2C
 
 /* Select hand configuration */
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
@@ -26,5 +22,3 @@
 #ifdef AUDIO_ENABLE
 #define C6_AUDIO
 #endif
-
-#endif
diff --git a/layouts/community/ortho_4x12/bakingpy/keymap.c b/layouts/community/ortho_4x12/bakingpy/keymap.c
index b34e57cbeb..e71e5d5d2c 100644
--- a/layouts/community/ortho_4x12/bakingpy/keymap.c
+++ b/layouts/community/ortho_4x12/bakingpy/keymap.c
@@ -1,6 +1,4 @@
 #include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
 
 extern keymap_config_t keymap_config;
 
@@ -19,6 +17,7 @@ enum custom_keycodes {
   LOWER,
   RAISE,
   ADJUST,
+  PLAY_ALLSTAR,
 };
 
 #define KC_ KC_TRNS
@@ -35,79 +34,80 @@ enum custom_keycodes {
 #define KC_ENTS MT(MOD_LSFT, KC_ENT)
 #define KC_BL_S BL_STEP
 #define KC_BL_T BL_TOGG
+#define KC_ALLS PLAY_ALLSTAR
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_QWERTY] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
      TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      ESCC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      GRVF,LCTL,LALT,LGUI,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
   ),
 
   [_COLEMAK] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
      TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      ESCC, A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      LSFT, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH,ENTS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      GRVF,LCTL,LALT,LGUI,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
   ),
 
   [_DVORAK] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
      TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      ESCC, A  , O  , E  , U  , I  ,      D  , H  , T  , N  , S  ,SLSH,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  ,ENTS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      GRVF,LCTL,LALT,LGUI,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
   ),
 
   [_LOWER] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     ASTR, 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
+     ALLS, 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
          ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      BL_S,BL_T,    ,    ,    ,DEL ,     DEL ,    , P0 ,PDOT,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
   ),
 
   [_RAISE] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
          ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
      MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
          ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
   ),
 
   [_FKEYS] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
      F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
          ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
          ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
          ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
   ),
 
 /* Adjust (Lower + Raise)
@@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
   [_ADJUST] = LAYOUT_ortho_4x12( \
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
+    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______ \
   )
 
 
@@ -200,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
-    case KC_ASTR:
+    case PLAY_ALLSTAR:
       if (record->event.pressed) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(all_star_song);
diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk
index 80e5f82eef..0d568c401a 100644
--- a/layouts/community/ortho_4x12/bakingpy/rules.mk
+++ b/layouts/community/ortho_4x12/bakingpy/rules.mk
@@ -2,4 +2,5 @@
 ifeq ($(LAYOUTS_HAS_RGB),yes)
 	RGBLIGHT_ENABLE = yes
 endif
-AUDIO_ENABLE = yes
+AUDIO_ENABLE = no
+BACKLIGHT_ENABLE = yes
-- 
cgit v1.2.3


From 08963796d8ec370e1ee14d157d39cc6cfb78222f Mon Sep 17 00:00:00 2001
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
Date: Mon, 13 Aug 2018 15:37:11 -0400
Subject: Keymap: Added buswerks ortho_4x12 keymap (#3623)

* Added buswerks keymap

* cleaned up comments on buswerks keymap

* Added buswerks keymap readme.md

* Fixed spelling in buswerks readme.md

* Removed unnecessary includes, changed process_record_user to now use set_single_persistent_default_layer(), removed deprecated functions, and moved the audio ifdef block to config.h
---
 layouts/community/ortho_4x12/buswerks/config.h  |  22 ++++
 layouts/community/ortho_4x12/buswerks/keymap.c  | 154 ++++++++++++++++++++++++
 layouts/community/ortho_4x12/buswerks/readme.md |  28 +++++
 3 files changed, 204 insertions(+)
 create mode 100644 layouts/community/ortho_4x12/buswerks/config.h
 create mode 100644 layouts/community/ortho_4x12/buswerks/keymap.c
 create mode 100644 layouts/community/ortho_4x12/buswerks/readme.md

(limited to 'layouts')

diff --git a/layouts/community/ortho_4x12/buswerks/config.h b/layouts/community/ortho_4x12/buswerks/config.h
new file mode 100644
index 0000000000..1498cae744
--- /dev/null
+++ b/layouts/community/ortho_4x12/buswerks/config.h
@@ -0,0 +1,22 @@
+#pragma once
+
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
+// #define USE_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define _MASTER_RIGHT
+// #define EE_HANDS
+
+#ifdef AUDIO_ENABLE 
+    #define STARTUP_SONG SONG(PLANCK_SOUND) 
+     // #define STARTUP_SONG SONG(NO_SOUND) 
+  
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                	SONG(COLEMAK_SOUND), \
+                                    SONG(DVORAK_SOUND) \
+                                } 
+#endif 
\ No newline at end of file
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
new file mode 100644
index 0000000000..776ea461b7
--- /dev/null
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -0,0 +1,154 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+#define _QWERTY 0
+#define _COLEMAK 1
+#define _DVORAK 2
+#define _LOWER 3
+#define _RAISE 4
+#define _ADJUST 16
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define KC_     KC_TRNS
+#define XXXXXXX KC_NO
+
+#define ESC_CMD MT(MOD_LGUI, KC_ESC)
+#define RSE_ENT LT(_RAISE, KC_ENT)
+#define KC_LOWR LOWER
+#define KC_RASE RAISE
+#define KC_ADJ  ADJUST
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT_ortho_4x12( \
+  // .--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.
+       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I,    KC_O   , KC_P   , KC_BSPC, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_ESC , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K,    KC_L   , KC_SCLN, KC_QUOT, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER  , KC_SPC , KC_LSFT, RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
+  // '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+),
+
+[_COLEMAK] = LAYOUT_ortho_4x12( \
+  // .--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.
+       KC_TAB , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       ESC_CMD, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSPC, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER  , KC_SPC , KC_LSFT, RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
+  // '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+),
+
+[_DVORAK] = LAYOUT_ortho_4x12( \
+  // .--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.
+       KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER  , KC_SPC , KC_LSFT, RSE_ENT, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT \
+  // '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+),
+
+[_LOWER] = LAYOUT_ortho_4x12( \
+  // .--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.
+       KC_TILD, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_MINS, KC_DEL, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_PIPE, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       _______, KC_CIRC, KC_ASTR, KC_UNDS, KC_EQL,  KC_AMPR, _______, KC_1,    KC_2,    KC_3,    KC_SLSH, _______, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       _______, _______, _______, _______, _______, _______, _______, KC_0,    _______, _______, _______, _______ \
+  // '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+),
+
+[_RAISE] = LAYOUT_ortho_4x12( \
+  // .--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.
+       KC_GRV,  _______, _______, KC_LPRN, KC_RPRN, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, KC_DEL, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       _______, _______, _______, KC_LCBR, KC_RCBR, _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, KC_BSLS, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
+  // |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+  // '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+),
+
+[_ADJUST] =  LAYOUT_ortho_4x12( \
+  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, \
+  _______, _______, RESET,   AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+)
+
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORAK);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
\ No newline at end of file
diff --git a/layouts/community/ortho_4x12/buswerks/readme.md b/layouts/community/ortho_4x12/buswerks/readme.md
new file mode 100644
index 0000000000..452116423b
--- /dev/null
+++ b/layouts/community/ortho_4x12/buswerks/readme.md
@@ -0,0 +1,28 @@
+Buswerks' 4x12 Ortholinear Layout
+============================
+For use on Planck, Let's Split, and similar keyboards
+
+### Layout Overview
+
+- Main Layer
+	- An additional shift key is located on the right space key (only works for grid layouts)
+	- Enter is located on the Raise key (layer-tap)
+	- The left and right shift keys function as Space Cadet shift keys
+	- The bottom left key is the Adjust modifier
+	- Escape is in the traditional Caps Lock position
+		- Holding down the escape key acts as LGUI (intended for macOS use)
+- Lower
+	- There is a numpad on the right hand (4, 5, and 6 are located under JKL/NEI/HTN)
+	- Plus and minus keys are located to the right of the numpad
+	- All other symbols are located on the other side of the keyboard, in a somewhat logical order
+		- Symbols from the number row are in order, starting on the left pinky.
+		- Equals and underscore are in easily accessible spots, because they are more commonly used in programming
+		- The ampersand is less common, so it is moved to the right of the equals symbol
+- Raise
+	- Vim-style arrow keys
+		- Above the arrow keys are media controls
+		- Below are home, end, pgup, and pgdn
+	- The left hand has all three types of braces
+		- Curly braces are under the index and middle fingers for easy access during programming, and because parentheses are already available through Space Cadet shift
+- Adjust
+	- Function keys are located along the top row (reset is moved to accommodate this)
\ No newline at end of file
-- 
cgit v1.2.3


From 23867894c099411a3e630bdb171bf91ea75a6a7d Mon Sep 17 00:00:00 2001
From: zgtm <zgtm@users.noreply.github.com>
Date: Wed, 15 Aug 2018 18:43:39 +0200
Subject: Layouts: Add default ortho 5x14 layout (#3656)

* Add default ortho 5x14 layout

* Fix layout_ortho_5x14: KC_EQLS -> KC_EQL
---
 layouts/default/ortho_5x14/default_ortho_5x14/keymap.c | 11 +++++++++++
 layouts/default/ortho_5x14/layout.json                 |  5 +++++
 layouts/default/ortho_5x14/readme.md                   |  3 +++
 3 files changed, 19 insertions(+)
 create mode 100644 layouts/default/ortho_5x14/default_ortho_5x14/keymap.c
 create mode 100644 layouts/default/ortho_5x14/layout.json
 create mode 100644 layouts/default/ortho_5x14/readme.md

(limited to 'layouts')

diff --git a/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c b/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c
new file mode 100644
index 0000000000..2968cecdf1
--- /dev/null
+++ b/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c
@@ -0,0 +1,11 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x14(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,      KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSPC,
+        KC_ESC,  KC_TAB,  KC_Q,    KC_W,    KC_R,    KC_T,   KC_Y,      KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_DEL,  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,      KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,      KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LEFT, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_ENT, KC_ENT,    KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_DOWN
+    )
+};
diff --git a/layouts/default/ortho_5x14/layout.json b/layouts/default/ortho_5x14/layout.json
new file mode 100644
index 0000000000..e7703827e8
--- /dev/null
+++ b/layouts/default/ortho_5x14/layout.json
@@ -0,0 +1,5 @@
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""]
diff --git a/layouts/default/ortho_5x14/readme.md b/layouts/default/ortho_5x14/readme.md
new file mode 100644
index 0000000000..bf2af9a639
--- /dev/null
+++ b/layouts/default/ortho_5x14/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x14
+
+    LAYOUT_ortho_5x14
-- 
cgit v1.2.3


From c19d949b72844120fff5159bc7e637ada4dd2579 Mon Sep 17 00:00:00 2001
From: Joshua T <replicaJunction@users.noreply.github.com>
Date: Wed, 15 Aug 2018 17:38:41 -0500
Subject: Keymap: Revamp replicaJunction keymaps (#3589)

* Revamp replicaJunction keymaps

Updates both the replicaJunction Ergodox and Atreus keymaps and moves
most of the logic into a new user directory.

* Cleanup as requested in #3589

* Slightly increased TAPPING_TERM

* Fixed typo in #pragma once

* Fix TAPPING_TERM redefined in config.h

* Add include of replicaJunction.h

Due to the tap dance references, without this include, I was getting
compiler errors about both internal QMK items like
`qk_tap_dance_state_t` and constants defined in my replicaJunction.h
file like TD_LAYER_TOGGLE.

Also remove some commented-out code that defined an enum which has since
moved to replicaJunction.h.
---
 layouts/community/ergodox/replicaJunction/config.h |  77 +--
 layouts/community/ergodox/replicaJunction/keymap.c | 693 ++++++++++++---------
 .../community/ergodox/replicaJunction/readme.md    |  93 ++-
 layouts/community/ergodox/replicaJunction/rules.mk |   8 +
 4 files changed, 504 insertions(+), 367 deletions(-)
 create mode 100644 layouts/community/ergodox/replicaJunction/rules.mk

(limited to 'layouts')

diff --git a/layouts/community/ergodox/replicaJunction/config.h b/layouts/community/ergodox/replicaJunction/config.h
index c69ce8cea9..9ffd74dccd 100644
--- a/layouts/community/ergodox/replicaJunction/config.h
+++ b/layouts/community/ergodox/replicaJunction/config.h
@@ -1,64 +1,13 @@
-/*
-Config file - Ergodox QMK with replicaJunction layout
-
-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 KEYBOARDS_ERGODOX_CONFIG_H_
-#define KEYBOARDS_ERGODOX_CONFIG_H_
-
-#include QMK_KEYBOARD_CONFIG_H
-
-
-#undef MOUSEKEY_DELAY          
-#undef MOUSEKEY_INTERVAL       
-#undef MOUSEKEY_MAX_SPEED      
-#undef MOUSEKEY_TIME_TO_MAX    
-
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_MAX_SPEED      3
-#define MOUSEKEY_TIME_TO_MAX    10
-
-#define TAPPING_TOGGLE  1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-// MS the button needs to be held before a tap becomes a hold (default: 200)
-#define TAPPING_TERM    200
-
-#define IGNORE_MOD_TAP_INTERRUPT // 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.)
-
-// I don't have any locking keys, so I don't need these features
-
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* Prevent modifiers from sticking when switching layers */
-/* Uses 5 bytes of memory per 8 keys, but makes sure modifiers don't get "stuck" switching layers */
-#define PREVENT_STUCK_MODIFIERS
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
-
-
-#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
+#pragma once
+
+// Layer definitions
+
+#define L_COLEMAK 0
+#define L_QWERTY  1
+#define L_NUM     2
+#define L_EXTEND  3
+#define L_FUNC    4
+#define L_GAMING  5
+#define L_LL_R    6
+#define L_LL_E    7
+#define L_LL_I    8
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index fc80059276..ce0400be5c 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -1,333 +1,424 @@
 /*
  * Keyboard: Ergodox
  * Keymap:   replicaJunction
- * Version:  1.2
- *
- * This keymap is designed to complement my Atreus keyboard layout, found in keyboards/atreus.
- * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox, and I now
- * have both keyboards, so I've designed these layouts in an effort to make switching between the
- * two as easy as possible.
- *
- * I've also tried to make use of the extra keys on the Ergodox in as logical of a manner as possible,
- * adding to the layers in the Atreus config without disturbing what's there already. This allows for
- * things like F11-F20, the Application (Menu) key, and better media key placement.
- *
- * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
- * here: https://colemakmods.github.io/mod-dh/
+ * Version:  2.1
  */
 
 #include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define _CO 0 // Colemak
-#define _QW 1 // QWERTY
-#define _ME 2 // media keys
-#define _NU 3 // numpad
-#define _EX 4 // extend
-#define _GA 5 // mouse overlay for gaming
-
-// Some quick aliases, just to make it look pretty
-#define _______ KC_TRNS
-#define KCX_CGR LCTL(KC_GRV)
-#define KX_STAB LSFT(KC_TAB)
-#define KX_COPY LCTL(KC_C)
-#define KX_CUT  LCTL(KC_X)
-#define KX_PAST LCTL(KC_V)
-#define KX_UNDO LCTL(KC_Z)
-
-; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
+#include "config.h"
+#include "replicaJunction.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * Keymap: Colemak-ModDH
-     *
-     * ,--------------------------------------------------.           ,--------------------------------------------------.
-     * |   `    |   1  |   2  |   3  |   4  |   5  |  Esc |           |      |   6  |   7  |   8  |   9  |   0  |   =    |
-     * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * |  LCtrl |   Q  |   W  |   F  |   P  |   B  | Home |           | BkSp |   J  |   L  |   U  |   Y  |   ;  |   -    |
-     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-     * |  Tab   |   A  |   R  |   S  |   T  |   G  |------|           |------|   M  |   N  |   E  |   I  |   O  |   '    |
-     * |--------+------+------+------+------+------| Hyper|           |  \   |------+------+------+------+------+--------|
-     * | LShft  |   Z  |   X  |   C  |   D  |   V  |      |           |      |   K  |   H  |   ,  |   ,  |   /  | RShft  |
-     * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-     *   | LGui |   [  |   ]  |CtlShf| LAlt |                                       | _EX  |   -  |   '  |   =  |   \  |
-     *   `----------------------------------'                                       `----------------------------------'
-     *                                        ,-------------.       ,-------------.
-     *                                        | LCtrl|  ~GA |       | Left | Right|
-     *                                 ,------|------|------|       |------+------+------.
-     *                                 |LCtrl/| LAlt/| Home |       |  Up  |  Alt/| _NU/ |
-     *                                 | BkSp |  Del |------|       |------| Enter| Space|
-     *                                 |      |      | _NU  |       | Down |      |      |
-     *                                 `--------------------'       `--------------------'
-     */
-[_CO] = LAYOUT_ergodox(
-        // left hand
-        KC_GRV, KC_1,   KC_2,      KC_3,            KC_4,   KC_5,   KC_ESC,
-        KC_LCTL,KC_Q,   KC_W,      KC_F,            KC_P,   KC_B,   KC_HOME,
-        KC_TAB, KC_A,   KC_R,      KC_S,            KC_T,   KC_G,
-        KC_LSFT,KC_Z,   KC_X,      KC_C,            KC_D,   KC_V,   ALL_T(KC_NO),
-        KC_LGUI,KC_LBRC,KC_RBRC,   LCTL(KC_LSFT),   KC_LALT,
-
-                                                                KC_LCTL,        TG(_GA),
-                                                                                KC_HOME,
-                                                CTL_T(KC_BSPC), ALT_T(KC_DEL),  MO(_NU),
-        // right hand
-             KC_ESC,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_EQL,
-             KC_BSPC,  KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,KC_MINS,
-                       KC_M,   KC_N,   KC_E,   KC_I,   KC_O,   KC_QUOT,
-             KC_BSLS,  KC_K,   KC_H,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-                               MO(_EX),KC_MINS,KC_QUOT,KC_EQL, KC_BSLS,
-
-        KC_LEFT, KC_RGHT,
-        KC_UP,
-        KC_DOWN, ALT_T(KC_ENT), LT(_NU,KC_SPC)
-    ),
-
-    /*
-     * Keymap: QWERTY layout.
-     *
-     * This is optimized for gaming, not typing, so there aren't as many macros
-     * as the Dvorak layer. Some of the keys have also been moved to "game-
-     * like" locations, such as making the spacebar available to the left thumb,
-     * and repositioning the arrow keys at the bottom right corner.
-     *
-     * ,--------------------------------------------------.           ,--------------------------------------------------.
-     * |   `    |   1  |   2  |   3  |   4  |   5  |  Esc |           |      |   6  |   7  |   8  |   9  |   0  |   =    |
-     * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * | LCtrl  |   Q  |   W  |   E  |   R  |   T  | Home |           | BkSp |   Y  |   U  |   I  |   O  |   P  |   -    |
-     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-     * | Tab    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
-     * |--------+------+------+------+------+------| Hyper|           |  \   |------+------+------+------+------+--------|
-     * | LShft  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | RShft  |
-     * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-     *   | LGui |   `  |  \   |CtlShf| _NU  |                                       |  _EX |   -  |  '   |   =  |   \   |
-     *   `----------------------------------'                                       `----------------------------------'
-     *                                        ,-------------.       ,-------------.
-     *                                        | LCtrl| ~GA  |       | Left | Right|
-     *                                 ,------|------|------|       |------+------+------.
-     *                                 |LCtrl/| LAlt/| Home |       |  Up  |  Alt/| _NU/ |
-     *                                 | BkSp |  Del |------|       |------| Enter| Space|
-     *                                 |      |      | _NU  |       | Down |      |      |
-     *                                 `--------------------'       `--------------------'
-     */
-[_QW] = LAYOUT_ergodox(  // Layer1: QWERTY
-        // left hand
-        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
-        KC_LCTL,KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_HOME,
-        KC_TAB, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        KC_LGUI,KC_GRV, KC_SLSH,LCTL(KC_LSFT),  MO(_NU),
-
-                                                                KC_LCTL,TG(_GA),
-                                                                        KC_HOME,
-                                        CTL_T(KC_BSPC), ALT_T(KC_DEL),  MO(_NU),
-        // right hand
-        KC_ESC,  KC_6,  KC_7,   KC_8,   KC_9,   KC_0,   KC_EQL,
-        KC_BSPC, KC_Y,  KC_U,   KC_I,   KC_O,   KC_P,   KC_MINS,
-                 KC_H,  KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-        KC_BSLS, KC_N,  KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-                        MO(_EX),KC_MINS,KC_QUOT,KC_EQL, KC_BSLS,
-
-        KC_LEFT, KC_RGHT,
-        KC_UP,
-        KC_DOWN, ALT_T(KC_ENT), LT(_NU,KC_SPC)
-    ),
-
-    /*
-     * Keymap: Numbers and symbols
-     *
-     * Note that the number keys here are actually numpad keystrokes. This often doesn't matter, but it may be relevant in a few cases.
-     * That's why the Num Lock key exists on this layer - just in case.
-     *
-     * This layer also contains the layout switches.
-     *
-     * ,--------------------------------------------------.           ,--------------------------------------------------.
-     * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
-     * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * |        |   !  |   @  |   {  |   }  |   &  |      |           |      |   /  |   7  |   8  |   9  |   *  |        |
-     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-     * |        |   #  |   $  |   (  |   )  |   ~  |------|           |------|   |  |   4  |   5  |   6  |   -  |        |
-     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-     * |        |   %  |   ^  |   [  |   ]  |   `  |      |           |      |   \  |   1  |   2  |   3  |   +  |        |
-     * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-     *   |      |QWERTY|Colemk|      |      |                                       |   0  |   .  |   =  |      |      |
-     *   `----------------------------------'                                       `----------------------------------'
-     *                                        ,-------------.       ,-------------.
-     *                                        |NumLck| RESET|       |      |      |
-     *                                 ,------|------|------|       |------+------+------.
-     *                                 |      |      |      |       |      |      |      |
-     *                                 |      |      |------|       |------|      |      |
-     *                                 |      |      |      |       |      |      |      |
-     *                                 `--------------------'       `--------------------'
-     */
-[_NU] = LAYOUT_ergodox(
-        // left hand
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,
-        _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR, _______,
-        _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TILD,
-        _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,  _______,
-        _______, DF(_QW), DF(_CO), _______, _______,
-
-                                                KC_NLCK,RESET,
-                                                        _______,
-                                        _______,_______,_______,
-        // right hand
-        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-        _______, KC_SLSH, KC_P7,   KC_P8,   KC_P9,   KC_PAST, _______,
-                 KC_PIPE, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, _______,
-        _______, KC_BSLS, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, _______,
-                          KC_P0,   KC_PDOT, KC_EQL,  _______, _______,
-
-       _______, _______,
-       _______,
-       _______, _______, _______
-    ),
-
-    /*
-     * Keymap: Extend
-     *
-     * ,--------------------------------------------------.           ,--------------------------------------------------.
-     * |        |  F11 |  F12 |  F13 |  F14 |  F15 | Mute |           |      |  F16 |  F17 |  F18 |  F19 |  F20 |        |
-     * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * |        |      |      |      |      | Ctrl`|  Vol |           |      | PgUp | Home |  Up  |  End |  Del |        |
-     * |--------+------+------+------+------+------|  Up  |           |      |------+------+------+------+------+--------|
-     * |        |      |  Gui |  Alt | Ctrl |      |------|           |------| PgDn | Left | Down | Right| BkSp |  Menu  |
-     * |--------+------+------+------+------+------|  Vol |           |      |------+------+------+------+------+--------|
-     * |        | Undo |  Cut | Copy |      | Paste| Down |           |      |      | ^Tab |  Tab |      |Insert| PrntScr|
-     * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-     *   |      |      |      |      |      |                                       |      |      |      |      |      |
-     *   `----------------------------------'                                       `----------------------------------'
-     *                                        ,-------------.       ,-------------.
-     *                                        |      |      |       |      |      |
-     *                                 ,------|------|------|       |------+------+------.
-     *                                 |      |      |      |       |      |      |      |
-     *                                 |      |      |------|       |------|      |      |
-     *                                 |      |      |      |       |      |      |      |
-     *                                 `--------------------'       `--------------------'
-     *
-     * Ctrl+` is a keyboard shortcut for the program ConEmu, which provides a Quake-style drop-down command prompt.
-     *
-     */
-[_EX] = LAYOUT_ergodox(
-        // left hand
-        _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_MUTE,
-        _______, _______, _______, _______, _______, KCX_CGR, KC_VOLU,
-        _______, _______, KC_LGUI, KC_LALT, KC_LCTL, _______,
-        _______, KX_UNDO, KX_CUT,  KX_COPY, _______, KX_PAST, KC_VOLD,
-        _______, _______, _______, _______, _______,
-
-                                                _______,_______,
-                                                        _______,
-                                        _______,_______,_______,
-        // right hand
-        _______,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  _______,
-        _______,  KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  _______,
-                  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU,
-        _______,  _______, KX_STAB, KC_TAB,  _______, KC_INS,  KC_PSCR,
-                           _______, _______, _______, _______, _______,
-        _______, _______,
-        _______,
-        _______, _______, _______
-    ),
-
-    /*
-     * Keymap: Gaming
-     *
-     * Provides a mouse overlay for the right hand, and also moves some "gamer friendly" keys to the left, such as space.
-     * This layer also removes a lot of dual-role keys, as when gaming, it's nicer not to need to keep track of those.
-     *
-     * ,--------------------------------------------------.           ,--------------------------------------------------.
-     * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-     * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-     * |        |      |      |      |      |      |      |           |      |      |WhlUp | MsUp |WhlDn |      |        |
-     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-     * |        |      |      |      |      |      |------|           |------|      |MsLeft|MsDown|MsRght|      |        |
-     * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-     * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-     * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-     *   | LCtrl|      |      |      |      |                                       |      |      |      |      |      |
-     *   `----------------------------------'                                       `----------------------------------'
-     *                                        ,-------------.       ,-------------.
-     *                                        |      | ~_GA |       |      |MClick|
-     *                                 ,------|------|------|       |------+------+------.
-     *                                 |      |      |      |       |      |      |      |
-     *                                 | Space|      |------|       |------|RClick|LClick|
-     *                                 |      |      |      |       |      |      |      |
-     *                                 `--------------------'       `--------------------'
-     */
-[_GA] = LAYOUT_ergodox(
-        // left hand
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,
-        KC_LCTL, _______, _______, _______, _______,
-
-                                        _______,_______,
-                                                _______,
-                                        KC_SPC, _______,_______,
-
-        // right hand
-        _______,  _______, _______, _______, _______, _______, _______,
-        _______,  _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______,
-                  _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
-        _______,  _______, _______, _______, _______, _______, _______,
-                           _______, _______, _______, _______, _______,
-        _______, KC_BTN3,
-        _______,
-        _______, KC_BTN2, KC_BTN1
-    ),
-};
 
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_TAP_TOGGLE(_NU)                // FN1 - Momentary Layer 1 (Numbers and symbols)
-};
+[L_COLEMAK] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+  KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_GRV  ,
+//--------|--------|--------|--------|--------|--------|--------|
+  KX_ECTL ,KC_Q    ,KC_W    ,KC_F    ,KC_P    ,KC_B    ,KC_LBRC ,
+//--------|--------|--------|--------|--------|--------|--------|
+  KC_TAB  ,KC_A    ,KC_R_LT ,KC_S_LT ,KC_T    ,KC_G,
+//--------|--------|--------|--------|--------|--------|--------|
+  KC_LSFT ,KX_Z_MT ,KX_X_MT ,KX_C_MT ,KX_D_MT ,KC_V    ,KC_RBRC ,
+//--------|--------|--------|--------|--------|--------|--------|
+  TD_LAYR ,KC_LGUI ,KC_HYPR ,KX_CTSF ,KC_LCTL ,
+//--------|--------|--------|--------|--------|--------|--------|
+                                               KC_HOME ,KC_END  ,
+//                                            |--------|--------|
+                                                        KC_PGUP ,
+//