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.

Sign up for GitHub

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

Jump to bottom

[keymap] Added Filco Majestouch TKL Pegasus Hoof ISO Layout #7647

Merged
merged 4 commits into from
Dec 17, 2019
Merged

[keymap] Added Filco Majestouch TKL Pegasus Hoof ISO Layout #7647

merged 4 commits into from
Dec 17, 2019

Conversation

nygellyndley
Copy link
Contributor

Description

Adds ISO Layout for Pegasus Hoof for Filco Majestouch

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

noroadsleft
noroadsleft requested changes Dec 16, 2019
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

Just the one thing to make the new macro consistent with the others.

Also, could you add tkl_iso to the LAYOUTS rule on Line 30 of keyboards/bpiphany/pegasushoof/rules.mk, please?

keyboards/bpiphany/pegasushoof/2015/2015.h Outdated Show resolved Hide resolved
keyboards/bpiphany/pegasushoof/2015/2015.h Outdated Show resolved Hide resolved
@nygellyndley
Copy link
Contributor Author

nygellyndley commented Dec 16, 2019 •
edited
Loading

@noroadsleft

Just the one thing to make the new macro consistent with the others.

Also, could you add tkl_iso to the LAYOUTS rule on Line 30 of keyboards/bpiphany/pegasushoof/rules.mk, please?

The DEFAULT_FOLDER=bpiphany/pegasushoof/2013 line in the rules.mk file seems to be causing build issues.

Should LAYOUTS = tkl_ansi tkl_iso be set in the keyboards/bpiphany/pegasushoof/2015/rules.mk file instead?

Or perhaps the DEFAULT_FOLDER line should be changed? 2015 is the newer version and 2013 is no longer available from bpiphany.

It's not clear to me how these files will interact, I don't have a 2013 version to build an iso one for that.

@noroadsleft
Copy link
Member

Oh, I thought the 2013 revision had an ISO macro already.

Revert the change to keyboards/bpiphany/pegasushoof/rules.mk and I can arrange it later in a separate PR.

@nygellyndley
Copy link
Contributor Author

nygellyndley commented Dec 17, 2019 •
edited
Loading

@noroadsleft

Oh, I thought the 2013 revision had an ISO macro already.

Revert the change to keyboards/bpiphany/pegasushoof/rules.mk and I can arrange it later in a separate PR.

done, and added a new commit to fix the incorrect XX variable naming which will also be reverted

@noroadsleft noroadsleft requested a review from a team December 17, 2019 19:28
@noroadsleft noroadsleft merged commit 1646717 into qmk:master Dec 17, 2019
@noroadsleft
Copy link
Member

Thanks!

benjaminmikiten added a commit to benjaminmikiten/qmk_firmware that referenced this pull request Dec 18, 2019
@benjaminmikiten
Merge branch 'master' into develop
db79a5b 
* master: (99 commits)
  [Keymap] Added userspace for d4mation. Included their keymap for the Atreus62 (qmk#7483)
  [Keymap] Custom user keymap for Think6.5 with LED range control (qmk#7603)
  [Keymap] CRKBD Custom Keymap - KidBrazil (qmk#7630)
  [Keymap] Add pico 70 keys keymap (qmk#7654)
  Tidy up dztech default keymaps and info.json (qmk#7608)
  Heisenberg handwired keyboard added (qmk#7643)
  [Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
  Ported J80 to QMK (qmk#7488)
  [Keyboard] Magnavox Videowriter conversion with Pro Micro (qmk#7634)
  [Docs] add japanese translation (basic part) (qmk#7461)
  Tidy up dztech rules.mk
  Relocate RGB keycode processing (qmk#7508)
  Move kwerdenker's personal keymap from RGB (qmk#7645)
  Remove QMK_KEYBOARD_CONFIG_H from boards (qmk#7635)
  Disable usb on slave half to resolve random 'lockup' (qmk#7649)
  [Core] Optimize matrix processing (qmk#7621)
  [Keymap] boy_314's satisfaction75 layout (qmk#7638)
  [Keyboard] XD68 65% ATMega32U4 based (qmk#7395)
  [keyboard] Plain60 cleanups (qmk#7644)
  update default h88 keymap (qmk#7646)
  ...
akrob pushed a commit to akrob/qmk_firmware that referenced this pull request Dec 28, 2019
Merge remote-tracking branch 'upstream/master'
6edd8aa 
* upstream/master: (1080 commits)
  Update toshi0383 keymap (qmk#7700)
  Completely remove i2c_transmit_receive function (qmk#7686)
  Readded lost pgm_read_word code to encoder array lookups (qmk#7577)
  Add central location for ChibiOS defines (qmk#7542)
  Add TADA68 keymap/rules/config for QMK bootloader (qmk#7679)
  [Docs] fix docs (qmk#7642)
  [Keyboard] Clueboard 60 fix col 11 12 mixup (qmk#7685)
  Missed these LTO blocks
  I corrected my name.
  [Keymap] Added userspace for d4mation. Included their keymap for the Atreus62 (qmk#7483)
  [Keymap] Custom user keymap for Think6.5 with LED range control (qmk#7603)
  [Keymap] CRKBD Custom Keymap - KidBrazil (qmk#7630)
  [Keymap] Add pico 70 keys keymap (qmk#7654)
  Improve docs "Edit Document" footer
  Tidy up dztech config.h
  Tidy up dztech default keymaps and info.json (qmk#7608)
  Heisenberg handwired keyboard added (qmk#7643)
  [Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
  Ported J80 to QMK (qmk#7488)
  [Keyboard] Magnavox Videowriter conversion with Pro Micro (qmk#7634)
  ...
patrl pushed a commit to patrl/qmk_firmware that referenced this pull request Dec 29, 2019
@nygellyndley @patrl
[Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
73ac9e4 
* [keymap] Added Filco Majestouch TKL Pegasus Hoof ISO Layout

* - add rules definition

* Revert "- add rules definition"

This reverts commit 59bfbe8.

* - fixed incorrect variable naming
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@nygellyndley @HokieGeek
[Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
26244a9 
* [keymap] Added Filco Majestouch TKL Pegasus Hoof ISO Layout

* - add rules definition

* Revert "- add rules definition"

This reverts commit 59bfbe8.

* - fixed incorrect variable naming
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@nygellyndley @kujawakk
[Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
b2a69c3 
* [keymap] Added Filco Majestouch TKL Pegasus Hoof ISO Layout

* - add rules definition

* Revert "- add rules definition"

This reverts commit 59bfbe8.

* - fixed incorrect variable naming
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@fauxpark fauxpark fauxpark approved these changes

Assignees
No one assigned
Labels
enhancement keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nygellyndley @noroadsleft @fauxpark