From 32725dae5ba50f41bf16a80083727f08beaea7c6 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Mon, 11 Jul 2016 17:49:12 -0500
Subject: Created replicaJunction keymaps.

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 75 +++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 keyboards/atreus/keymaps/replicaJunction/keymap.c

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
new file mode 100644
index 0000000000..7ff8933e89
--- /dev/null
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -0,0 +1,75 @@
+// this is the style you want to emulate.
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+
+#include "atreus.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.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+// Note that whatever is set as layer 0 will be the default layer of the keyboard.
+
+#define _CO 0 // Colemak
+#define _QW 1 // QWERTY
+#define _NU 2 // Numpad
+#define _FN 3 // Function
+#define _DV 4 // Dvorak
+
+// Quick alias for visual sake
+#define _______ KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_CO] = {
+  {KC_Q,    KC_W,   KC_F,    KC_P,    KC_B,    _______, KC_J,     KC_L,    KC_U,    KC_Y,    KC_SCLN },
+  {KC_A,    KC_R,   KC_S,    KC_T,    KC_G,    _______, KC_M,     KC_N,    KC_E,    KC_I,    KC_O    },
+  {KC_Z,    KC_X,   KC_C,    KC_D,    KC_V,    KC_LCTL, KC_K,     KC_H,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC,  KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,   MO(_NU), KC_MINS, KC_QUOT, KC_ENT  }
+},
+
+[_DV] = {
+  {KC_QUOT, KC_COMM, KC_DOT, KC_P,    KC_Y,    _______, KC_F,     KC_G,    KC_C,    KC_R,    KC_L    },
+  {KC_A,    KC_O,    KC_E,   KC_U,    KC_I,    _______, KC_D,     KC_H,    KC_T,    KC_N,    KC_S    },
+  {KC_SCLN, KC_Q,    KC_J,   KC_K,    KC_X,    KC_LCTL, KC_B,     KC_M,    KC_W,    KC_V,    KC_Z    },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  MO(_NU), KC_MINS, KC_SLSH, KC_ENT  }
+},
+
+[_QW] = { /* Qwerty */
+  {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   _______,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    },
+  {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   _______,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN },
+  {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_LCTL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC,KC_LALT, KC_SPC,   MO(_NU), KC_MINS, KC_QUOT, KC_ENT  }
+},
+
+[_NU] = { /* Numbers and symbols */
+  {KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR, _______, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
+  {KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,  _______, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
+  {KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_LCTL, KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS},
+  {MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, KC_DEL,  KC_LALT, KC_SPC,  _______, KC_DOT, KC_0, KC_EQL}
+},
+
+[_FN] = { /* Functions */
+  {KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10},
+  {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11},
+  {_______, _______, _______, _______, _______, KC_LCTL, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12},
+  {_______, _______, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  _______, _______, _______, RESET}
+}};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+          } else {
+            unregister_code(KC_RSFT);
+          }
+        break;
+      }
+    return MACRO_NONE;
+};
-- 
cgit v1.2.3


From f90d89458c9ff8e33f1739c06681f28ffd95b5f9 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Mon, 11 Jul 2016 17:49:12 -0500
Subject: Created replicaJunction keymaps.

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 89 +++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 keyboards/atreus/keymaps/replicaJunction/keymap.c

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
new file mode 100644
index 0000000000..79b2738aa3
--- /dev/null
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -0,0 +1,89 @@
+#include "atreus.h"
+
+/*
+ * Keyboard: Atreus
+ * Keymap:   replicaJunction
+ * Version:  0.1
+ *
+ * This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez.
+ * 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.
+ *
+ * Clearly, the Atreus is the limiting factor in this equation, so I've taken heavy advantage of
+ * function and dual-role keys.
+ *
+ * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
+ * here: https://colemakmods.github.io/mod-dh/
+ */
+
+// 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.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+// Note that whatever is set as layer 0 will be the default layer of the keyboard.
+
+#define _CO 0 // Colemak
+#define _QW 1 // QWERTY
+#define _NU 2 // Numpad
+#define _FN 3 // Function
+#define _DV 4 // Dvorak
+
+// Quick alias for visual sake
+#define _______ KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_CO] = {
+  {KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN },
+  {KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    _______, KC_M,    KC_N,    KC_E,    KC_I,    KC_O    },
+  {KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_LCTL, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  MO(_NU), KC_MINS, KC_QUOT, KC_ENT  }
+},
+
+[_DV] = {
+  {KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L    },
+  {KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S    },
+  {KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_LCTL, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z    },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  MO(_NU), KC_MINS, KC_SLSH, KC_ENT  }
+},
+
+[_QW] = { /* Qwerty */
+  {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    },
+  {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN },
+  {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCTL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT,  KC_SPC,  MO(_NU), KC_MINS, KC_QUOT, KC_ENT  }
+},
+
+[_NU] = { /* Numbers and symbols */
+  {KC_EXLM, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
+  {KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  _______, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
+  {KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_LCTL, KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS},
+  {MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, KC_DEL,  KC_LALT, KC_SPC,  _______, KC_DOT, KC_0, KC_EQL}
+},
+
+[_FN] = { /* Functions */
+  {KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10},
+  {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11},
+  {_______, _______, _______, _______, _______, KC_LCTL, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12},
+  {_______, _______, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  _______, _______, _______, RESET}
+}};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+          } else {
+            unregister_code(KC_RSFT);
+          }
+        break;
+      }
+    return MACRO_NONE;
+};
-- 
cgit v1.2.3


From 77377e2784705a6d31b81dc1a855201ff26700dc Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Fri, 15 Jul 2016 17:44:39 -0500
Subject: Fixed a merge conflict

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 992eabdbdb..f2a8ff24c1 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-#include "atreus.h"
-
 /*
  * Keyboard: Atreus
  * Keymap:   replicaJunction
@@ -17,12 +14,6 @@
  * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
  * here: https://colemakmods.github.io/mod-dh/
  */
