Submit/ergo42 default keymap update (#2890)

* Add new default keymap for Ergo42. * Rename keymap names * Update TAPPING_TERM
author: Biacco42 <secondimpact_2000@yahoo.co.jp> 2018-05-05 02:24:35 +0900
committer: Drashna Jaelre <drashna@live.com> 2018-05-04 10:24:35 -0700
commit: f969d5ed2870b54a80a0faa6f38eb21d4608e12d (patch)
tree: a29ec17ded7c46a263f5e27cbdd0cec9b4809467
parent: 87612df54b01f826dd2059eafeb985d0d68523a4 (diff)
download: qmk_firmware-f969d5ed2870b54a80a0faa6f38eb21d4608e12d.tar.gz
qmk_firmware-f969d5ed2870b54a80a0faa6f38eb21d4608e12d.zip
8 files changed, 163 insertions, 48 deletions
diff --git a/keyboards/ergo42/keymaps/default-macOS/config.h b/keyboards/ergo42/keymaps/biacco-macOS/config.h
index 5a6261c4f..5a6261c4f 100644
--- a/keyboards/ergo42/keymaps/default-macOS/config.h
+++ b/keyboards/ergo42/keymaps/biacco-macOS/config.h
diff --git a/keyboards/ergo42/keymaps/default-macOS/keymap.c b/keyboards/ergo42/keymaps/biacco-macOS/keymap.c
index 559551fd6..559551fd6 100644
--- a/keyboards/ergo42/keymaps/default-macOS/keymap.c
+++ b/keyboards/ergo42/keymaps/biacco-macOS/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-macOS/rules.mk b/keyboards/ergo42/keymaps/biacco-macOS/rules.mk
index 457a3d01d..457a3d01d 100644
--- a/keyboards/ergo42/keymaps/default-macOS/rules.mk
+++ b/keyboards/ergo42/keymaps/biacco-macOS/rules.mk
diff --git a/keyboards/ergo42/keymaps/biacco/config.h b/keyboards/ergo42/keymaps/biacco/config.h
new file mode 100644
index 000000000..5a6261c4f
--- /dev/null
+++ b/keyboards/ergo42/keymaps/biacco/config.h
@@ -0,0 +1,37 @@
+/*
+This is the c configuration file for the keymap
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+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 CONFIG_USER_H
+#define CONFIG_USER_H
+#include "../../config.h"
+/* Use I2C or Serial, not both */
+#define USE_SERIAL
+// #define USE_I2C
+/* Select hand configuration */
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+#endif
diff --git a/keyboards/ergo42/keymaps/biacco/keymap.c b/keyboards/ergo42/keymaps/biacco/keymap.c
new file mode 100644
index 000000000..704cd47e1
--- /dev/null
+++ b/keyboards/ergo42/keymaps/biacco/keymap.c
@@ -0,0 +1,98 @@
+#include "ergo42.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+extern keymap_config_t keymap_config;
+#define BASE 0
+#define META 1
+#define SYMB 2
+#define GAME 3
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* BASE
+ * ,------------------------------------------------.   ,------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
+ * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
+ * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
+ * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+ * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
+ * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+ * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
+ * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
+ * `------------------------------------------------'   `------------------------------------------------'
+ */
+[BASE] = KEYMAP( \
+  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
+  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
+  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DELT, KC_PSCR,  TG(GAME), TG(SYMB), KC_JYEN \
+),
+/* META
+ * ,------------------------------------------------.   ,------------------------------------------------.
+ * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
+ * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
+ * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
+ * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+ * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
+ * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+ * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
+ * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
+ * `------------------------------------------------'   `------------------------------------------------'
+ */
+[META] = KEYMAP( \
+  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_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+  _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+),
+/* SYMB
+ * ,------------------------------------------------.   ,------------------------------------------------.
+ * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
+ * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
+ * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
+ * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+ * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
+ * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+ * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
+ * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
+ * `------------------------------------------------'   `------------------------------------------------'
+ */
+[SYMB] = KEYMAP( \
+  S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
+),
+/* GAME
+ * ,------------------------------------------------.   ,------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
+ * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
+ * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
+ * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
+ * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
+ * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
+ * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
+ * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
+ * `------------------------------------------------'   `------------------------------------------------'
+ */
+[GAME] = KEYMAP( \
+  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
+  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
+  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DELT, KC_PSCR,  _______, _______, KC_JYEN \
+)
+};
diff --git a/keyboards/ergo42/keymaps/biacco/rules.mk b/keyboards/ergo42/keymaps/biacco/rules.mk
new file mode 100644
index 000000000..457a3d01d
--- /dev/null
+++ b/keyboards/ergo42/keymaps/biacco/rules.mk
@@ -0,0 +1,3 @@
+ifndef QUANTUM_DIR
+        include ../../../../Makefile
+endif
diff --git a/keyboards/ergo42/keymaps/default/keymap.c b/keyboards/ergo42/keymaps/default/keymap.c
index 704cd47e1..c06cda5db 100644
--- a/keyboards/ergo42/keymaps/default/keymap.c
+++ b/keyboards/ergo42/keymaps/default/keymap.c
@@ -17,82 +17,59 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* BASE
 * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
