summaryrefslogtreecommitdiff
path: root/keyboards/gboards/ergotaco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gboards/ergotaco')
-rw-r--r--keyboards/gboards/ergotaco/config.h5
-rw-r--r--keyboards/gboards/ergotaco/info.json2
-rw-r--r--keyboards/gboards/ergotaco/matrix.c4
-rw-r--r--keyboards/gboards/ergotaco/rules.mk6
4 files changed, 4 insertions, 13 deletions
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index 21d14144d9..3274a5ab92 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Copy and worked on with love from the EZ team
#pragma once
-#include "config_common.h"
#define VERBOSE
@@ -35,9 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
#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.)
@@ -49,5 +45,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key combination for command */
#define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT)
-#define DEBOUNCE 5
#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index bd1863288e..163b76db19 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -8,6 +8,8 @@
"pid": "0x1337",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 7e5d675218..1bab5e8981 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -112,7 +112,7 @@ void matrix_init(void)
}
}
- matrix_init_quantum();
+ matrix_init_kb();
}
void matrix_power_up(void) {
@@ -188,7 +188,7 @@ uint8_t matrix_scan(void)
unselect_rows();
}
- matrix_scan_quantum();
+ matrix_scan_kb();
#ifdef DEBUG_MATRIX
for (uint8_t c = 0; c < MATRIX_COLS; c++)
diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
index db236477b0..2df8900c2d 100644
--- a/keyboards/gboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
CUSTOM_MATRIX = yes
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes