diff options
Diffstat (limited to 'keyboards/gboards/georgi')
| -rw-r--r-- | keyboards/gboards/georgi/config.h | 7 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/info.json | 161 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk | 9 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/keymaps/default-flipped/rules.mk | 9 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/keymaps/default/rules.mk | 9 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/keymaps/dennytom/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/keymaps/minimal/rules.mk | 9 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/keymaps/norman/rules.mk | 9 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/rules.mk | 20 |
9 files changed, 63 insertions, 176 deletions
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index f2e73da899..e3da59a781 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -30,13 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define NO_ACTION_ONESHOT #define IGNORE_MOD_TAP_INTERRUPT -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1337 -#define DEVICE_VER 0x0001 -#define MANUFACTURER g Heavy Industries -#define PRODUCT Georgi - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2) diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 89d2cd883f..0bfe2a52aa 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -1,130 +1,51 @@ { "keyboard_name": "Georgi", + "manufacturer": "g Heavy Industries", "url": "http://gboards.ca", "maintainer": "germ", + "usb": { + "vid": "0xFEED", + "pid": "0x1337", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_georgi": { "layout": [ - { - "x": 0.05, - "y": 0.54 - }, - { - "x": 1.06, - "y": 0.55 - }, - { - "x": 2.06, - "y": 0.29 - }, - { - "x": 3.05, - "y": 0.16 - }, - { - "x": 4.06, - "y": 0.41 - }, - { - "x": 5.06, - "y": 0.54 - }, - { - "x": 7.1899999999999995, - "y": 0.41 - }, - { - "x": 8.2, - "y": 0.3 - }, - { - "x": 9.2, - "y": 0.05 - }, - { - "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 - } + {"x": 0, "y": 0.5}, + {"x": 1, "y": 0.5}, + {"x": 2, "y": 0.3}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.4}, + {"x": 5, "y": 0.5}, + + {"x": 7, "y": 0.5}, + {"x": 8, "y": 0.4}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0.3}, + {"x": 11, "y": 0.5}, + {"x": 12, "y": 0.5}, + + {"x": 0, "y": 1.5}, + {"x": 1, "y": 1.5}, + {"x": 2, "y": 1.3}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.4}, + {"x": 5, "y": 1.5}, + + {"x": 7, "y": 1.5}, + {"x": 8, "y": 1.4}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1.3}, + {"x": 11, "y": 1.5}, + {"x": 12, "y": 1.5}, + + {"x": 3, "y": 2.75}, + {"x": 4, "y": 2.75}, + {"x": 5, "y": 2.75}, + + {"x": 7, "y": 2.75}, + {"x": 8, "y": 2.75}, + {"x": 9, "y": 2.75} ] } } diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk index 07394aef48..ef710269a4 100644 --- a/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk +++ b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk @@ -1,12 +1,6 @@ -#---------------------------------------------------------------------------- -# make georgi:claymager:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- - NO_REPEAT = yes VERBOSE = yes KEYBOARD_SHARED_EP = yes -CUSTOM_MATRIX = yes STENO_LAYERS = yes #Firmware reduction options @@ -24,7 +18,6 @@ ONLY_QWERTY = no # know what you're doing. # # No touchy, capiche? -SRC += matrix.c i2c_master.c ifeq ($(strip $(DEBUG_MATRIX)), yes) OPT_DEFS += -DDEBUG_MATRIX endif @@ -43,3 +36,5 @@ endif ifeq ($(strip $(STENO_LAYERS)), yes) OPT_DEFS += -DSTENOLAYERS endif + +SRC += sten.c diff --git a/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk b/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk index 90d8057c32..8f3d0419ab 100644 --- a/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk +++ b/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk @@ -1,12 +1,6 @@ -#---------------------------------------------------------------------------- -# make georgi:default:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- - NO_REPEAT = no VERBOSE = yes KEYBOARD_SHARED_EP = yes -CUSTOM_MATRIX = yes #Firmware reduction options MOUSEKEY_ENABLE = yes # 1500 bytes @@ -23,7 +17,6 @@ ONLY_QWERTY = no # know what you're doing. # # No touchy, capiche? -SRC += matrix.c i2c_master.c ifeq ($(strip $(DEBUG_MATRIX)), yes) OPT_DEFS += -DDEBUG_MATRIX endif @@ -39,3 +32,5 @@ endif ifeq ($(strip $(NO_TAPPING)), yes) OPT_DEFS += -DNO_ACTION_TAPPING endif + +SRC += sten.c diff --git a/keyboards/gboards/georgi/keymaps/default/rules.mk b/keyboards/gboards/georgi/keymaps/default/rules.mk index 7bd3d7aa20..242f95fa23 100644 --- a/keyboards/gboards/georgi/keymaps/default/rules.mk +++ b/keyboards/gboards/georgi/keymaps/default/rules.mk @@ -1,12 +1,6 @@ -#---------------------------------------------------------------------------- -# make georgi:default:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- - NO_REPEAT = no VERBOSE = yes KEYBOARD_SHARED_EP = yes -CUSTOM_MATRIX = yes STENO_LAYERS = no #Firmware reduction options @@ -24,7 +18,6 @@ ONLY_QWERTY = no # know what you're doing. # # No touchy, capiche? -SRC += matrix.c i2c_master.c ifeq ($(strip $(DEBUG_MATRIX)), yes) OPT_DEFS += -DDEBUG_MATRIX endif @@ -40,3 +33,5 @@ endif ifeq ($(strip $(NO_TAPPING)), yes) OPT_DEFS += -DNO_ACTION_TAPPING endif + +SRC += sten.c diff --git a/keyboards/gboards/georgi/keymaps/dennytom/rules.mk b/keyboards/gboards/georgi/keymaps/dennytom/rules.mk index 1155f72c04..af3726f14a 100644 --- a/keyboards/gboards/georgi/keymaps/dennytom/rules.mk +++ b/keyboards/gboards/georgi/keymaps/dennytom/rules.mk @@ -1,8 +1,2 @@ MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes CONSOLE_ENABLE = no -# COMMAND_ENABLE = no -NKRO_ENABLE = yes - -TMPVAR := $(SRC) -SRC = $(filter-out sten.c, $(TMPVAR))
\ No newline at end of file diff --git a/keyboards/gboards/georgi/keymaps/minimal/rules.mk b/keyboards/gboards/georgi/keymaps/minimal/rules.mk index cdbbbc280e..d95158f051 100644 --- a/keyboards/gboards/georgi/keymaps/minimal/rules.mk +++ b/keyboards/gboards/georgi/keymaps/minimal/rules.mk @@ -1,12 +1,6 @@ -#---------------------------------------------------------------------------- -# make georgi:default:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- - NO_REPEAT = no VERBOSE = yes KEYBOARD_SHARED_EP = yes -CUSTOM_MATRIX = yes #Firmware reduction options MOUSEKEY_ENABLE = no # 1500 bytes @@ -23,7 +17,6 @@ ONLY_QWERTY = no # know what you're doing. # # No touchy, capiche? -SRC += matrix.c i2c_master.c ifeq ($(strip $(DEBUG_MATRIX)), yes) OPT_DEFS += -DDEBUG_MATRIX endif @@ -39,3 +32,5 @@ endif ifeq ($(strip $(NO_TAPPING)), yes) OPT_DEFS += -DNO_ACTION_TAPPING endif + +SRC += sten.c diff --git a/keyboards/gboards/georgi/keymaps/norman/rules.mk b/keyboards/gboards/georgi/keymaps/norman/rules.mk index bb97bef281..d550e882c6 100644 --- a/keyboards/gboards/georgi/keymaps/norman/rules.mk +++ b/keyboards/gboards/georgi/keymaps/norman/rules.mk @@ -1,12 +1,6 @@ -#---------------------------------------------------------------------------- -# make georgi:default:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- - NO_REPEAT = yes VERBOSE = yes KEYBOARD_SHARED_EP = yes -CUSTOM_MATRIX = yes MOUSEKEY_ENABLE = yes #Debug options @@ -20,7 +14,6 @@ ONLY_QWERTY = no # know what you're doing. # # No touchy, capiche? -SRC += matrix.c i2c_master.c ifeq ($(strip $(DEBUG_MATRIX)), yes) OPT_DEFS += -DDEBUG_MATRIX endif @@ -33,3 +26,5 @@ endif ifeq ($(strip $(ONLY_QWERTY)), yes) OPT_DEFS += -DONLYQWERTY endif + +SRC += sten.c diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk index a884d8b3b9..9f66bb0d5b 100644 --- a/keyboards/gboards/georgi/rules.mk +++ b/keyboards/gboards/georgi/rules.mk @@ -7,13 +7,17 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -CUSTOM_MATRIX = yes -MOUSEKEY_ENABLE = no -STENO_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes -COMMAND_ENABLE = no +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = no # 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 +CUSTOM_MATRIX = yes +STENO_ENABLE = yes LTO_ENABLE = yes -SRC += matrix.c i2c_master.c sten.c + +SRC += matrix.c i2c_master.c |