-=======
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include "atreus.h"
->>>>>>> 32725dae5ba50f41bf16a80083727f08beaea7c6
 
 // 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.
-- 
cgit v1.2.3


From 243ae75256d5458a7ef11985aa008c797ff18add Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Fri, 15 Jul 2016 17:49:14 -0500
Subject: Added default layer switch QWERTY to Colemak

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index f2a8ff24c1..30d2ef81a0 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -15,6 +15,8 @@
  * here: https://colemakmods.github.io/mod-dh/
  */
 
+#include "atreus.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.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -26,7 +28,7 @@
 #define _QW 1 // QWERTY
 #define _NU 2 // Numpad
 #define _FN 3 // Function
-#define _DV 4 // Dvorak
+#define _DV 4 // Dvorak (not currently used)
 
 // Quick alias for visual sake
 #define _______ KC_TRNS
@@ -55,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_NU] = { /* Numbers and symbols */
   {KC_EXLM, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
-  {KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  _______, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
+  {KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
   {KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_LCTL, KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS},
   {MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, KC_DEL,  KC_LALT, KC_SPC,  _______, KC_DOT, KC_0, KC_EQL}
 },
@@ -64,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   {KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10},
   {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11},
   {_______, _______, _______, _______, _______, KC_LCTL, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12},
-  {_______, _______, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  _______, _______, _______, RESET}
+  {_______, _______, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  _______, DF(_CO), DF(_QW), RESET}
 }};
 
 const uint16_t PROGMEM fn_actions[] = {
-- 
cgit v1.2.3


From 377bcb00fb1a88a9549381f5da1e7b11cd623296 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Tue, 19 Jul 2016 17:01:21 -0500
Subject: Added Gaming layer and removed Dvorak

Also added tap/hold functions on central keys
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 46 +++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 30d2ef81a0..ba1331bce4 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -26,47 +26,47 @@
 
 #define _CO 0 // Colemak
 #define _QW 1 // QWERTY
-#define _NU 2 // Numpad
-#define _FN 3 // Function
-#define _DV 4 // Dvorak (not currently used)
+#define _GA 2 // Gaming
+#define _NU 3 // Numpad
+#define _FN 4 // Function
 
 // Quick alias for visual sake
 #define _______ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CO] = {
-  {KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN },
-  {KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    _______, KC_M,    KC_N,    KC_E,    KC_I,    KC_O    },
-  {KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_LCTL, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH },
-  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  MO(_NU), KC_MINS, KC_QUOT, KC_ENT  }
-},
-
-[_DV] = {
-  {KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L    },
-  {KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S    },
-  {KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_LCTL, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z    },
-  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  MO(_NU), KC_MINS, KC_SLSH, KC_ENT  }
+  {KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    _______,        KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN },
+  {KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    _______,        KC_M,            KC_N,    KC_E,    KC_I,    KC_O    },
+  {KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    CTL_T(KC_BSPC), KC_K,            KC_H,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_LSFT, ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), KC_MINS, KC_QUOT, KC_EQL  }
 },
 
 [_QW] = { /* Qwerty */
-  {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    },
-  {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN },
-  {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCTL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH },
-  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT,  KC_SPC,  MO(_NU), KC_MINS, KC_QUOT, KC_ENT  }
+  {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______,        KC_Y,            KC_U,    KC_I,    KC_O,    KC_P    },
+  {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______,        KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN },
+  {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTL_T(KC_BSPC), KC_N,            KC_M,    KC_COMM, KC_DOT,  KC_SLSH },
+  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL  }
 },
 
 [_NU] = { /* Numbers and symbols */
-  {KC_EXLM, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
+  {KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
   {KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
-  {KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_LCTL, KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS},
-  {MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, KC_DEL,  KC_LALT, KC_SPC,  _______, KC_DOT, KC_0, KC_EQL}
+  {KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, CTL_T(KC_BSPC), KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS},
+  {MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, _______, _______, KC_SPC,  _______, KC_DOT, KC_0, _______}
 },
 
 [_FN] = { /* Functions */
   {KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10},
   {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11},
-  {_______, _______, _______, _______, _______, KC_LCTL, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12},
-  {_______, _______, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC,  _______, DF(_CO), DF(_QW), RESET}
+  {_______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12},
+  {_______, _______, KC_LGUI, KC_LSFT, _______, _______, KC_SPC,  _______, DF(_CO), DF(_QW), RESET}
+},
+
+[_GA] = { /* Gaming */
+  {_______, _______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______ },
+  {_______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______ },
+  {_______, _______, _______, _______, _______, KC_BSPC, KC_BTN3, _______, KC_MS_D, _______, _______ },
+  {_______, _______, _______, _______, KC_SPC,  KC_BTN2, KC_BTN1, _______, _______, _______, _______ },
 }};
 
 const uint16_t PROGMEM fn_actions[] = {
-- 
cgit v1.2.3


From 2a4947b28b55c084191e6c51e3194311432c4fc2 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Tue, 19 Jul 2016 17:39:15 -0500
Subject: Modified Atreus layout to account for keymap() function

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 60 +++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index ba1331bce4..d96fe008a1 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -34,40 +34,40 @@
 #define _______ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_CO] = {
-  {KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    _______,        KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN },
-  {KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    _______,        KC_M,            KC_N,    KC_E,    KC_I,    KC_O    },
-  {KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    CTL_T(KC_BSPC), KC_K,            KC_H,    KC_COMM, KC_DOT,  KC_SLSH },
-  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_LSFT, ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), KC_MINS, KC_QUOT, KC_EQL  }
-},
+[_CO] = KEYMAP(
+  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                                    KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
+  KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                                    KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
+  KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                                    KC_K,            KC_H,    KC_COMM, KC_DOT,  KC_SLSH,
+  KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_LSFT, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), KC_MINS, KC_QUOT, KC_EQL
+),
 