+ * | ESC  | Tab  |   Q  |   W  |   E  |   R  |  T   |   |  Y   |   U  |   I  |   O  |   P  |   [  | Bksp |
 * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
+ * | Del  | RCtrl|   A  |   S  |   D  |   F  |  G   |   |  H   |   J  |   K  |   L  |   ;  |   ]  | Enter|
 * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
+ * | SYMB | LSft |   Z  |   X  |   C  |   V  |  B   |   |  N   |   M  |   ,  |   .  |   /  |  UP  | RSft |
 * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
+ * | META | LCtrl|   `  |   \  | LAlt | LGUI |Space |   |Space |   '  |   -  |   =  | LEFT | DOWN | RIGHT|
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
 * `------------------------------------------------'   `------------------------------------------------'
 */
 [BASE] = KEYMAP( \
-  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC, \
+  KC_ESC,   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_BSPC, \
-  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT, \
+  KC_DELT,  KC_RCTL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_RBRC, KC_ENT, \
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_RO), \
+  MO(SYMB), KC_LSFT, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_UP,   KC_RSFT, \
-  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DELT, KC_PSCR,  TG(GAME), TG(SYMB), KC_JYEN \
+  MO(META), KC_LCTL, KC_GRV, KC_BSLS, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_QUOT, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RGHT \
 ),
 /* META
 * ,------------------------------------------------.   ,------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
+ * | Reset|   1  |   2  |   3  |   4  |   5  |  [   |   |  ]   |   6  |   7  |   8  |   9  |   0  | Bksp |
 * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
+ * | Del  |  F1  |      |Muhen | Henk |      |      |   | Left | Down |  Up  |Right |      |      | Enter|
 * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
+ * | SYMB |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  | F12  |
 * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
+ * | META | LCtrl|   `  |   \  | LAlt | LGUI |Space |   |Space |   '  |   -  |   =  |      |      |      |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
 * `------------------------------------------------'   `------------------------------------------------'
 */
 [META] = KEYMAP( \
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL, \
+  RESET,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LBRC,    KC_RBRC,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
-  _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
+  _______, KC_F1,   XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, XXXXXXX,    KC_LEFT,    KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, \
-  _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_RO), \
+  _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   S(KC_LBRC), S(KC_RBRC), KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
+  _______, _______, _______, _______, _______, _______, _______,    _______,    _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \
 ),
 /* SYMB
 * ,------------------------------------------------.   ,------------------------------------------------.
- * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
+ * | ESC  |   !  |   @  |   #  |   $  |   %  |  [   |   |  ]   |   ^  |   &  |   *  |   (  |   )  | Bksp |
 * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
+ * | Del  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |      | Enter|
 * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
+ * | SYMB |      |      |      |      |      |  {   |   |  }   |      |      |      |      |  UP  | Sft  |
 * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
+ * | META | LCtrl|   `  |   \  | LAlt | LGUI |Space |   |Space |   '  |   -  |   =  | LEFT | DOWN | RIGHT|
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
 * `------------------------------------------------'   `------------------------------------------------'
 */
 [SYMB] = KEYMAP( \
-  S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL), \
+  _______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_LBRC,    KC_RBRC,    S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______, \
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT), \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_9),    S(KC_0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_LBRC), S(KC_RBRC), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, \
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______ \
+  _______, _______, _______, _______, _______, _______, _______,    _______,    _______, _______, _______, _______, _______, _______ \
-),
-/* GAME
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
- * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-[GAME] = KEYMAP( \
-  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC, \
-  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_RO), \
-  KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DELT, KC_PSCR,  _______, _______, KC_JYEN \
 )
 };
diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/ergo42/rev1/config.h
index 51cff095c..1a674a858 100644
--- a/keyboards/ergo42/rev1/config.h
+++ b/keyboards/ergo42/rev1/config.h
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CATERINA_BOOTLOADER
 /* define tapping term */
