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

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

Browse Source
This commit is contained in:
QMK Bot 2022-07-26 04:01:41 +00:00
commit d556c4233e
8 changed files with 57 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
keyboards/gboards/georgi/info.json
View File

@ -5,126 +5,41 @@
"layouts": { "layouts": {
"LAYOUT_georgi": { "LAYOUT_georgi": {
"layout": [ "layout": [
{ {"x": 0, "y": 0.5},
"x": 0.05, {"x": 1, "y": 0.5},
"y": 0.54 {"x": 2, "y": 0.3},
}, {"x": 3, "y": 0},
{ {"x": 4, "y": 0.4},
"x": 1.06, {"x": 5, "y": 0.5},
"y": 0.55
}, {"x": 7, "y": 0.5},
{ {"x": 8, "y": 0.4},
"x": 2.06, {"x": 9, "y": 0},
"y": 0.29 {"x": 10, "y": 0.3},
}, {"x": 11, "y": 0.5},
{ {"x": 12, "y": 0.5},
"x": 3.05,
"y": 0.16 {"x": 0, "y": 1.5},
}, {"x": 1, "y": 1.5},
{ {"x": 2, "y": 1.3},
"x": 4.06, {"x": 3, "y": 1},
"y": 0.41 {"x": 4, "y": 1.4},
}, {"x": 5, "y": 1.5},
{
"x": 5.06, {"x": 7, "y": 1.5},
"y": 0.54 {"x": 8, "y": 1.4},
}, {"x": 9, "y": 1},
{ {"x": 10, "y": 1.3},
"x": 7.1899999999999995, {"x": 11, "y": 1.5},
"y": 0.41 {"x": 12, "y": 1.5},
},
{ {"x": 3, "y": 2.75},
"x": 8.2, {"x": 4, "y": 2.75},
"y": 0.3 {"x": 5, "y": 2.75},
},
{ {"x": 7, "y": 2.75},
"x": 9.2, {"x": 8, "y": 2.75},
"y": 0.05 {"x": 9, "y": 2.75}
},
{
"x": 10.2,
"y": 0.29
},
{
"x": 11.2,
"y": 0.43
},
{
"x": 12.2,
"y": 0.42
},
{
"x": 0.05,
"y": 1.54
},
{
"x": 1.06,
"y": 1.54
},
{
"x": 2.06,
"y": 1.28
},
{
"x": 3.05,
"y": 1.16
},
{
"x": 4.06,
"y": 1.4
},
{
"x": 5.06,
"y": 1.54
},
{
"x": 7.1899999999999995,
"y": 1.4
},
{
"x": 8.2,
"y": 1.28
},
{
"x": 9.2,
"y": 1.04
},
{
"x": 10.2,
"y": 1.28
},
{
"x": 11.2,
"y": 1.42
},
{
"x": 12.2,
"y": 1.42
},
{
"x": 3.05,
"y": 2.67
},
{
"x": 4.06,
"y": 2.68
},
{
"x": 5.06,
"y": 2.68
},
{
"x": 7.19,
"y": 2.67
},
{
"x": 8.2,
"y": 2.67
},
{
"x": 9.2,
"y": 2.66
}
] ]
} }
} }

9
keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
View File

@ -1,12 +1,6 @@
#----------------------------------------------------------------------------
# make georgi:claymager:dfu
# Make sure you have dfu-programmer installed!
#----------------------------------------------------------------------------
NO_REPEAT = yes NO_REPEAT = yes
VERBOSE = yes VERBOSE = yes
KEYBOARD_SHARED_EP = yes KEYBOARD_SHARED_EP = yes
CUSTOM_MATRIX = yes
STENO_LAYERS = yes STENO_LAYERS = yes
#Firmware reduction options #Firmware reduction options
@ -24,7 +18,6 @@ ONLY_QWERTY = no
# know what you're doing. # know what you're doing.
# #
# No touchy, capiche? # No touchy, capiche?
SRC += matrix.c i2c_master.c
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX OPT_DEFS += -DDEBUG_MATRIX
endif endif
@ -43,3 +36,5 @@ endif
ifeq ($(strip $(STENO_LAYERS)), yes) ifeq ($(strip $(STENO_LAYERS)), yes)
OPT_DEFS += -DSTENOLAYERS OPT_DEFS += -DSTENOLAYERS
endif endif
SRC += sten.c

9
keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
View File

@ -1,12 +1,6 @@
#----------------------------------------------------------------------------
# make georgi:default:dfu
# Make sure you have dfu-programmer installed!
#----------------------------------------------------------------------------
NO_REPEAT = no NO_REPEAT = no
VERBOSE = yes VERBOSE = yes
KEYBOARD_SHARED_EP = yes KEYBOARD_SHARED_EP = yes
CUSTOM_MATRIX = yes
#Firmware reduction options #Firmware reduction options
MOUSEKEY_ENABLE = yes # 1500 bytes MOUSEKEY_ENABLE = yes # 1500 bytes
@ -23,7 +17,6 @@ ONLY_QWERTY = no
# know what you're doing. # know what you're doing.
# #
# No touchy, capiche? # No touchy, capiche?
SRC += matrix.c i2c_master.c
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX OPT_DEFS += -DDEBUG_MATRIX
endif endif
@ -39,3 +32,5 @@ endif
ifeq ($(strip $(NO_TAPPING)), yes) ifeq ($(strip $(NO_TAPPING)), yes)
OPT_DEFS += -DNO_ACTION_TAPPING OPT_DEFS += -DNO_ACTION_TAPPING
endif endif
SRC += sten.c

