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

update keymap of zergo keyboard #10402

Merged
merged 22 commits into from
Oct 13, 2020
Merged

update keymap of zergo keyboard #10402

merged 22 commits into from
Oct 13, 2020

Conversation

greenjack-z
Copy link
Contributor

@greenjack-z greenjack-z commented Sep 23, 2020 •
edited
Loading

keymap changet to be up to date and in accordance with configurator json file

Description

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: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • 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).

greenjack-z and others added 21 commits August 19, 2020 14:06
@greenjack-z
Rename keyboards/handwired/zergo/keymap.c to keyboards/handwired/zerg…
508208c 
…o/keymaps/default/keymap.c
@greenjack-z
Update rules.mk
13e4f46
@greenjack-z
Update rules.mk
8746f22
@greenjack-z
Update bootloader.mk
d17b65e
@greenjack-z
Update rules.mk
b9ee084
@greenjack-z
Update bootloader.mk
9098c23
@greenjack-z
Update info.json
6593d3b
@greenjack-z
Update rules.mk
ff91b86
@greenjack-z
Merge pull request #1 from qmk/master
7927180 
update fork
@greenjack-z
Update zergo.h
12398a8
@greenjack-z
Update info.json
0fa6d48
@greenjack-z
Update keymap.c
8758fdf
@noroadsleft
Merge branch 'master' into zergo
5ae123f
@greenjack-z @fauxpark
Update keyboards/handwired/zergo/info.json
4a6aa48 
Co-authored-by: Ryan <[email protected]>
@greenjack-z @noroadsleft
Update keyboards/handwired/zergo/keymaps/default/keymap.c
42b635c 
Co-authored-by: James Young <[email protected]>
@greenjack-z
Merge branch 'master' of https://github.com/qmk/qmk_firmware
5d52888
@greenjack-z
update layout
76a1244
@greenjack-z
Merge branch 'master' of https://github.com/qmk/qmk_firmware into zergo
b7ec719
@greenjack-z
Merge branch 'master' of https://github.com/greenjack-z/qmk_firmware …
bf4e353 
…into zergo
@greenjack-z
update zergo layout
f4d04c8
@greenjack-z
update layout
858c52c
ridingqwerty
ridingqwerty approved these changes Sep 26, 2020
View reviewed changes
Copy link
Contributor

@ridingqwerty ridingqwerty left a comment

Choose a reason for hiding this comment

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

I made a small suggestion but don't feel obligated to commit it.

drashna
drashna approved these changes Oct 4, 2020
View reviewed changes
@drashna drashna requested a review from a team October 4, 2020 20:03
@drashna drashna merged commit 5b067ff into qmk:master Oct 13, 2020
@drashna
Copy link
Member

drashna commented Oct 13, 2020

Thanks!