-[_QW] = { /* Qwerty */
-  {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______,        KC_Y,            KC_U,    KC_I,    KC_O,    KC_P    },
-  {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______,        KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN },
-  {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTL_T(KC_BSPC), KC_N,            KC_M,    KC_COMM, KC_DOT,  KC_SLSH },
-  {KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL  }
-},
+[_QW] = KEYMAP( /* Qwerty */
+  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                    KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                    KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
+  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                    KC_N,            KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+  KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL
+),
 
-[_NU] = { /* Numbers and symbols */
-  {KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR},
-  {KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS},
-  {KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, CTL_T(KC_BSPC), KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS},
-  {MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, _______, _______, KC_SPC,  _______, KC_DOT, KC_0, _______}
-},
+[_NU] = KEYMAP( /* Numbers and symbols */
+  KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                          KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR,
+  KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                          KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS,
+  KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                          KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS,
+  MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, _______, CTL_T(KC_BSPC), _______, KC_SPC,  _______, KC_DOT, KC_0, _______
+),
 
-[_FN] = { /* Functions */
-  {KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10},
-  {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11},
-  {_______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12},
-  {_______, _______, KC_LGUI, KC_LSFT, _______, _______, KC_SPC,  _______, DF(_CO), DF(_QW), RESET}
-},
+[_FN] = KEYMAP( /* Functions */
+  KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+  KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11,
+  _______, _______, _______, _______, _______,                   _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
+  _______, _______, KC_LGUI, KC_LSFT, _______, _______, _______, _______,  _______, DF(_CO), DF(_QW), RESET
+),
 
-[_GA] = { /* Gaming */
-  {_______, _______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______ },
-  {_______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______ },
-  {_______, _______, _______, _______, _______, KC_BSPC, KC_BTN3, _______, KC_MS_D, _______, _______ },
-  {_______, _______, _______, _______, KC_SPC,  KC_BTN2, KC_BTN1, _______, _______, _______, _______ },
-}};
+[_GA] = KEYMAP( /* Gaming */
+  _______, _______, _______, _______, _______,                   _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
+  _______, _______, _______, _______, _______,                   _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
+  _______, _______, _______, _______, _______,                   KC_BTN3, _______, KC_MS_D, _______, _______,
+  _______, _______, _______, _______, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
+)};
 
 const uint16_t PROGMEM fn_actions[] = {
 
-- 
cgit v1.2.3


From 15ee180f0e70b318d18ff3ec729f3c769eefec94 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Wed, 20 Jul 2016 00:38:56 -0500
Subject: Created readme and added screenshots

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 44 +++++++++++++++--------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index d96fe008a1..aa0e26fa42 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -27,18 +27,25 @@
 #define _CO 0 // Colemak
 #define _QW 1 // QWERTY
 #define _GA 2 // Gaming
-#define _NU 3 // Numpad
-#define _FN 4 // Function
+#define _EX 3 // Extend
+#define _NU 4 // Numpad
+#define _FN 5 // Function
 
-// Quick alias for visual sake
+// Some quick aliases, just to make it look pretty
 #define _______ KC_TRNS
+#define KCX_CA  LCTL(KC_LALT)
+#define KCX_CS  LCTL(KC_LSFT)
+#define KCX_CSA LCTL(LSFT(KC_LALT))
+#define KCX_LST LSFT(KC_TAB)
+
+; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CO] = KEYMAP(
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                                    KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
-  KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                                    KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
-  KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                                    KC_K,            KC_H,    KC_COMM, KC_DOT,  KC_SLSH,
-  KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_LSFT, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), KC_MINS, KC_QUOT, KC_EQL
+  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                                          KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
+  KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                                          KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
+  KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                                          KC_K,            KC_H,    KC_COMM, KC_DOT,  KC_SLSH,
+  KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, SFT_T(KC_BSPC), CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 [_QW] = KEYMAP( /* Qwerty */
@@ -48,18 +55,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL
 ),
 
