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

Added Layout & Keymap #10030

Merged
merged 26 commits into from
Aug 16, 2020
Merged

Added Layout & Keymap #10030

merged 26 commits into from
Aug 16, 2020

Conversation

mrsendyyk
Copy link
Contributor

@mrsendyyk mrsendyyk commented Aug 13, 2020 •
edited
Loading

Description

@ai03-2725 Soyuz:

  1. Added LAYOUT_5x4
  2. Added keymap.c
  3. Added readme.md
  4. Update rules.mk

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

  • None

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).

@mrsendyyk
ai03 Soyuz
3948dbf 
## Description
@ai03-2725 Soyuz:
1. Update `soyuz.h` (Add `LAYOUT_5x4`)
2. Added `keymap.c`
3. Added `readme.md`
@mrsendyyk
Update readme.md
664c323
@mrsendyyk
Update readme.md
e9912c1
@mrsendyyk
Update keymap.c
e51e7cd
@mrsendyyk
Update keymap.c
2e1535e
@mrsendyyk
Update keymap.c
5357204
@mrsendyyk
Update keymap.c
157304a
zvecr
zvecr requested changes Aug 13, 2020
View reviewed changes
keyboards/ai03/soyuz/soyuz.h Outdated Show resolved Hide resolved
keyboards/ai03/soyuz/soyuz.h Outdated Show resolved Hide resolved
keyboards/ai03/soyuz/keymaps/mrsendyyk/keymap.c Outdated Show resolved Hide resolved
keyboards/ai03/soyuz/keymaps/mrsendyyk/keymap.c Outdated Show resolved Hide resolved
@zvecr zvecr requested a review from a team August 13, 2020 21:42
@zvecr
Copy link
Member

zvecr commented Aug 13, 2020

qmk_firmware/keyboards/ai03/soyuz/rules.mk

Line 34 in 7c7078f

LAYOUTS = ortho_5x4

Should also be updated to LAYOUTS = ortho_5x4 numpad_5x4

mrsendyyk and others added 6 commits August 14, 2020 04:56
@mrsendyyk @zvecr
Update soyuz.h
8f4488a 
Co-authored-by: Joel Challis <git@zvecr.com>
@mrsendyyk @zvecr
Update keyboards/ai03/soyuz/soyuz.h
c3bb81a 
Co-authored-by: Joel Challis <git@zvecr.com>
@mrsendyyk @zvecr
Update keyboards/ai03/soyuz/keymaps/mrsendyyk/keymap.c
0d95c7e 
Co-authored-by: Joel Challis <git@zvecr.com>
@mrsendyyk @zvecr
Update keyboards/ai03/soyuz/keymaps/mrsendyyk/keymap.c
d0e2dc4 
Co-authored-by: Joel Challis <git@zvecr.com>
@mrsendyyk
Update rules.mk
cce5955
@mrsendyyk
Merge branch 'dev_soyuz' of https://github.com/mrsendyyk/qmk_firmware …
7ac83d2 
…into dev_soyuz
@mrsendyyk
Copy link
Contributor Author

qmk_firmware/keyboards/ai03/soyuz/rules.mk

Line 34 in 7c7078f

LAYOUTS = ortho_5x4

Should also be updated to LAYOUTS = ortho_5x4 numpad_5x4

Done @zvecr

mrsendyyk
mrsendyyk commented Aug 14, 2020
View reviewed changes
Copy link
Contributor Author

@mrsendyyk mrsendyyk left a comment

Choose a reason for hiding this comment

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

Ok done

@zvecr zvecr merged commit 7c7feb4 into qmk:master Aug 16, 2020
@zvecr
Copy link
Member

zvecr commented Aug 16, 2020

Thanks!

@mrsendyyk
Copy link
Contributor Author

Thank you.

@mrsendyyk mrsendyyk deleted the dev_soyuz branch August 16, 2020 16:51
@mrsendyyk mrsendyyk mentioned this pull request Aug 20, 2020
Closed
@mrsendyyk
Copy link
Contributor Author

#794 on qmk/qmk_configurator

nicocesar pushed a commit to nicocesar/qmk_firmware that referenced this pull request Sep 6, 2020
@mrsendyyk @zvecr @nicocesar
Add numpad llayout to ai03/soyuz & personal keymap (qmk#10030)
353d1f2 
* ai03 Soyuz

## Description
@ai03-2725 Soyuz:
1. Update `soyuz.h` (Add `LAYOUT_5x4`)
2. Added `keymap.c`
3. Added `readme.md`

* Update readme.md

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update soyuz.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/ai03/soyuz/soyuz.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/ai03/soyuz/keymaps/mrsendyyk/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/ai03/soyuz/keymaps/mrsendyyk/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update rules.mk

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update rules.mk

* Update soyuz.h

* Update soyuz.h

* Update

* Rename readme.md to README.md

* Update keymap.c

* Rename README.md to readme.md

Co-authored-by: Joel Challis <git@zvecr.com>
@mrsendyyk mrsendyyk mentioned this pull request Oct 5, 2020
Closed
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@zvecr zvecr zvecr approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@mrsendyyk @zvecr @fauxpark