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

[Keyboard] Update Gergo to use newer Ergodox Matrix code #5703

Merged
merged 3 commits into from
Apr 27, 2019

Conversation

drashna
Copy link
Member

@drashna drashna commented Apr 24, 2019

And update layout macros to be correct

Types of Changes

  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)

Checklist

  • My code follows the code style of this project. (begrudgingly)
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@germ
Copy link
Contributor

germ commented Apr 24, 2019

You the man drash

@drashna
Copy link
Member Author

drashna commented Apr 24, 2019

@alex-ong Just wanted to double check that this looks correct? (it's based on the ergodox ez code, with some additions....)

@noroadsleft
Copy link
Member

Why is the I2C Timeout variable branded (GERGO_I2C_TIMEOUT instead of just I2C_TIMEOUT)? Is that necessary?

@alex-ong
Copy link
Contributor

It looks right (just looking at the matrix.c stuff). Testing it would probably be the easiest way to check if it works :)

@drashna
Copy link
Member Author

drashna commented Apr 25, 2019

@noroadsleft because it was called ERGODOX_EZ_I2C_TIMEOUT
I suppose I could change it.

@alex-ong it does work. :)
But I think it has the sleep issue... again. :D

@drashna
Copy link
Member Author

drashna commented Apr 26, 2019

defines changed so they're not hardware specific

Copy link
Contributor

@mechmerlin mechmerlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging!

@mechmerlin mechmerlin merged commit 8faee5c into qmk:master Apr 27, 2019
akrob pushed a commit to akrob/qmk_firmware that referenced this pull request Apr 30, 2019
* upstream/master: (779 commits)
  [Keyboard] Signum3.0 remove sortedcontainers (qmk#5679)
  Simple extended space cadet (qmk#5277)
  Removed forced in lining for lib8tion functions (qmk#5670)
  Change lib8tion library to be usable in user keymaps (qmk#5598)
  [Keyboard] Fixing drag-and-drop (qmk#5728)
  [Keyboard] Adding ortho_4x12 & planck_mit layouts for KBD4X (qmk#5729)
  [Keyboard] Minor fixes for Baguette (qmk#5737)
  Updated rgb_led struct field modifier to flags (qmk#5619)
  RGB Matrix: Custom effects on a kb/user level (qmk#5338)
  Fix Planck and Preonic builds (qmk#5658)
  [Keymap] dz60 keymap w/ hhkb-esque default layer (qmk#5708)
  [Keymap] Added compatibility for Planck rev6 (qmk#5706)
  [Keyboard] Satisfaction75 i2c fix and VIA layout (qmk#5726)
  A better new_project.sh (qmk#5191)
  Fix sendstring "#" producing "£" instead (qmk#5724)
  [Keyboard] Added WT69-A PCB (qmk#5721)
  [Keymap] Fix typo and function layer image for Quefrency (qmk#5719)
  [Keymap] Initial keyboard layout for KBD67 (qmk#5720)
  [Keymap] New keymap for Quefrency 65% with split backspace, RGB, media keys, mouse keys (qmk#5717)
  [Keyboard] Update Gergo to use newer Ergodox Matrix code (qmk#5703)
  ...
@drashna drashna deleted the fix/gergo_matrix_update branch May 2, 2019 15:58
foosinn pushed a commit to foosinn/qmk_firmware that referenced this pull request May 6, 2019
* [Keyboard] Update Gergo to use newer Ergodox Matrix code

And update layout macros to be correct

* Almost forgot the json file

* Remove board specific defines for i2c timeout
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
* [Keyboard] Update Gergo to use newer Ergodox Matrix code

And update layout macros to be correct

* Almost forgot the json file

* Remove board specific defines for i2c timeout
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
* [Keyboard] Update Gergo to use newer Ergodox Matrix code

And update layout macros to be correct

* Almost forgot the json file

* Remove board specific defines for i2c timeout
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
* [Keyboard] Update Gergo to use newer Ergodox Matrix code

And update layout macros to be correct

* Almost forgot the json file

* Remove board specific defines for i2c timeout
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants