Skip to content

Commit

Permalink
[Keyboard] Georgi Support (qmk#5384)
Browse files Browse the repository at this point in the history 
* Working on chording

* Working on chording

* Got layouts in order

* Initial Georgi support

* forgot to add keymaps

* Updated readme

* Update keyboards/georgi/keymaps/template/readme.md

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/georgi.h

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/keymaps/default/keymap.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/keymaps/default/keymap.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/keymaps/default/keymap.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/keymaps/template/keymap.c

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <[email protected]>

* Disabled features, updated info

* Update keyboards/georgi/config.h

Co-Authored-By: germ <[email protected]>

* Update keyboards/georgi/config.h

Co-Authored-By: germ <[email protected]>

* Fixed info.json
  • Loading branch information
@germ @drashna
germ authored and drashna committed Mar 14, 2019
1 parent 2558372 commit 980a41e
Show file tree
Hide file tree
Showing 15 changed files with 1,618 additions and 0 deletions.
74 changes: 74 additions & 0 deletions keyboards/georgi/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
Copyright 2012 Jun Wako <[email protected]>
Copyright 2013 Oleg Kostyuk <[email protected]>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// Copy and worked on with love from the EZ team

#pragma once
#include "config_common.h"

/* Defaults */

#define VERSION "Alpha 01: Ted "
#define VERBOSE

#define FORCE_NKRO
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#define NO_DEBUG
#define NO_ACTION_ONESHOT
#define NO_ACTION_FUNCTION

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT Georgi
#define DESCRIPTION QMK keyboard firmware for Georgi

/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
#define MATRIX_COLS 4

#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
#define MOUSEKEY_TIME_TO_MAX 60
#define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 2

/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST

#define TAPPING_TERM 200
#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
)

#define DEBOUNCE 5
#define USB_MAX_POWER_CONSUMPTION 500
68 changes: 68 additions & 0 deletions keyboards/georgi/georgi.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#include QMK_KEYBOARD_H

bool i2c_initialized = 0;
i2c_status_t mcp23018_status = 0x20;

void matrix_init_kb(void) {
steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT

// (tied to Vcc for hardware convenience)
//DDRB &= ~(1<<4); // set B(4) as input
//PORTB &= ~(1<<4); // set B(4) internal pull-up disabled

// unused pins - C7, D4, D5, D7, E6
// set as input with internal pull-up enabled
DDRC &= ~(1<<7);
DDRD &= ~(1<<5 | 1<<4 | 1<<6 | 1<<7);
DDRE &= ~(1<<6);
PORTC |= (1<<7);
PORTD |= (1<<5 | 1<<4 | 1<<6 | 1<<7);
PORTE |= (1<<6);

matrix_init_user();
}


uint8_t init_mcp23018(void) {
print("starting init");
mcp23018_status = 0x20;

// I2C subsystem

// uint8_t sreg_prev;
// sreg_prev=SREG;
// cli();

if (i2c_initialized == 0) {
i2c_init(); // on pins D(1,0)
i2c_initialized = true;
_delay_ms(1000);
}
// i2c_init(); // on pins D(1,0)
// _delay_ms(1000);

// set pin direction
// - unused : input : 1
// - input : input : 1
// - driving : output : 0
mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(IODIRA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(0b10000000, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
i2c_stop();

// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(GPPUA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(0b10000000, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;

out:
i2c_stop();
// SREG=sreg_prev;
//uprintf("Init %x\n", mcp23018_status);
return mcp23018_status;
}
82 changes: 82 additions & 0 deletions keyboards/georgi/georgi.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
#pragma once
#include <util/delay.h>
#include <stdint.h>
#include <stdbool.h>
#include "quantum.h"
#include "i2c_master.h"
#include "matrix.h"


extern i2c_status_t mcp23018_status;
#define ERGODOX_EZ_I2C_TIMEOUT 1000
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
#define CPU_16MHz 0x00

// I2C aliases and register addresses (see "mcp23018.md")
//#define I2C_ADDR 0b0100000
#define I2C_ADDR 0x20
#define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE )
#define I2C_ADDR_READ ( (I2C_ADDR<<1) | I2C_READ )
#define IODIRA 0x00 // i/o direction register
#define IODIRB 0x01
#define GPPUA 0x0C // GPIO pull-up resistor register
#define GPPUB 0x0D
#define GPIOA 0x12 // general purpose i/o port register (write modifies OLAT)
#define GPIOB 0x13
#define OLATA 0x14 // output latch register
#define OLATB 0x15

void init_ergodox(void);
uint8_t init_mcp23018(void);

/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
#define LAYOUT_georgi( \
L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \
L10,L11,L12,L13,L14,L15, R10,R11,R12,R13,R14,R15, \
L20,L21,L22, R20,R21,R22) \
\
{ \
{ KC_NO, R00, R10, R21}, \
{ KC_NO, R01, R11, R20}, \
{ KC_NO, R02, R12, R22}, \
{ KC_NO, R03, R13, KC_NO}, \
{ KC_NO, R04, R14, KC_NO}, \
{ KC_NO, R05, R15, KC_NO}, \
{ KC_NO, KC_NO, KC_NO, KC_NO}, \
\
{ KC_NO, L05, L15, L22}, \
{ KC_NO, L04, L14, L21}, \
{ KC_NO, L03, L13, L20}, \
{ KC_NO, L02, L12, KC_NO}, \
{ KC_NO, L01, L11, KC_NO}, \
{ KC_NO, L00, L10, KC_NO}, \
{ KC_NO, KC_NO, KC_NO, KC_NO}, \
\
}

/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ----------
#define LAYOUT_GERGO( \
L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \
L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
L20,L21,L22,L23,L24,L25,L26, R20,R21,R22,R23,R24,R25,R26, \
L31,L32, R33,R34, \
L30, R30, \
L33,L34, R31,R32) \
\
{ \
{ KC_NO, L16, L26, L30}, \
{ L05, L15, L25, L34}, \
{ L04, L14, L24, L33}, \
{ L03, L13, L23, L32}, \
{ L02, L12, L22, L31}, \
{ L01, L11, L21, KC_NO}, \
{ L00, L10, L20, KC_NO}, \
\
{ KC_NO, R10, R20, R30}, \
{ R00, R11, R21, R31}, \
{ R01, R12, R22, R32}, \
{ R02, R13, R23, R33}, \
{ R03, R14, R24, R34}, \
{ R04, R15, R25, KC_NO}, \
{ R05, R16, R26, KC_NO}, \
} */
133 changes: 133 additions & 0 deletions keyboards/georgi/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"keyboard_name": "Georgi",
"url": "http://gboards.ca",
"maintainer": "germ",
"width": 13.2,
"height": 3.68,
"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
}
]
}
}
}
Loading

0 comments on commit 980a41e

Please sign in to comment.