+[_EX] = KEYMAP( /* Extend */
+  _______, _______, _______, _______, _______,                   KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
+  KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
+  KC_HYPR, KCX_CSA, KCX_CA,  KCX_CS,  _______,                   _______, KCX_LST, _______, KC_TAB,  _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
+),
+
 [_NU] = KEYMAP( /* Numbers and symbols */
-  KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                          KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR,
-  KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                          KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS,
-  KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                          KC_TILD, KC_1,    KC_2,   KC_3, KC_BSLS,
-  MO(_FN), KC_INS,  KC_LGUI, KC_LSFT, _______, CTL_T(KC_BSPC), _______, KC_SPC,  _______, KC_DOT, KC_0, _______
+  KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,                    KC_SLSH, KC_7,    KC_8,   KC_9,   KC_ASTR,
+  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                     KC_PIPE, KC_4,    KC_5,   KC_6,   KC_MINS,
+  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                    KC_BSLS, KC_1,    KC_2,   KC_3,   KC_PLUS,
+  MO(_FN), _______, KC_LABK, KC_RABK, _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
 ),
 
 [_FN] = KEYMAP( /* Functions */
-  KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11,
-  _______, _______, _______, _______, _______,                   _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-  _______, _______, KC_LGUI, KC_LSFT, _______, _______, _______, _______,  _______, DF(_CO), DF(_QW), RESET
+  KC_DEL,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
+  KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,
+  _______, KC_VOLU, KC_MUTE, KC_VOLD, KC_MPLY,                   _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
+  _______, _______, _______, _______, KC_MSTP, _______, _______, _______, KC_NO,   DF(_CO), DF(_QW), RESET
 ),
 
 [_GA] = KEYMAP( /* Gaming */
-- 
cgit v1.2.3


From 876a6bdd4ca9033972d0a2d8c0c563cc6d7d9e7e Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Tue, 26 Jul 2016 01:44:57 -0500
Subject: Modified Atreus extend and Ergodox.

Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index aa0e26fa42..0470a4fa19 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -1,10 +1,10 @@
 /*
  * Keyboard: Atreus
  * Keymap:   replicaJunction
- * Version:  0.1
+ * Version:  0.3
  *
  * This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez.
- * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox, and I now
+ * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox. I now
  * have both keyboards, so I've designed these layouts in an effort to make switching between the
  * two as easy as possible.
  *
@@ -37,6 +37,13 @@
 #define KCX_CS  LCTL(KC_LSFT)
 #define KCX_CSA LCTL(LSFT(KC_LALT))
 #define KCX_LST 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)
+
+// Uses 5 bytes of memory per 8 keys, but makes sure modifiers don't get "stuck" switching layers
+#define PREVENT_STUCK_MODIFIERS
 
 ; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
 
@@ -57,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_EX] = KEYMAP( /* Extend */
   _______, _______, _______, _______, _______,                   KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
-  KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
-  KC_HYPR, KCX_CSA, KCX_CA,  KCX_CS,  _______,                   _______, KCX_LST, _______, KC_TAB,  _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
+  _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
+  KX_UNDO, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KCX_LST, _______, KC_TAB,  _______,
+  _______, _______, _______, _______, KC_LSFT, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
 ),
 
 [_NU] = KEYMAP( /* Numbers and symbols */
-- 
cgit v1.2.3


From cf795a6f93a541c2ff5d64daa0aefd1f97d62035 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Sat, 30 Jul 2016 09:19:17 -0500
Subject: Moved PREVENT_STUCK_MODIFIERS to config.h

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 0470a4fa19..4e88f3bd13 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -42,9 +42,6 @@
 #define KX_PAST LCTL(KC_V)
 #define KX_UNDO LCTL(KC_Z)
 
-// Uses 5 bytes of memory per 8 keys, but makes sure modifiers don't get "stuck" switching layers
-#define PREVENT_STUCK_MODIFIERS
-
 ; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-- 
cgit v1.2.3


From 6a24bac9c40ea22e92421f7f9bb7c7af6f562fca Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Tue, 9 Aug 2016 22:16:21 -0500
Subject: Moved Shift keys to Z and ?

Instead of using a thumb shift, I was given the idea of using the pinky keys as dual-role keys that also send the Shift keypress.

This gives me a Shift key on each hand again, but it will make me learn to Shift with opposite hands after all.
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 4e88f3bd13..bc4011d2c7 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -46,17 +46,17 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_CO] = KEYMAP(
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                                          KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
-  KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                                          KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
-  KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                                          KC_K,            KC_H,    KC_COMM, KC_DOT,  KC_SLSH,
-  KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, SFT_T(KC_BSPC), CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
+  KC_Q,        KC_W,    KC_F,    KC_P,    KC_B,                                   KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
+  KC_A,        KC_R,    KC_S,    KC_T,    KC_G,                                   KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
+  SFT_T(KC_Z), KC_X,    KC_C,    KC_D,    KC_V,                                   KC_K,            KC_H,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
+  KC_ESC,      KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 [_QW] = KEYMAP( /* Qwerty */
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                    KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                    KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                    KC_N,            KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-  KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL
+  KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,                                    KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,        KC_S,    KC_D,    KC_F,    KC_G,                                    KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
+  SFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                    KC_N,            KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
+  KC_ESC,      KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL
 ),
 
 [_EX] = KEYMAP( /* Extend */
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______,                   _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
   _______, _______, _______, _______, _______,                   _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
   _______, _______, _______, _______, _______,                   KC_BTN3, _______, KC_MS_D, _______, _______,
-  _______, _______, _______, _______, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
+  _______, _______, _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
 )};
 
 const uint16_t PROGMEM fn_actions[] = {
-- 
cgit v1.2.3


From bc1059bc1e288e6db15e442cacad3df369421581 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Tue, 16 Aug 2016 21:55:33 -0500
Subject: Minor changes to Extend and Number layers.

Brought QWERTY layer in line with normal layer. Removed Undo function, as it interfered with Shift. Moved Tab and Shift-Tab, and added Insert.
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index bc4011d2c7..a7126df64b 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -49,28 +49,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_Q,        KC_W,    KC_F,    KC_P,    KC_B,                                   KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
   KC_A,        KC_R,    KC_S,    KC_T,    KC_G,                                   KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
   SFT_T(KC_Z), KC_X,    KC_C,    KC_D,    KC_V,                                   KC_K,            KC_H,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
-  KC_ESC,      KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
+  KC_ESC,      KC_TAB,  KC_LGUI, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 [_QW] = KEYMAP( /* Qwerty */
-  KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,                                    KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,        KC_S,    KC_D,    KC_F,    KC_G,                                    KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
-  SFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                    KC_N,            KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
-  KC_ESC,      KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, CTL_T(KC_BSPC), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_NU), TG(_GA), KC_QUOT, KC_EQL
+  KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,                                  KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,        KC_S,    KC_D,    KC_F,    KC_G,                                  KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
+  SFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                  KC_N,            KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
+  KC_ESC,      KC_TAB,  KC_LGUI, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 [_EX] = KEYMAP( /* Extend */
   _______, _______, _______, _______, _______,                   KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
   _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
-  KX_UNDO, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KCX_LST, _______, KC_TAB,  _______,
+  KC_CAPS, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KC_TAB,  KCX_LST, _______, KC_INSERT,
   _______, _______, _______, _______, KC_LSFT, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
 ),
 
 [_NU] = KEYMAP( /* Numbers and symbols */
   KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,                    KC_SLSH, KC_7,    KC_8,   KC_9,   KC_ASTR,
-  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                     KC_PIPE, KC_4,    KC_5,   KC_6,   KC_MINS,
-  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                    KC_BSLS, KC_1,    KC_2,   KC_3,   KC_PLUS,
-  MO(_FN), _______, KC_LABK, KC_RABK, _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
+  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TILD,                    KC_PIPE, KC_4,    KC_5,   KC_6,   KC_MINS,
+  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,                     KC_BSLS, KC_1,    KC_2,   KC_3,   KC_PLUS,
+  TG(_GA), _______, _______, MO(_FN), _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
 ),
 
 [_FN] = KEYMAP( /* Functions */
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_GA] = KEYMAP( /* Gaming */
   _______, _______, _______, _______, _______,                   _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
   _______, _______, _______, _______, _______,                   _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
-  _______, _______, _______, _______, _______,                   KC_BTN3, _______, KC_MS_D, _______, _______,
+  KC_Z,    _______, _______, _______, _______,                   KC_BTN3, _______, KC_MS_D, _______, _______,
   _______, _______, _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
 )};
 
