~ruther/qmk_firmware

0395840eb9e28a7c6b38c63410b16c466e904c3b — QMK Bot 3 years ago 056f7b3 + e1f6fa5
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 29 insertions(+), 22 deletions(-)

M keyboards/gboards/gergoplex/gergoplex.h
M keyboards/gboards/gergoplex/rules.mk
M keyboards/gboards/gergoplex/gergoplex.h => keyboards/gboards/gergoplex/gergoplex.h +14 -15
@@ 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 } \
}

M keyboards/gboards/gergoplex/rules.mk => keyboards/gboards/gergoplex/rules.mk +15 -7
@@ 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