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

Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel #3173

Merged
merged 5 commits into from
Jun 13, 2018

Conversation

noroadsleft
Copy link
Member

Continuing the work of #3052, #3053, and #3171

Assuming I haven't screwed anything up (a dangerous assumption), this should fix the Configurator API errors on the Ergodone, Ergodox Infinity, and the ErgoTravel.

Requesting review from @drashna and @mechmerlin, and maybe @skullydazed if he's not still wrapped up in household tasks demanding his attention.


Ergodone

Matrices

previous name new name
KEYMAP LAYOUT_ergodox
KEYMAP_PRETTY LAYOUT_ergodox_pretty

Ergodox Infinity

Matrices

previous name new name
KEYMAP LAYOUT_ergodox
KEYMAP_PRETTY LAYOUT_ergodox_pretty

Keymaps

  • refactored to use new matrix names
  • narze keymap now uses QMK_KEYBOARD_H include

ErgoTravel

  • readability updates
  • default keymap refactored to use LAYOUT macro from LAYOUT_kc
  • modified info.json

@drashna
Copy link
Member

drashna commented Jun 13, 2018

Travis Errors are unrelated to this change.
One is my bad, including a file that doesn't exist. And the other is a GCC issue with __has_include not being properly supported by the version of gcc being used.

@drashna
Copy link
Member

drashna commented Jun 13, 2018

Thanks!

@drashna drashna merged commit 1912f36 into qmk:master Jun 13, 2018
@noroadsleft noroadsleft deleted the c10r-ergodoxes branch June 13, 2018 16:45
noj added a commit to noj/qmk_firmware that referenced this pull request Jun 16, 2018
…jan_atreus

* 'master' of https://github.com/qmk/qmk_firmware: (578 commits)
  Contra refactor (qmk#3191)
  Fixed no-op ifndef for ergodox ez (qmk#3189)
  Canoe Refactor (qmk#3190)
  planck/light/info.json fix (qmk#3186)
  Tada68 refactor and readme update (qmk#3178)
  Add URL of PCB files to README.md (qmk#3182)
  Rename from KEYMAP to LAYOUT (qmk#3181)
  Fix bfake matrix bug (qmk#3180)
  Clueboard 2x1800 Refactor (qmk#3179)
  QMK Configurator Support for Melody96 (qmk#3177)
  Lightsaver info.json update (qmk#3176)
  KBD66 info.json update (qmk#3175)
  Mbsurfer deltasplit75 keymap (qmk#3174)
  Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel (qmk#3173)
  Ergodox EZ refactor (qmk#3171)
  Hadron: Readme, Refactor, and Configurator support (qmk#3170)
  fix issue with rgbinit unused variable (qmk#3165)
  Fix melody96 default keymap graphic. (qmk#3169)
  Fix jj40 capslock and minor keymap updates (qmk#3168)
  GON NerD: Refactor, Configurator support and Readme cleanup (qmk#3167)
  ...
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
…vel (qmk#3173)

* Ergodone refactor

* Ergodox Infinity refactor

* Ergotravel refactor

* Ergotravel configurator layout update

* Fixing include on Ergodox Infinity narze keymap
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants