summaryrefslogtreecommitdiff
path: root/keyboards/gboards/ergotaco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gboards/ergotaco')
-rw-r--r--keyboards/gboards/ergotaco/config.h1
-rw-r--r--keyboards/gboards/ergotaco/ergotaco.c2
-rw-r--r--keyboards/gboards/ergotaco/ergotaco.h20
-rw-r--r--keyboards/gboards/ergotaco/info.json61
-rw-r--r--keyboards/gboards/ergotaco/matrix.c7
5 files changed, 15 insertions, 76 deletions
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index 3274a5ab92..ba0078e71b 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index ecab74b3a2..daeba1e0a6 100644
--- a/keyboards/gboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
bool i2c_initialized = 0;
i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
index 5a0cd5e8fb..e23fc264f4 100644
--- a/keyboards/gboards/ergotaco/ergotaco.h
+++ b/keyboards/gboards/ergotaco/ergotaco.h
@@ -26,23 +26,3 @@ extern i2c_status_t mcp23018_status;
void init_ergodox(void);
uint8_t init_mcp23018(void);
-
-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
-#define LAYOUT( \
- L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05) \
- \
- /* matrix positions */ \
- { \
- {R00}, \
- {R01}, \
- {R02}, \
- {R03}, \
- {R04}, \
- {R05}, \
- {L05}, \
- {L04}, \
- {L03}, \
- {L02}, \
- {L01}, \
- {L00}, \
-}
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 163b76db19..1de1f3ab85 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -13,54 +13,19 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "x": 0,
- "y": 1.25
- },
- {
- "x": 1,
- "y": 0.75
- },
- {
- "x": 2,
- "y": 0.5
- },
- {
- "x": 3,
- "y": 0.25
- },
- {
- "x": 4,
- "y": 1
- },
- {
- "x": 5,
- "y": 1.75
- },
- {
- "x": 7,
- "y": 1.75
- },
- {
- "x": 8,
- "y": 1
- },
- {
- "x": 9,
- "y": 0.25
- },
- {
- "x": 10,
- "y": 0.5
- },
- {
- "x": 11,
- "y": 0.75
- },
- {
- "x": 12,
- "y": 1.25
- }
+ {"matrix": [11, 0], "x": 0, "y": 1},
+ {"matrix": [10, 0], "x": 1, "y": 0.5},
+ {"matrix": [9, 0], "x": 2, "y": 0.25},
+ {"matrix": [8, 0], "x": 3, "y": 0},
+ {"matrix": [7, 0], "x": 4, "y": 0.75},
+ {"matrix": [6, 0], "x": 5, "y": 1.5},
+
+ {"matrix": [0, 0], "x": 7, "y": 1.5},
+ {"matrix": [1, 0], "x": 8, "y": 0.75},
+ {"matrix": [2, 0], "x": 9, "y": 0},
+ {"matrix": [3, 0], "x": 10, "y": 0.25},
+ {"matrix": [4, 0], "x": 11, "y": 0.5},
+ {"matrix": [5, 0], "x": 12, "y": 1}
]
}
}
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 1bab5e8981..63d4c4f5f3 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -17,15 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
#include "wait.h"
-#include "action_layer.h"
-#include "print.h"
#include "debug.h"
#include "util.h"
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5