-- 
cgit v1.2.3


From cac69cb58029bf246b22038f034205afbedbc695 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Wed, 24 Aug 2016 23:41:14 -0500
Subject: Several key placement fixes.

* Switched Tab and Super on the default layout
* Moved Shift on Extend to pinky
* Moved Caps Lock to upper right corner
* Moved gaming toggle to avoid blocking Escape
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index a7126df64b..c229d22f1e 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -49,28 +49,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_Q,        KC_W,    KC_F,    KC_P,    KC_B,                                   KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
   KC_A,        KC_R,    KC_S,    KC_T,    KC_G,                                   KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
   SFT_T(KC_Z), KC_X,    KC_C,    KC_D,    KC_V,                                   KC_K,            KC_H,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
-  KC_ESC,      KC_TAB,  KC_LGUI, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
+  KC_ESC,      KC_LGUI, KC_TAB,  KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 [_QW] = KEYMAP( /* Qwerty */
   KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,                                  KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
   KC_A,        KC_S,    KC_D,    KC_F,    KC_G,                                  KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
   SFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                  KC_N,            KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
-  KC_ESC,      KC_TAB,  KC_LGUI, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
+  KC_ESC,      KC_LGUI, KC_TAB,  KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 [_EX] = KEYMAP( /* Extend */
-  _______, _______, _______, _______, _______,                   KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
+  KC_CAPS, _______, _______, _______, _______,                   KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
   _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
-  KC_CAPS, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KC_TAB,  KCX_LST, _______, KC_INSERT,
-  _______, _______, _______, _______, KC_LSFT, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
+  _______, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KC_TAB,  KCX_LST, _______, KC_INSERT,
+  _______, _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
 ),
 
 [_NU] = KEYMAP( /* Numbers and symbols */
   KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,                    KC_SLSH, KC_7,    KC_8,   KC_9,   KC_ASTR,
   KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TILD,                    KC_PIPE, KC_4,    KC_5,   KC_6,   KC_MINS,
   KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,                     KC_BSLS, KC_1,    KC_2,   KC_3,   KC_PLUS,
-  TG(_GA), _______, _______, MO(_FN), _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
+  _______, TG(_GA), _______, MO(_FN), _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
 ),
 
 [_FN] = KEYMAP( /* Functions */
-- 
cgit v1.2.3


From b0c3d596816c178ccd94738a3866a08b71027d0d Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Wed, 24 Aug 2016 23:49:33 -0500
Subject: Fixed getting "stuck" in gaming layer

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index c229d22f1e..52d3677fa7 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______,                   _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
   _______, _______, _______, _______, _______,                   _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
   KC_Z,    _______, _______, _______, _______,                   KC_BTN3, _______, KC_MS_D, _______, _______,
-  _______, _______, _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
+  _______, TG(_GA), _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
 )};
 
 const uint16_t PROGMEM fn_actions[] = {
-- 
cgit v1.2.3


From 8ec7341fb27186e9b3dceb8acd97c5d7fb263e1d Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Sat, 15 Oct 2016 15:28:16 -0500
Subject: Added Ctrl+` (ConEmu shortcut)

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 52d3677fa7..f7ef1174dc 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_EX] = KEYMAP( /* Extend */
-  KC_CAPS, _______, _______, _______, _______,                   KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
+  KC_CAPS, _______, _______, _______, LCTL(KC_GRV),              KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
   _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
   _______, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KC_TAB,  KCX_LST, _______, KC_INSERT,
   _______, _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
-- 
cgit v1.2.3


From 7d698cc494f984d8e526a6fb29f838ae0166e909 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Mon, 24 Oct 2016 10:30:00 -0500
Subject: Added comments with ASCII art keymaps

---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 106 +++++++++++++++++++++-
 1 file changed, 105 insertions(+), 1 deletion(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index f7ef1174dc..4d46db69e0 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -45,6 +45,21 @@
 ; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ * Colemak-ModDH
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * |   Q  |   W  |   F  |   P  |   B  |                     |   J  |   L  |   U  |   Y  |   ;  |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |   A  |   R  |   S  |   T  |   G  |                     |   M  |   N  |   E  |   I  |   O  |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |Z Shft|   X  |   C  |   D  |   V  | ,------.   ,------. |   K  |   H  |   ,  |   .  |/ Shft|
+ * +------+------+------+------+------| | Ctrl |   |  Alt | +------+------+------+------+------|
+ * |  Esc |  Gui |  Tab |  Alt | Bksp | |  Del |   | Enter| |Sp/_NU|  _EX |   -  |   '  |   =  |
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
 [_CO] = KEYMAP(
   KC_Q,        KC_W,    KC_F,    KC_P,    KC_B,                                   KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
   KC_A,        KC_R,    KC_S,    KC_T,    KC_G,                                   KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
@@ -52,6 +67,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,      KC_LGUI, KC_TAB,  KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
+/*
+ * QWERTY
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * |   Q  |   W  |   E  |   R  |   T  |                     |   Y  |   U  |   I  |   O  |   P  |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |   A  |   S  |   D  |   F  |   G  |                     |   H  |   J  |   K  |   L  |   ;  |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |Z Shft|   X  |   C  |   V  |   B  | ,------.   ,------. |   N  |   M  |   ,  |   .  |/ Shft|
+ * +------+------+------+------+------| | Ctrl |   |  Alt | +------+------+------+------+------|
+ * |  Esc |  Gui |  Tab |  Alt | Bksp | |  Del |   | Enter| |Sp/_NU|  _EX |   -  |   '  |   =  |
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
 [_QW] = KEYMAP( /* Qwerty */
   KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,                                  KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
   KC_A,        KC_S,    KC_D,    KC_F,    KC_G,                                  KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
@@ -59,13 +88,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,      KC_LGUI, KC_TAB,  KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
+/*
+ * Extend
+ *
+ * Ctrl+` is a keyboard shortcut for the program ConEmu, which brings up a dropdown console window.
+ *
+ * Also note that some dual-role keys are overridden here with their modifiers
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * | Caps |      |      |      |Ctrl `|                     | PgUp | Home |   Up |  End |  Del |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |      |  Gui |  Alt | Ctrl |      |                     | PgDn | Left | Down | Right| Bksp |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * | Shift|  Cut | Copy |      | Paste| ,------.   ,------. |      | ^Tab |  Tab |      |Insert|
+ * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
+ * |      |      |      |      |      | |      |   |      | | Space|      |      |      |PrntSc|
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
 [_EX] = KEYMAP( /* Extend */
   KC_CAPS, _______, _______, _______, LCTL(KC_GRV),              KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
   _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
-  _______, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KC_TAB,  KCX_LST, _______, KC_INSERT,
+  KC_LSFT, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KCX_LST, KC_TAB,  _______, KC_INS,
   _______, _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
 ),
 
+/*
+ * Numbers and symbols
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * |   !  |   @  |   {  |   }  |   &  |                     |   /  |   7  |   8  |   9  |   *  |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |   #  |   $  |   (  |   )  |   ~  |                     |   |  |   4  |   5  |   6  |   -  |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |   %  |   ^  |   [  |   ]  |   `  | ,------.   ,------. |   \  |   1  |   2  |   3  |   +  |
+ * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
+ * |      |  _GA |      |  _FN |      | |      |   |      | |      |   0  |   .  |   =  |      |
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
 [_NU] = KEYMAP( /* Numbers and symbols */
   KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,                    KC_SLSH, KC_7,    KC_8,   KC_9,   KC_ASTR,
   KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TILD,                    KC_PIPE, KC_4,    KC_5,   KC_6,   KC_MINS,
@@ -73,6 +134,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, TG(_GA), _______, MO(_FN), _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
 ),
 
+/*
+ * Functions
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * |      |      |      |      |      |                     |      |  F7  |  F8  |  F9  |  F10 |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |      |      |      |      |      |                     |      |  F4  |  F5  |  F6  |  F11 |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |      | Vol ^| Mute | Vol v| Play | ,------.   ,------. |      |  F1  |  F2  |  F3  |  F12 |
+ * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
+ * |      |      |      |      | Stop | |      |   |      | |      |      | _CO  |  _GA | RESET|
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
 [_FN] = KEYMAP( /* Functions */
   KC_DEL,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
   KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,
@@ -80,6 +155,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, KC_MSTP, _______, _______, _______, KC_NO,   DF(_CO), DF(_QW), RESET
 ),
 
