aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergo42
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergo42')
-rw-r--r--keyboards/ergo42/keymaps/biacco-macOS/config.h (renamed from keyboards/ergo42/keymaps/default-macOS/config.h)0
-rw-r--r--keyboards/ergo42/keymaps/biacco-macOS/keymap.c (renamed from keyboards/ergo42/keymaps/default-macOS/keymap.c)0
-rw-r--r--keyboards/ergo42/keymaps/biacco-macOS/rules.mk (renamed from keyboards/ergo42/keymaps/default-macOS/rules.mk)0
-rw-r--r--keyboards/ergo42/keymaps/biacco/config.h37
-rw-r--r--keyboards/ergo42/keymaps/biacco/keymap.c98
-rw-r--r--keyboards/ergo42/keymaps/biacco/rules.mk3
-rw-r--r--keyboards/ergo42/keymaps/default/keymap.c71
-rw-r--r--keyboards/ergo42/rev1/config.h2
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| \ |
- * | | | | |~SYMB |RCtrl |Shift | |Space |~META | | | | | |
+ * | META | LCtrl| ` | \ | LAlt | LGUI |Space | |Space | ' | - | = | LEFT | DOWN | RIGHT|
* `------------------------------------------------' `------------------------------------------------'
*/
[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 \
+ 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_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, \
+ 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, \
+ 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| \ |
- * | | | | |~SYMB |RCtrl |Shift | |Space |~META | | | | | |
+ * | META | LCtrl| ` | \ | LAlt | LGUI |Space | |Space | ' | - | = | | | |
* `------------------------------------------------' `------------------------------------------------'
*/
[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, _______, _______, _______ \
+ 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, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, \
+ _______, 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, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 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| \ |
- * | | | | |~SYMB |RCtrl |Shift | |Space |~META | | | | | |
+ * | META | LCtrl| ` | \ | LAlt | LGUI |Space | |Space | ' | - | = | LEFT | DOWN | RIGHT|
* `------------------------------------------------' `------------------------------------------------'
*/
[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 \
+ _______, 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, S(KC_9), S(KC_0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, S(KC_LBRC), S(KC_RBRC), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
)
-
};
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