g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2022-04-24 13:01:58 +00:00
parent 056f7b3676 e1f6fa579a
commit 0395840eb9
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
keyboards/gboards/gergoplex/gergoplex.h
View File

@ -21,8 +21,8 @@
extern i2c_status_t mcp23018_status; extern i2c_status_t mcp23018_status;
#define I2C_TIMEOUT 1000 #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") // I2C aliases and register addresses (see "mcp23018.md")
#define I2C_ADDR 0x20 // 0b0100000 #define I2C_ADDR 0x20 // 0b0100000
@ -41,16 +41,15 @@ uint8_t init_mcp23018(void);
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
L30, L31, L32, R30, R31, R32 \ L30, L31, L32, R30, R31, R32 \
) \ ) { \
{ \ { L04, L14, L24, XXX }, \
{L04, L14, L24, KC_NO}, \ { L03, L13, L23, L32 }, \
{L03, L13, L23, L32}, \ { L02, L12, L22, L31 }, \
{L02, L12, L22, L31}, \ { L01, L11, L21, L30 }, \
{L01, L11, L21, L30}, \ { L00, L10, L20, XXX }, \
{L00, L10, L20, KC_NO}, \ { R00, R10, R20, XXX }, \
{R00, R10, R20, KC_NO}, \ { R01, R11, R21, R30 }, \
{R01, R11, R21, R30}, \ { R02, R12, R22, R31 }, \
{R02, R12, R22, R31}, \ { R03, R13, R23, R32 }, \
{R03, R13, R23, R32}, \ { R04, R14, R24, XXX } \
{R04, R14, R24, KC_NO}, \ }
}

22
keyboards/gboards/gergoplex/rules.mk
View File

@ -1,15 +1,23 @@
# MCU name
MCU = atmega32u4 MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu BOOTLOADER = atmel-dfu
CUSTOM_MATRIX = yes # Build Options
MOUSEKEY_ENABLE = yes # Mouse keys # change yes to no to disable
COMBO_ENABLE = yes #
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = no
NKRO_ENABLE = yes # Enable N-Key Rollover
COMMAND_ENABLE = yes
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite 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 LAYOUTS = split_3x5_3