+/*
+ * Gaming
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * |      |      |      |      |      |                     |      |Whl Up|  MUp |Whl Dn|      |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |      |      |      |      |      |                     |      | MLeft| MDown|MRight|      |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |  Z   |      |      |      |      | ,------.   ,------. |MClick|      |      |      |      |
+ * +------+------+------+------+------| | Bksp |   |RClick| +------+------+------+------+------|
+ * |      |  _GA |      | Shift| Space| |      |   |      | |LClick|      |      |      |      |
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
 [_GA] = KEYMAP( /* Gaming */
   _______, _______, _______, _______, _______,                   _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
   _______, _______, _______, _______, _______,                   _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
@@ -87,6 +176,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, TG(_GA), _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
 )};
 
+/*
+ * Template
+ *
+ * ,----------------------------------.                     ,----------------------------------.
+ * |      |      |      |      |      |                     |      |      |      |      |      |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |      |      |      |      |      |                     |      |      |      |      |      |
+ * +------+------+------+------+------|                     +------+------+------+------+------|
+ * |      |      |      |      |      | ,------.   ,------. |      |      |      |      |      |
+ * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
+ * |      |      |      |      |      | |      |   |      | |      |      |      |      |      |
+ * `----------------------------------' `------'   `------' `----------------------------------'
+ *
+ */
+
 const uint16_t PROGMEM fn_actions[] = {
 
 };
-- 
cgit v1.2.3


From fe517245440a031112c8a2f2ebd46210bf0e5d83 Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Fri, 6 Jan 2017 19:56:11 -0600
Subject: Updated Atreus layout to 0.4

Removed Alt on base layer, replaced with Function layer.

Moved function keys to left hand.  Added mouse keys to right hand on the function layer.

Moved middle click on gaming layer to be consistent with mouse layer.

