Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gergoplex: small cleanup #16928

Merged
merged 1 commit into from
Apr 24, 2022
Merged

gergoplex: small cleanup #16928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions keyboards/gboards/gergoplex/gergoplex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 } \
}
22 changes: 15 additions & 7 deletions keyboards/gboards/gergoplex/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down