summaryrefslogtreecommitdiffstats
path: root/keyboards/gergo/gergo.h
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-04-26 17:24:00 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-04-26 17:24:00 -0700
commit8faee5c9f67e9a5389754f90ded6983e669aae15 (patch)
tree1e3a1eb1a65e01a0c22aaafaeccc1fd657ce7a4b /keyboards/gergo/gergo.h
parentffd10d41168a7bf3eb2631490c61fb7a552fa6a6 (diff)
[Keyboard] Update Gergo to use newer Ergodox Matrix code (#5703)
* [Keyboard] Update Gergo to use newer Ergodox Matrix code And update layout macros to be correct * Almost forgot the json file * Remove board specific defines for i2c timeout
Diffstat (limited to 'keyboards/gergo/gergo.h')
-rw-r--r--keyboards/gergo/gergo.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/keyboards/gergo/gergo.h b/keyboards/gergo/gergo.h
index 0292c512ac..1370325f28 100644
--- a/keyboards/gergo/gergo.h
+++ b/keyboards/gergo/gergo.h
@@ -1,14 +1,14 @@
#pragma once
-#include <util/delay.h>
+
+#include "quantum.h"
#include <stdint.h>
#include <stdbool.h>
-#include "quantum.h"
#include "i2c_master.h"
-#include "matrix.h"
+#include <util/delay.h>
extern i2c_status_t mcp23018_status;
-#define ERGODOX_EZ_I2C_TIMEOUT 1000
+#define I2C_TIMEOUT 1000
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
#define CPU_16MHz 0x00
@@ -26,18 +26,14 @@ extern i2c_status_t mcp23018_status;
#define OLATA 0x14 // output latch register
#define OLATB 0x15
-void init_ergodox(void);
uint8_t init_mcp23018(void);
/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
-#define LAYOUT_GERGO( \
+#define LAYOUT_gergo( \
L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \
L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
- L20,L21,L22,L23,L24,L25,L26, R20,R21,R22,R23,R24,R25,R26, \
- L31,L32, R33,R34, \
- L30, R30, \
- L33,L34, R31,R32) \
- \
+ L20,L21,L22,L23,L24,L25,L26,L30, R30,R20,R21,R22,R23,R24,R25,R26, \
+ L31,L32,L33,L34, R31,R32,R33,R34) \
/* matrix positions */ \
{ \
{ KC_NO, L16, L26, L30}, \