Added macro _USER. Macro contents are not implemented yet.
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 54 ++++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 4d46db69e0..d746b4722f 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -1,7 +1,7 @@
 /*
  * Keyboard: Atreus
  * Keymap:   replicaJunction
- * Version:  0.3
+ * Version:  0.4
  *
  * This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez.
  * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox. I now
@@ -42,6 +42,8 @@
 #define KX_PAST LCTL(KC_V)
 #define KX_UNDO LCTL(KC_Z)
 
+#define _USER 0 // User macro
+
 ; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -56,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * |Z Shft|   X  |   C  |   D  |   V  | ,------.   ,------. |   K  |   H  |   ,  |   .  |/ Shft|
  * +------+------+------+------+------| | Ctrl |   |  Alt | +------+------+------+------+------|
- * |  Esc |  Gui |  Tab |  Alt | Bksp | |  Del |   | Enter| |Sp/_NU|  _EX |   -  |   '  |   =  |
+ * |  Esc |  Gui |  Tab |  _FN | Bksp | |  Del |   | Enter| |Sp/_NU|  _EX |   -  |   '  |   =  |
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
@@ -64,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_Q,        KC_W,    KC_F,    KC_P,    KC_B,                                   KC_J,            KC_L,    KC_U,    KC_Y,    KC_SCLN,
   KC_A,        KC_R,    KC_S,    KC_T,    KC_G,                                   KC_M,            KC_N,    KC_E,    KC_I,    KC_O,
   SFT_T(KC_Z), KC_X,    KC_C,    KC_D,    KC_V,                                   KC_K,            KC_H,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
-  KC_ESC,      KC_LGUI, KC_TAB,  KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
+  KC_ESC,      KC_LGUI, KC_TAB,  MO(_FN), KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT),  LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 /*
@@ -77,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * |Z Shft|   X  |   C  |   V  |   B  | ,------.   ,------. |   N  |   M  |   ,  |   .  |/ Shft|
  * +------+------+------+------+------| | Ctrl |   |  Alt | +------+------+------+------+------|
- * |  Esc |  Gui |  Tab |  Alt | Bksp | |  Del |   | Enter| |Sp/_NU|  _EX |   -  |   '  |   =  |
+ * |  Esc |  Gui |  Tab |  _FN | Bksp | |  Del |   | Enter| |Sp/_NU|  _EX |   -  |   '  |   =  |
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
@@ -85,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_Q,        KC_W,    KC_E,    KC_R,    KC_T,                                  KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
   KC_A,        KC_S,    KC_D,    KC_F,    KC_G,                                  KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN,
   SFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                  KC_N,            KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_SLSH),
-  KC_ESC,      KC_LGUI, KC_TAB,  KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
+  KC_ESC,      KC_LGUI, KC_TAB,  MO(_FN), KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
 ),
 
 /*
@@ -96,21 +98,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Also note that some dual-role keys are overridden here with their modifiers
  *
  * ,----------------------------------.                     ,----------------------------------.
- * | Caps |      |      |      |Ctrl `|                     | PgUp | Home |   Up |  End |  Del |
+ * |      |      |      |      |Ctrl `|                     | PgUp | Home |   Up |  End |  Del |
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * |      |  Gui |  Alt | Ctrl |      |                     | PgDn | Left | Down | Right| Bksp |
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * | Shift|  Cut | Copy |      | Paste| ,------.   ,------. |      | ^Tab |  Tab |      |Insert|
- * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
- * |      |      |      |      |      | |      |   |      | | Space|      |      |      |PrntSc|
+ * +------+------+------+------+------| |  Del |   | Enter| +------+------+------+------+------|
+ * |      |      |      |      |      | |      |   |      | | Space|XXXXXX|      |      |PrntSc|
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
 [_EX] = KEYMAP( /* Extend */
-  KC_CAPS, _______, _______, _______, LCTL(KC_GRV),              KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
+  _______, _______, _______, _______, LCTL(KC_GRV),              KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
   _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
   KC_LSFT, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KCX_LST, KC_TAB,  _______, KC_INS,
-  _______, _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, KC_PSCR
+  _______, _______, _______, _______, _______, KC_DEL,  KC_ENT,  KC_SPC,  _______, _______, _______, KC_PSCR
 ),
 
 /*
@@ -123,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * |   %  |   ^  |   [  |   ]  |   `  | ,------.   ,------. |   \  |   1  |   2  |   3  |   +  |
  * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
- * |      |  _GA |      |  _FN |      | |      |   |      | |      |   0  |   .  |   =  |      |
+ * |      |  _GA |      |      |      | |      |   |      | |XXXXXX|   0  |   .  |   =  |      |
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
@@ -131,28 +133,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,                    KC_SLSH, KC_7,    KC_8,   KC_9,   KC_ASTR,
   KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TILD,                    KC_PIPE, KC_4,    KC_5,   KC_6,   KC_MINS,
   KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,                     KC_BSLS, KC_1,    KC_2,   KC_3,   KC_PLUS,
-  _______, TG(_GA), _______, MO(_FN), _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
+  _______, TG(_GA), _______, _______, _______, _______,  _______, _______, KC_0,    KC_DOT, KC_EQL, _______
 ),
 
 /*
  * Functions
  *
  * ,----------------------------------.                     ,----------------------------------.
- * |      |      |      |      |      |                     |      |  F7  |  F8  |  F9  |  F10 |
+ * | Caps |  F7  |  F8  |  F9  |  F10 |                     | _USER|Whl Up|  MUp |Whl Dn|      |
  * +------+------+------+------+------|                     +------+------+------+------+------|
- * |      |      |      |      |      |                     |      |  F4  |  F5  |  F6  |  F11 |
+ * |      |  F4  |  F5  |  F6  |  F11 |                     | Vol ^| MLeft| MDown|MRight|      |
  * +------+------+------+------+------|                     +------+------+------+------+------|
- * |      | Vol ^| Mute | Vol v| Play | ,------.   ,------. |      |  F1  |  F2  |  F3  |  F12 |
- * +------+------+------+------+------| |      |   |      | +------+------+------+------+------|
- * |      |      |      |      | Stop | |      |   |      | |      |      | _CO  |  _GA | RESET|
+ * |      |  F1  |  F2  |  F3  |  F12 | ,------.   ,------. | Vol v|      |      |      |      |
+ * +------+------+------+------+------| |      |   |RClick| +------+------+------+------+------|
+ * |      |      |      |XXXXXX|      | |      |   |      | |LClick|MClick| _CO  |  _GA | RESET|
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
 [_FN] = KEYMAP( /* Functions */