-#define TAPPING_TERM 120
+#define TAPPING_TERM 100
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
author	Biacco42 <secondimpact_2000@yahoo.co.jp>	2018-05-05 02:24:35 +0900
committer	Drashna Jaelre <drashna@live.com>	2018-05-04 10:24:35 -0700
commit	f969d5ed2870b54a80a0faa6f38eb21d4608e12d (patch)
tree	a29ec17ded7c46a263f5e27cbdd0cec9b4809467
parent	87612df54b01f826dd2059eafeb985d0d68523a4 (diff)
download	qmk_firmware-f969d5ed2870b54a80a0faa6f38eb21d4608e12d.tar.gz qmk_firmware-f969d5ed2870b54a80a0faa6f38eb21d4608e12d.zip

diff --git a/keyboards/ergo42/keymaps/default-macOS/config.h b/keyboards/ergo42/keymaps/biacco-macOS/config.h index 5a6261c4f..5a6261c4f 100644 --- a/keyboards/ergo42/keymaps/default-macOS/config.h +++ b/keyboards/ergo42/keymaps/biacco-macOS/config.h


diff --git a/keyboards/ergo42/keymaps/default-macOS/keymap.c b/keyboards/ergo42/keymaps/biacco-macOS/keymap.c index 559551fd6..559551fd6 100644 --- a/keyboards/ergo42/keymaps/default-macOS/keymap.c +++ b/keyboards/ergo42/keymaps/biacco-macOS/keymap.c


diff --git a/keyboards/ergo42/keymaps/default-macOS/rules.mk b/keyboards/ergo42/keymaps/biacco-macOS/rules.mk index 457a3d01d..457a3d01d 100644 --- a/keyboards/ergo42/keymaps/default-macOS/rules.mk +++ b/keyboards/ergo42/keymaps/biacco-macOS/rules.mk


diff --git a/keyboards/ergo42/keymaps/biacco/config.h b/keyboards/ergo42/keymaps/biacco/config.h new file mode 100644 index 000000000..5a6261c4f --- /dev/null +++ b/keyboards/ergo42/keymaps/biacco/config.h
@@ -0,0 +1,37 @@
		1	/*
		2	This is the c configuration file for the keymap
		3
		4	Copyright 2012 Jun Wako <wakojun@gmail.com>
		5	Copyright 2015 Jack Humbert
		6
		7	This program is free software: you can redistribute it and/or modify
		8	it under the terms of the GNU General Public License as published by
		9	the Free Software Foundation, either version 2 of the License, or
		10	(at your option) any later version.
		11
		12	This program is distributed in the hope that it will be useful,
		13	but WITHOUT ANY WARRANTY; without even the implied warranty of
		14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	GNU General Public License for more details.
		16
		17	You should have received a copy of the GNU General Public License
		18	along with this program. If not, see <http://www.gnu.org/licenses/>.
		19	*/
		20
		21	#ifndef CONFIG_USER_H
		22	#define CONFIG_USER_H
		23
		24	#include "../../config.h"
		25
		26	/* Use I2C or Serial, not both */
		27
		28	#define USE_SERIAL
		29	// #define USE_I2C
		30
		31	/* Select hand configuration */
		32
		33	#define MASTER_LEFT
		34	// #define MASTER_RIGHT
		35	// #define EE_HANDS
		36
		37	#endif


