[Keyboard] Snagpad Configurator bugfix and readme refactor (#6381)

[qmk_firmware.git] / keyboards / gergo / gergo.h

diff --git a/keyboards/gergo/gergo.h b/keyboards/gergo/gergo.h
index c0d885029b7570b43eda271daa9ee47cd4953b9a..1370325f28a17c76846f6e433afeffe2beaa2f89 100644 (file)
--- 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},     \
@@ -48,7 +44,7 @@ uint8_t init_mcp23018(void);
     { L01,   L11,   L21,  KC_NO},   \
     { L00,   L10,   L20,  KC_NO},   \
                                     \
-    { R10,   KC_NO, R20, R30},      \
+    { KC_NO,   R10, R20, R30},      \
     { R00,   R11,   R21, R31},      \
     { R01,   R12,   R22, R32},      \
     { R02,   R13,   R23, R33},      \