-  KC_DEL,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,
-  _______, KC_VOLU, KC_MUTE, KC_VOLD, KC_MPLY,                   _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-  _______, _______, _______, _______, KC_MSTP, _______, _______, _______, KC_NO,   DF(_CO), DF(_QW), RESET
+  KC_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,                    M(_USER),KC_WH_U, KC_MS_U, KC_WH_D, _______,
+  _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,                    KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_R, _______,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,                    KC_VOLD, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN3, DF(_CO), DF(_QW), RESET
 ),
 
 /*
@@ -163,17 +165,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * |      |      |      |      |      |                     |      | MLeft| MDown|MRight|      |
  * +------+------+------+------+------|                     +------+------+------+------+------|
- * |  Z   |      |      |      |      | ,------.   ,------. |MClick|      |      |      |      |
+ * |  Z   |      |      |      |      | ,------.   ,------. |      |      |      |      |      |
  * +------+------+------+------+------| | Bksp |   |RClick| +------+------+------+------+------|
- * |      |  _GA |      | Shift| Space| |      |   |      | |LClick|      |      |      |      |
+ * |      |  _GA |      | Shift| Space| |      |   |      | |LClick|MClick|      |      |      |
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
 [_GA] = KEYMAP( /* Gaming */
   _______, _______, _______, _______, _______,                   _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
   _______, _______, _______, _______, _______,                   _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
-  KC_Z,    _______, _______, _______, _______,                   KC_BTN3, _______, KC_MS_D, _______, _______,
-  _______, TG(_GA), _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______
+  KC_Z,    _______, _______, _______, _______,                   _______, _______, KC_MS_D, _______, _______,
+  _______, TG(_GA), _______, KC_LSFT, KC_SPC,  KC_BSPC, KC_BTN2, KC_BTN1, KC_BTN3, _______, _______, _______
 )};
 
 /*
@@ -199,7 +201,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
   // MACRODOWN only works in this function
       switch(id) {
-        case 0:
+        case _USER:
           if (record->event.pressed) {
             register_code(KC_RSFT);
           } else {
-- 
cgit v1.2.3


From 677ae86bdea2af7dcc35b17b0cea3e1e4374b4ca Mon Sep 17 00:00:00 2001
From: Joshua T <joshua@sonofone.net>
Date: Sat, 7 Jan 2017 13:07:55 -0600
Subject: Added another Shift on Extend layer.

This moves the GUI key to the pinkie, but honestly, I never use that function anyway.
---
 keyboards/atreus/keymaps/replicaJunction/keymap.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'keyboards/atreus/keymaps/replicaJunction/keymap.c')

diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index d746b4722f..d39a184d48 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,----------------------------------.                     ,----------------------------------.
  * |      |      |      |      |Ctrl `|                     | PgUp | Home |   Up |  End |  Del |
  * +------+------+------+------+------|                     +------+------+------+------+------|
- * |      |  Gui |  Alt | Ctrl |      |                     | PgDn | Left | Down | Right| Bksp |
+ * |  Gui | Shift|  Alt | Ctrl |      |                     | PgDn | Left | Down | Right| Bksp |
  * +------+------+------+------+------|                     +------+------+------+------+------|
  * | Shift|  Cut | Copy |      | Paste| ,------.   ,------. |      | ^Tab |  Tab |      |Insert|
  * +------+------+------+------+------| |  Del |   | Enter| +------+------+------+------+------|
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_EX] = KEYMAP( /* Extend */
   _______, _______, _______, _______, LCTL(KC_GRV),              KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
-  _______, KC_LGUI, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
+  KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, _______,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
   KC_LSFT, KX_CUT,  KX_COPY, _______, KX_PAST,                   _______, KCX_LST, KC_TAB,  _______, KC_INS,
   _______, _______, _______, _______, _______, KC_DEL,  KC_ENT,  KC_SPC,  _______, _______, _______, KC_PSCR
 ),
@@ -140,20 +140,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Functions
  *
  * ,----------------------------------.                     ,----------------------------------.
- * | Caps |  F7  |  F8  |  F9  |  F10 |                     | _USER|Whl Up|  MUp |Whl Dn|      |
+ * | Caps |  F9  |  F10 |  F11 |  F12 |                     | _USER|Whl Up|  MUp |Whl Dn|      |
  * +------+------+------+------+------|                     +------+------+------+------+------|
- * |      |  F4  |  F5  |  F6  |  F11 |                     | Vol ^| MLeft| MDown|MRight|      |
+ * |      |  F5  |  F6  |  F7  |  F8  |                     | Vol ^| MLeft| MDown|MRight|      |
  * +------+------+------+------+------|                     +------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F12 | ,------.   ,------. | Vol v|      |      |      |      |
+ * |      |  F1  |  F2  |  F3  |  F4  | ,------.   ,------. | Vol v|      |      |      |      |
  * +------+------+------+------+------| |      |   |RClick| +------+------+------+------+------|
  * |      |      |      |XXXXXX|      | |      |   |      | |LClick|MClick| _CO  |  _GA | RESET|
  * `----------------------------------' `------'   `------' `----------------------------------'
  *
  */
 [_FN] = KEYMAP( /* Functions */
-  KC_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,                    M(_USER),KC_WH_U, KC_MS_U, KC_WH_D, _______,
-  _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,                    KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_R, _______,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,                    KC_VOLD, _______, _______, _______, _______,
+  KC_CAPS, KC_F9,   KC_F10,  KC_F11,  KC_F12,                    M(_USER),KC_WH_U, KC_MS_U, KC_WH_D, _______,
+  _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,                     KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_R, _______,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,                     KC_VOLD, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN3, DF(_CO), DF(_QW), RESET
 ),
 
-- 
cgit v1.2.3