diff --git a/keyboards/ergo42/keymaps/biacco/keymap.c b/keyboards/ergo42/keymaps/biacco/keymap.c new file mode 100644 index 000000000..704cd47e1 --- /dev/null +++ b/keyboards/ergo42/keymaps/biacco/keymap.c
@@ -0,0 +1,98 @@
		1	#include "ergo42.h"
		2	#include "action_layer.h"
		3	#include "eeconfig.h"
		4
		5	extern keymap_config_t keymap_config;
		6
		7	#define BASE 0
		8	#define META 1
		9	#define SYMB 2
		10	#define GAME 3
		11
		12	// Fillers to make layering more clear
		13	#define _______ KC_TRNS
		14	#define XXXXXXX KC_NO
		15
		16	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		17
		18	/* BASE
		19	* ,------------------------------------------------. ,------------------------------------------------.
		20	* \| Tab \| Q \| W \| E \| R \| T \| [ \| \| ] \| Y \| U \| I \| O \| P \| @ \|
		21	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
		22	* \| Alt \| A \| S \| D \| F \| G \| ( \| \| ) \| H \| J \| K \| L \| ; \| : \|
		23	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
		24	* \| Sft \| Z \| X \| C \| V \| B \| { \| \| } \| N \| M \| , \| . \| / \|\/Sft \|
		25	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
		26	* \| Ctrl \| GUI \| App \|PrtSc \|ESC/ \|Space/\|Tab/ \| \|Back \|Enter/\| Del \|PrtSc \|=>GAME\|=>SYMB\| \ \|
		27	* \| \| \| \| \|~SYMB \|RCtrl \|Shift \| \|Space \|~META \| \| \| \| \| \|
		28	* `------------------------------------------------' `------------------------------------------------'
		29	*/
		30
		31	[BASE] = KEYMAP( \
		32	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_RBRC, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, \
		33	KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, S(KC_8), S(KC_9), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
		34	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, S(KC_RBRC), S(KC_BSLS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_RO), \
		35	KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC, LT(META, KC_ENT), KC_DELT, KC_PSCR, TG(GAME), TG(SYMB), KC_JYEN \
		36	),
		37
		38	/* META
		39	* ,------------------------------------------------. ,------------------------------------------------.
		40	* \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| [ \| \| ] \| 7 \| 8 \| 9 \| 0 \| - \| ^ \|
		41	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
		42	* \| Alt \| F1 \| \|Muhen \| Henk \| \| ( \| \| ) \| Left \| Down \| Up \|Right \| \| \|
		43	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
		44	* \| Sft \| F2 \| F3 \| F4 \| F5 \| F6 \| { \| \| } \| F7 \| F8 \| F9 \| F10 \| F11 \|\/Sft \|
		45	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
		46	* \| Ctrl \| GUI \| App \|PrtSc \|ESC/ \|Space/\|Tab/ \| \|Back \|Enter/\| Del \|Reset \|=>GAME\|=>SYMB\| \ \|
		47	* \| \| \| \| \|~SYMB \|RCtrl \|Shift \| \|Space \|~META \| \| \| \| \| \|
		48	* `------------------------------------------------' `------------------------------------------------'
		49	*/
		50
		51	[META] = KEYMAP( \
		52	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \
		53	_______, KC_F1, XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \
		54	_______, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, SFT_T(KC_RO), \
		55	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \
		56	),
		57
		58	/* SYMB
		59	* ,------------------------------------------------. ,------------------------------------------------.
		60	* \| ! \| " \| # \| $ \| % \| & \| [ \| \| ] \| ' \| ( \| ) \| ~ \| = \| ~ \|
		61	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
		62	* \| Alt \| \| \| \| \| \| ( \| \| ) \| \| \| \| \| + \| * \|
		63	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
		64	* \| Sft \| \| \| \| \| \| { \| \| } \| \| \| < \| > \| ? \| \ \|
		65	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
		66	* \| Ctrl \| GUI \| App \|PrtSc \|ESC/ \|Space/\|Tab/ \| \|Back \|Enter/\| Del \|PrtSc \|=>GAME\|=>SYMB\| \ \|
		67	* \| \| \| \| \|~SYMB \|RCtrl \|Shift \| \|Space \|~META \| \| \| \| \| \|
		68	* `------------------------------------------------' `------------------------------------------------'
		69	*/
		70
		71	[SYMB] = KEYMAP( \
		72	S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS), S(KC_EQL), \
		73	_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_SCLN), S(KC_QUOT), \
		74	_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \
		75	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
		76	),
		77
		78	/* GAME
		79	* ,------------------------------------------------. ,------------------------------------------------.
		80	* \| Tab \| Q \| W \| E \| R \| T \| [ \| \| ] \| Y \| U \| I \| O \| P \| @ \|
		81	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
		82	* \| Alt \| A \| S \| D \| F \| G \| ( \| \| ) \| H \| J \| K \| L \| ; \| : \|
		83	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
		84	* \| Sft \| Z \| X \| C \| V \| B \| { \| \| } \| N \| M \| , \| . \| / \|\/Sft \|
		85	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
		86	* \| Ctrl \| GUI \| App \|PrtSc \| ESC \|Space \|Tab \| \|Back \|Enter \| Del \|PrtSc \|=>GAME\|=>SYMB\| \ \|
		87	* \| \| \| \| \| \| \| \| \|Space \| \| \| \| \| \| \|
		88	* `------------------------------------------------' `------------------------------------------------'
		89	*/
		90	[GAME] = KEYMAP( \
		91	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_RBRC, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, \
		92	KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, S(KC_8), S(KC_9), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
		93	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, S(KC_RBRC), S(KC_BSLS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_RO), \
		94	KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB, KC_BSPC, KC_ENT, KC_DELT, KC_PSCR, _______, _______, KC_JYEN \
		95	)
		96
		97	};
		98