9
keyboards/gboards/georgi/keymaps/default/rules.mk
View File

@ -1,12 +1,6 @@
#----------------------------------------------------------------------------
# make georgi:default:dfu
# Make sure you have dfu-programmer installed!
#----------------------------------------------------------------------------
NO_REPEAT = no NO_REPEAT = no
VERBOSE = yes VERBOSE = yes
KEYBOARD_SHARED_EP = yes KEYBOARD_SHARED_EP = yes
CUSTOM_MATRIX = yes
STENO_LAYERS = no STENO_LAYERS = no
#Firmware reduction options #Firmware reduction options
@ -24,7 +18,6 @@ ONLY_QWERTY = no
# know what you're doing. # know what you're doing.
# #
# No touchy, capiche? # No touchy, capiche?
SRC += matrix.c i2c_master.c
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX OPT_DEFS += -DDEBUG_MATRIX
endif endif
@ -40,3 +33,5 @@ endif
ifeq ($(strip $(NO_TAPPING)), yes) ifeq ($(strip $(NO_TAPPING)), yes)
OPT_DEFS += -DNO_ACTION_TAPPING OPT_DEFS += -DNO_ACTION_TAPPING
endif endif
SRC += sten.c

6
keyboards/gboards/georgi/keymaps/dennytom/rules.mk
View File

@ -1,8 +1,2 @@
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
# COMMAND_ENABLE = no
NKRO_ENABLE = yes
TMPVAR := $(SRC)
SRC = $(filter-out sten.c, $(TMPVAR))

9
keyboards/gboards/georgi/keymaps/minimal/rules.mk
View File

@ -1,12 +1,6 @@
#----------------------------------------------------------------------------
# make georgi:default:dfu
# Make sure you have dfu-programmer installed!
#----------------------------------------------------------------------------
NO_REPEAT = no NO_REPEAT = no
VERBOSE = yes VERBOSE = yes
KEYBOARD_SHARED_EP = yes KEYBOARD_SHARED_EP = yes
CUSTOM_MATRIX = yes
#Firmware reduction options #Firmware reduction options
MOUSEKEY_ENABLE = no # 1500 bytes MOUSEKEY_ENABLE = no # 1500 bytes
@ -23,7 +17,6 @@ ONLY_QWERTY = no
# know what you're doing. # know what you're doing.
# #
# No touchy, capiche? # No touchy, capiche?
SRC += matrix.c i2c_master.c
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX OPT_DEFS += -DDEBUG_MATRIX
endif endif
@ -39,3 +32,5 @@ endif
ifeq ($(strip $(NO_TAPPING)), yes) ifeq ($(strip $(NO_TAPPING)), yes)
OPT_DEFS += -DNO_ACTION_TAPPING OPT_DEFS += -DNO_ACTION_TAPPING
endif endif
SRC += sten.c

9
keyboards/gboards/georgi/keymaps/norman/rules.mk
View File

@ -1,12 +1,6 @@
#----------------------------------------------------------------------------
# make georgi:default:dfu
# Make sure you have dfu-programmer installed!
#----------------------------------------------------------------------------
NO_REPEAT = yes NO_REPEAT = yes
VERBOSE = yes VERBOSE = yes
KEYBOARD_SHARED_EP = yes KEYBOARD_SHARED_EP = yes
CUSTOM_MATRIX = yes
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
#Debug options #Debug options
@ -20,7 +14,6 @@ ONLY_QWERTY = no
# know what you're doing. # know what you're doing.
# #
# No touchy, capiche? # No touchy, capiche?
SRC += matrix.c i2c_master.c
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX OPT_DEFS += -DDEBUG_MATRIX
endif endif
@ -33,3 +26,5 @@ endif
ifeq ($(strip $(ONLY_QWERTY)), yes) ifeq ($(strip $(ONLY_QWERTY)), yes)
OPT_DEFS += -DONLYQWERTY OPT_DEFS += -DONLYQWERTY
endif endif
SRC += sten.c

20
keyboards/gboards/georgi/rules.mk
View File

@ -7,13 +7,17 @@ BOOTLOADER = atmel-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
CUSTOM_MATRIX = yes BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no MOUSEKEY_ENABLE = no # Mouse keys
STENO_ENABLE = yes EXTRAKEY_ENABLE = yes # Audio control and System control
EXTRAKEY_ENABLE = yes CONSOLE_ENABLE = yes # Console for debug
CONSOLE_ENABLE = yes COMMAND_ENABLE = no # Commands for debug and configuration
COMMAND_ENABLE = no
NKRO_ENABLE = yes # Enable N-Key Rollover 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
CUSTOM_MATRIX = yes
STENO_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
SRC += matrix.c i2c_master.c sten.c
SRC += matrix.c i2c_master.c