summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-04-24 13:01:58 +0000
committerQMK Bot <hello@qmk.fm>2022-04-24 13:01:58 +0000
commit0395840eb9e28a7c6b38c63410b16c466e904c3b (patch)
tree4a6f167c6875e1f004b5e496a20dafbfc7c5677d /keyboards
parent056f7b36765e85727d1f7025afed061ba4a1a816 (diff)
parente1f6fa579af8eb9f0799f8fe9ba7a8947d1c2c69 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/gboards/gergoplex/gergoplex.h29
-rw-r--r--keyboards/gboards/gergoplex/rules.mk22
2 files changed, 29 insertions, 22 deletions
diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h
index 507072a376..eda21d2a94 100644
--- a/keyboards/gboards/gergoplex/gergoplex.h
+++ b/keyboards/gboards/gergoplex/gergoplex.h
@@ -21,8 +21,8 @@
extern i2c_status_t mcp23018_status;
#define I2C_TIMEOUT 1000
-#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
-#define CPU_16MHz 0x00
+
+#define XXX KC_NO
// I2C aliases and register addresses (see "mcp23018.md")
#define I2C_ADDR 0x20 // 0b0100000
@@ -41,16 +41,15 @@ uint8_t init_mcp23018(void);
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- {L04, L14, L24, KC_NO}, \
- {L03, L13, L23, L32}, \
- {L02, L12, L22, L31}, \
- {L01, L11, L21, L30}, \
- {L00, L10, L20, KC_NO}, \
- {R00, R10, R20, KC_NO}, \
- {R01, R11, R21, R30}, \
- {R02, R12, R22, R31}, \
- {R03, R13, R23, R32}, \
- {R04, R14, R24, KC_NO}, \
- }
+) { \
+ { L04, L14, L24, XXX }, \
+ { L03, L13, L23, L32 }, \
+ { L02, L12, L22, L31 }, \
+ { L01, L11, L21, L30 }, \
+ { L00, L10, L20, XXX }, \
+ { R00, R10, R20, XXX }, \
+ { R01, R11, R21, R30 }, \
+ { R02, R12, R22, R31 }, \
+ { R03, R13, R23, R32 }, \
+ { R04, R14, R24, XXX } \
+}
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index e557d9f39a..5cd5a7721c 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -1,15 +1,23 @@
+# MCU name
MCU = atmega32u4
+# Bootloader selection
BOOTLOADER = atmel-dfu
-CUSTOM_MATRIX = yes
-MOUSEKEY_ENABLE = yes # Mouse keys
-COMBO_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-NKRO_ENABLE = yes # Enable N-Key Rollover
-COMMAND_ENABLE = yes
+# Build Options
+# change yes to no to disable
+#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+NKRO_ENABLE = yes # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+COMBO_ENABLE = yes
+CUSTOM_MATRIX = yes
LAYOUTS = split_3x5_3