diff --git a/keyboards/ergo42/keymaps/biacco/rules.mk b/keyboards/ergo42/keymaps/biacco/rules.mk new file mode 100644 index 000000000..457a3d01d --- /dev/null +++ b/keyboards/ergo42/keymaps/biacco/rules.mk
@@ -0,0 +1,3 @@
		1	ifndef QUANTUM_DIR
		2	include ../../../../Makefile
		3	endif


diff --git a/keyboards/ergo42/keymaps/default/keymap.c b/keyboards/ergo42/keymaps/default/keymap.c index 704cd47e1..c06cda5db 100644 --- a/keyboards/ergo42/keymaps/default/keymap.c +++ b/keyboards/ergo42/keymaps/default/keymap.c
@@ -17,82 +17,59 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17		17
18	/* BASE	18	/* BASE
19	* ,------------------------------------------------. ,------------------------------------------------.	19	* ,------------------------------------------------. ,------------------------------------------------.
20	* \| Tab \| Q \| W \| E \| R \| T \| [ \| \| ] \| Y \| U \| I \| O \| P \| @ \|	20	* \| ESC \| Tab \| Q \| W \| E \| R \| T \| \| Y \| U \| I \| O \| P \| [ \| Bksp \|
21	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|	21	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
22	* \| Alt \| A \| S \| D \| F \| G \| ( \| \| ) \| H \| J \| K \| L \| ; \| : \|	22	* \| Del \| RCtrl\| A \| S \| D \| F \| G \| \| H \| J \| K \| L \| ; \| ] \| Enter\|
23	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|	23	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
24	* \| Sft \| Z \| X \| C \| V \| B \| { \| \| } \| N \| M \| , \| . \| / \|\/Sft \|	24	* \| SYMB \| LSft \| Z \| X \| C \| V \| B \| \| N \| M \| , \| . \| / \| UP \| RSft \|
25	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|	25	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
26	* \| Ctrl \| GUI \| App \|PrtSc \|ESC/ \|Space/\|Tab/ \| \|Back \|Enter/\| Del \|PrtSc \|=>GAME\|=>SYMB\| \ \|	26	* \| META \| LCtrl\| ` \| \ \| LAlt \| LGUI \|Space \| \|Space \| ' \| - \| = \| LEFT \| DOWN \| RIGHT\|
27	* \| \| \| \| \|~SYMB \|RCtrl \|Shift \| \|Space \|~META \| \| \| \| \| \|
28	* `------------------------------------------------' `------------------------------------------------'	27	* `------------------------------------------------' `------------------------------------------------'
29	*/	28	*/
30		29
31	[BASE] = KEYMAP( \	30	[BASE] = KEYMAP( \
32	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_RBRC, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, \	31	KC_ESC, 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_BSPC, \
33	KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, S(KC_8), S(KC_9), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \	32	KC_DELT, KC_RCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_RBRC, KC_ENT, \
34	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, S(KC_RBRC), S(KC_BSLS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_RO), \	33	MO(SYMB), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, \
35	KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC, LT(META, KC_ENT), KC_DELT, KC_PSCR, TG(GAME), TG(SYMB), KC_JYEN \	34	MO(META), KC_LCTL, KC_GRV, KC_BSLS, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_QUOT, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RGHT \
36	),	35	),
37		36
38	/* META	37	/* META
39	* ,------------------------------------------------. ,------------------------------------------------.	38	* ,------------------------------------------------. ,------------------------------------------------.
40	* \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| [ \| \| ] \| 7 \| 8 \| 9 \| 0 \| - \| ^ \|	39	* \| Reset\| 1 \| 2 \| 3 \| 4 \| 5 \| [ \| \| ] \| 6 \| 7 \| 8 \| 9 \| 0 \| Bksp \|
41	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|	40	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
42	* \| Alt \| F1 \| \|Muhen \| Henk \| \| ( \| \| ) \| Left \| Down \| Up \|Right \| \| \|	41	* \| Del \| F1 \| \|Muhen \| Henk \| \| \| \| Left \| Down \| Up \|Right \| \| \| Enter\|
43	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|	42	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
44	* \| Sft \| F2 \| F3 \| F4 \| F5 \| F6 \| { \| \| } \| F7 \| F8 \| F9 \| F10 \| F11 \|\/Sft \|	43	* \| SYMB \| F2 \| F3 \| F4 \| F5 \| F6 \| { \| \| } \| F7 \| F8 \| F9 \| F10 \| F11 \| F12 \|
45	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|	44	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
46	* \| Ctrl \| GUI \| App \|PrtSc \|ESC/ \|Space/\|Tab/ \| \|Back \|Enter/\| Del \|Reset \|=>GAME\|=>SYMB\| \ \|	45	* \| META \| LCtrl\| ` \| \ \| LAlt \| LGUI \|Space \| \|Space \| ' \| - \| = \| \| \| \|
47	* \| \| \| \| \|~SYMB \|RCtrl \|Shift \| \|Space \|~META \| \| \| \| \| \|
48	* `------------------------------------------------' `------------------------------------------------'	46	* `------------------------------------------------' `------------------------------------------------'
49	*/	47	*/
50		48
51	[META] = KEYMAP( \	49	[META] = KEYMAP( \
52	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \	50	RESET, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
53	_______, KC_F1, XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, \	51	_______, KC_F1, XXXXXXX, KC_MHEN, KC_HENK, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, \
54	_______, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, SFT_T(KC_RO), \	52	_______, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, S(KC_LBRC), S(KC_RBRC), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
55	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______ \	53	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \
56	),	54	),
57		55
58	/* SYMB	56	/* SYMB
59	* ,------------------------------------------------. ,------------------------------------------------.	57	* ,------------------------------------------------. ,------------------------------------------------.
60	* \| ! \| " \| # \| $ \| % \| & \| [ \| \| ] \| ' \| ( \| ) \| ~ \| = \| ~ \|	58	* \| ESC \| ! \| @ \| # \| $ \| % \| [ \| \| ] \| ^ \| & \| * \| ( \| ) \| Bksp \|
61	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|	59	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
62	* \| Alt \| \| \| \| \| \| ( \| \| ) \| \| \| \| \| + \| * \|	60	* \| Del \| \| \| \| \| \| ( \| \| ) \| \| \| \| \| \| Enter\|
63	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|	61	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
64	* \| Sft \| \| \| \| \| \| { \| \| } \| \| \| < \| > \| ? \| \ \|	62	* \| SYMB \| \| \| \| \| \| { \| \| } \| \| \| \| \| UP \| Sft \|
65	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|	63	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
66	* \| Ctrl \| GUI \| App \|PrtSc \|ESC/ \|Space/\|Tab/ \| \|Back \|Enter/\| Del \|PrtSc \|=>GAME\|=>SYMB\| \ \|	64	* \| META \| LCtrl\| ` \| \ \| LAlt \| LGUI \|Space \| \|Space \| ' \| - \| = \| LEFT \| DOWN \| RIGHT\|
67	* \| \| \| \| \|~SYMB \|RCtrl \|Shift \| \|Space \|~META \| \| \| \| \| \|
68	* `------------------------------------------------' `------------------------------------------------'	65	* `------------------------------------------------' `------------------------------------------------'
69	*/	66	*/
70		67
71	[SYMB] = KEYMAP( \	68	[SYMB] = KEYMAP( \
72	S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS), S(KC_EQL), \	69	_______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_LBRC, KC_RBRC, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______, \
73	_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_SCLN), S(KC_QUOT), \	70	_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_9), S(KC_0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
74	_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_RO), \	71	_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_LBRC), S(KC_RBRC), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, \
75	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \	72	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
76	),
77
78	/* GAME
79	* ,------------------------------------------------. ,------------------------------------------------.
80	* \| Tab \| Q \| W \| E \| R \| T \| [ \| \| ] \| Y \| U \| I \| O \| P \| @ \|
81	* \|------+------+------+------+------+------+------\| \|-------------+------+------+------+------+------\|
82	* \| Alt \| A \| S \| D \| F \| G \| ( \| \| ) \| H \| J \| K \| L \| ; \| : \|
83	* \|------+------+------+------+------+------+------\| \|------\|------+------+------+------+------+------\|
84	* \| Sft \| Z \| X \| C \| V \| B \| { \| \| } \| N \| M \| , \| . \| / \|\/Sft \|
85	* \|------+------+------+------+------+------+------\| \|------+------+------+------+------+------+------\|
86	* \| Ctrl \| GUI \| App \|PrtSc \| ESC \|Space \|Tab \| \|Back \|Enter \| Del \|PrtSc \|=>GAME\|=>SYMB\| \ \|
87	* \| \| \| \| \| \| \| \| \|Space \| \| \| \| \| \| \|
88	* `------------------------------------------------' `------------------------------------------------'
89	*/
90	[GAME] = KEYMAP( \
91	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_RBRC, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, \
92	KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, S(KC_8), S(KC_9), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
93	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, S(KC_RBRC), S(KC_BSLS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_RO), \
94	KC_LCTRL, KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB, KC_BSPC, KC_ENT, KC_DELT, KC_PSCR, _______, _______, KC_JYEN \
95	)	73	)
96
97	};	74	};
98		75


diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/ergo42/rev1/config.h index 51cff095c..1a674a858 100644 --- a/keyboards/ergo42/rev1/config.h +++ b/keyboards/ergo42/rev1/config.h
@@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
43	#define CATERINA_BOOTLOADER	43	#define CATERINA_BOOTLOADER
44		44
45	/* define tapping term */	45	/* define tapping term */
46	#define TAPPING_TERM 120	46	#define TAPPING_TERM 100
47		47
48	/* define if matrix has ghost */	48	/* define if matrix has ghost */
49	//#define MATRIX_HAS_GHOST	49	//#define MATRIX_HAS_GHOST