barrettclark pushed a commit to barrettclark/qmk_firmware that referenced this pull request Oct 14, 2020
Merge remote-tracking branch 'upstream/master' into master
7a28da2 
* upstream/master: (46 commits)
  Fix config for Helix rev3 4rows (qmk#10641)
  Update other_vscode.md of Japanese document (qmk#10604)
  Fix issues with suspend code for ZSA split boards (qmk#10640)
  Update reviung34 PRODUCT_ID (qmk#10480)
  Whitefox refactor (qmk#10175)
  Fix for issue qmk#10386 - Can't compile preonic:dudeofawesome (qmk#10557)
  Update Japanese document (qmk#10607)
  [Docs] Japanese translation of docs/pr_checklist.md (qmk#10415)
  [Keyboard] Add Voyager60-Alps keyboard (qmk#10516)
  [Keymap] Add own KBD67 MKII keymap (qmk#10532)
  [Keyboard] Update to ZSA Boards (qmk#10119)
  [Keyboard] update boot-mode method for EVE Meteor docs (qmk#10453)
  [Keyboard] Melgeek mj63 (qmk#10424)
  [Keyboard] update keymap of zergo keyboard (qmk#10402)
  Update tags to check for document updates (qmk#10606)
  updating my own keyboard layout (qmk#10626)
  Fix typo within debounce documentation (qmk#10600)
  Add STM32Duino to bootloader selection (qmk#10558)
  Remove bootloader_defs.h for some F072 boards (qmk#10582)
  Partial fix for sendstring_french.h (qmk#10623)
  ...
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
@greenjack-z @noroadsleft
@fauxpark @ridingqwerty
[Keyboard] update keymap of zergo keyboard (qmk#10402)
6dfebbd 
* Rename keyboards/handwired/zergo/keymap.c to keyboards/handwired/zergo/keymaps/default/keymap.c

* Update rules.mk

* Update rules.mk

* Update bootloader.mk

* Update rules.mk

* Update bootloader.mk

* Update info.json

* Update rules.mk

* Update zergo.h

* Update info.json

* Update keymap.c

* Update keyboards/handwired/zergo/info.json

Co-authored-by: Ryan <[email protected]>

* Update keyboards/handwired/zergo/keymaps/default/keymap.c

Co-authored-by: James Young <[email protected]>

* update layout

* update zergo layout

* update layout

* Update keyboards/handwired/zergo/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <[email protected]>

Co-authored-by: James Young <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: ridingqwerty <[email protected]>
oscarcarlsson pushed a commit to oscarcarlsson/qmk_firmware that referenced this pull request Nov 2, 2020
@greenjack-z @noroadsleft
@fauxpark @ridingqwerty
[Keyboard] update keymap of zergo keyboard (qmk#10402)
7d5407c 
* Rename keyboards/handwired/zergo/keymap.c to keyboards/handwired/zergo/keymaps/default/keymap.c

* Update rules.mk

* Update rules.mk

* Update bootloader.mk

* Update rules.mk

* Update bootloader.mk

* Update info.json

* Update rules.mk

* Update zergo.h

* Update info.json

* Update keymap.c

* Update keyboards/handwired/zergo/info.json

Co-authored-by: Ryan <[email protected]>

* Update keyboards/handwired/zergo/keymaps/default/keymap.c

Co-authored-by: James Young <[email protected]>

* update layout

* update zergo layout

* update layout

* Update keyboards/handwired/zergo/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <[email protected]>

Co-authored-by: James Young <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: ridingqwerty <[email protected]>
jordanlewis added a commit to jordanlewis/qmk_firmware that referenced this pull request Feb 8, 2021
@jordanlewis
Merge remote-tracking branch 'upstream/master' into master
e1711d5 
* upstream/master: (1255 commits)
  Fix config for Helix rev3 4rows (qmk#10641)
  Update other_vscode.md of Japanese document (qmk#10604)
  Fix issues with suspend code for ZSA split boards (qmk#10640)
  Update reviung34 PRODUCT_ID (qmk#10480)
  Whitefox refactor (qmk#10175)
  Fix for issue qmk#10386 - Can't compile preonic:dudeofawesome (qmk#10557)
  Update Japanese document (qmk#10607)
  [Docs] Japanese translation of docs/pr_checklist.md (qmk#10415)
  [Keyboard] Add Voyager60-Alps keyboard (qmk#10516)
  [Keymap] Add own KBD67 MKII keymap (qmk#10532)
  [Keyboard] Update to ZSA Boards (qmk#10119)
  [Keyboard] update boot-mode method for EVE Meteor docs (qmk#10453)
  [Keyboard] Melgeek mj63 (qmk#10424)
  [Keyboard] update keymap of zergo keyboard (qmk#10402)
  Update tags to check for document updates (qmk#10606)
  updating my own keyboard layout (qmk#10626)
  Fix typo within debounce documentation (qmk#10600)
  Add STM32Duino to bootloader selection (qmk#10558)
  Remove bootloader_defs.h for some F072 boards (qmk#10582)
  Partial fix for sendstring_french.h (qmk#10623)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@ridingqwerty ridingqwerty ridingqwerty approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@greenjack-z @drashna @ridingqwerty @noroadsleft