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.

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

Georgi Support #5384

Merged
merged 24 commits into from Mar 14, 2019

Conversation

Projects
None yet
2 participants
@germ
Copy link
Contributor

germ commented Mar 12, 2019

Adding Alpha support for Georgi, development units are going out and I need to hammer out the config.qmk.fm shenanigans

Once the dust settles a bit on Georgi, I really think the chording system it uses could be made into a more general integration with the steno interface.

  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
Show resolved Hide resolved keyboards/georgi/georgi.c
Show resolved Hide resolved keyboards/georgi/georgi.h Outdated
Show resolved Hide resolved keyboards/georgi/i2cmaster.h Outdated
Show resolved Hide resolved keyboards/georgi/keymaps/default/keymap.c Outdated
Show resolved Hide resolved keyboards/georgi/keymaps/default/keymap.c Outdated
Show resolved Hide resolved keyboards/georgi/keymaps/default/keymap.c Outdated
Show resolved Hide resolved keyboards/georgi/keymaps/template/keymap.c Outdated
Show resolved Hide resolved keyboards/georgi/keymaps/template/readme.md Outdated

@drashna drashna added the keyboard label Mar 12, 2019

Show resolved Hide resolved keyboards/georgi/rules.mk Outdated
Show resolved Hide resolved keyboards/georgi/rules.mk Outdated
Show resolved Hide resolved keyboards/georgi/rules.mk Outdated

drashna and others added some commits Mar 12, 2019

Update keyboards/georgi/keymaps/template/readme.md
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/georgi.h
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/keymaps/default/keymap.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/keymaps/default/keymap.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/rules.mk
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/rules.mk
Co-Authored-By: germ <jeremythegeek@gmail.com>
@drashna
Copy link
Member

drashna left a comment

Also, i2cmaster.h should be removed.

Show resolved Hide resolved keyboards/georgi/matrix.c Outdated
Show resolved Hide resolved keyboards/georgi/matrix.c Outdated
Show resolved Hide resolved keyboards/georgi/georgi.c Outdated
Show resolved Hide resolved keyboards/georgi/georgi.c Outdated

drashna and others added some commits Mar 13, 2019

Update keyboards/georgi/matrix.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/georgi.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/georgi.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/rules.mk
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/keymaps/default/keymap.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/keymaps/template/keymap.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/matrix.c
Co-Authored-By: germ <jeremythegeek@gmail.com>
@germ

This comment has been minimized.

Copy link
Contributor Author

germ commented Mar 13, 2019

Applied changes to branch. Waiting on build.

Seems to build with space left locally but is over on the build server. Any idea what to do about that?

Show resolved Hide resolved keyboards/georgi/config.h
Show resolved Hide resolved keyboards/georgi/config.h

drashna and others added some commits Mar 13, 2019

Update keyboards/georgi/config.h
Co-Authored-By: germ <jeremythegeek@gmail.com>
Update keyboards/georgi/config.h
Co-Authored-By: germ <jeremythegeek@gmail.com>
@germ

This comment has been minimized.

Copy link
Contributor Author

germ commented Mar 13, 2019

Hm, can't get that last change to fuck off. I2Cmaster.h is gone though :(

@drashna

This comment has been minimized.

Copy link
Member

drashna commented Mar 13, 2019

The i2c error is for the hotdox, it looks like. And should be fine to ignore, since it's not your board that's causing the issue.

@drashna

This comment has been minimized.

Copy link
Member

drashna commented Mar 14, 2019

Awesome, thanks!

@drashna drashna merged commit 980a41e into qmk:master Mar 14, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Mar 15, 2019

Merge branch 'master' of https://github.com/qmk/qmk_firmware
* 'master' of https://github.com/qmk/qmk_firmware: (48 commits)
  [Keymap] Added Boy_314's layout for half n half keyboard (qmk#5373)
  Align use of atmega32a program script (qmk#5259)
  [Keyboard] new keyboard lovelive9 (qmk#5266)
  [Keyboard] Inital port of xd96 (qmk#5401)
  Fix ascii art (qmk#5407)
  [Keyboard] Georgi Support (qmk#5384)
  fresh commit for a new fork for PR to upstream/master (qmk#5406)
  Added info.json for mt980 keyboard and fixes to walker keymap (qmk#5391)
  Add support for THE60 (qmk#5385)
  Added 1up60rgb keymap: mdyevimnav (qmk#5386)
  Fix i2c calls for HotDox keyboard (qmk#5387)
  Sleep until USB port becomes writable before running avrdude (qmk#5393)
  [Keymap] Some more improvements to keymap, currency symbols.. (qmk#5395)
  [Keymap] Add atreus, ergotravel and org60 keymaps (qmk#5381)
  archetype keymap for jj50 (qmk#5397)
  Wheat Field Peripherals mt980 (FC980M Layout) PCB Support (qmk#5374)
  Minor readme fix (qmk#5389)
  Add new keyboard Plaid and ATMEGA328p support (qmk#5379)
  Next set of split_common changes (qmk#4974)
  [Keyboard] Lily58 Add info.json file (qmk#5354)
  ...

ChrissiQ added a commit to ChrissiQ/qmk_firmware that referenced this pull request Mar 15, 2019

[Keyboard] Georgi Support (qmk#5384)
* 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 <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Disabled features, updated info

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Fixed info.json

sriehl added a commit to sriehl/qmk_firmware that referenced this pull request Mar 15, 2019

[Keyboard] Georgi Support (qmk#5384)
* 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 <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Disabled features, updated info

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Fixed info.json

HokieGeek added a commit to HokieGeek/qmk_firmware that referenced this pull request Mar 19, 2019

[Keyboard] Georgi Support (qmk#5384)
* 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 <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

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

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Disabled features, updated info

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Fixed info.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.