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

Add Kira 80 support #8342

Merged
merged 19 commits into from
Mar 9, 2020
Merged

Add Kira 80 support #8342

merged 19 commits into from
Mar 9, 2020

Conversation

kb-elmo
Copy link
Contributor

@kb-elmo kb-elmo commented Mar 8, 2020

Description

Added support for the original Kira 80 TKL PCB (uses ps2avrgb firmware)

Types of Changes

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

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

fauxpark
fauxpark requested changes Mar 8, 2020
View reviewed changes
keyboards/kira80/keymaps/default/config.h Outdated Show resolved Hide resolved
keyboards/kira80/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
keyboards/kira80/rules.mk Show resolved Hide resolved
keyboards/kira80/usbconfig.h Outdated Show resolved Hide resolved
keyboards/kira80/usbconfig.h Outdated Show resolved Hide resolved
keyboards/kira80/usbconfig.h Outdated Show resolved Hide resolved
keyboards/kira80/usbconfig.h Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team March 8, 2020 12:53
kb-elmo and others added 11 commits March 8, 2020 14:00
@kb-elmo
Delete config.h
930eacb
@kb-elmo @fauxpark
Update keyboards/kira80/keymaps/default/keymap.c
4f3359c 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo @fauxpark
Update keyboards/kira80/readme.md
3a1489a 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo @fauxpark
Update keyboards/kira80/rules.mk
aa05491 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo @fauxpark
Update keyboards/kira80/usbconfig.h
fb9a92c 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo @fauxpark
Update keyboards/kira80/usbconfig.h
a4b393d 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo @fauxpark
Update keyboards/kira80/usbconfig.h
32d27e6 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo @fauxpark
Update keyboards/kira80/usbconfig.h
527854d 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo
update readme and fix wrong LED assignment (scrolllock instead of num…
1395f24 
…lock)
@kb-elmo @fauxpark
Update keyboards/kira80/rules.mk
7d6ef1f 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo
fix weird double commit
f63148e
@kb-elmo
Copy link
Contributor Author

kb-elmo commented Mar 8, 2020

all requested changes are done. github just doesn't want to mark one of them as resolved for some reason...

noroadsleft
noroadsleft requested changes Mar 9, 2020
View reviewed changes
keyboards/kira80/info.json Outdated Show resolved Hide resolved
keyboards/kira80/info.json Outdated Show resolved Hide resolved
keyboards/kira80/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
kb-elmo and others added 6 commits March 9, 2020 10:50
@kb-elmo @noroadsleft
exchange images in readme for smaller versions
99d433b 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@kb-elmo @noroadsleft
Update keyboards/kira80/readme.md
55b3302 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@kb-elmo @noroadsleft
Update keyboards/kira80/readme.md
e33f4bd 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@kb-elmo @noroadsleft
Update keyboards/kira80/readme.md
960158a 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@kb-elmo @noroadsleft
Update keyboards/kira80/readme.md
713c019 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@kb-elmo @noroadsleft
Apply suggestions from code review
c4a7890 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
fauxpark
fauxpark requested changes Mar 9, 2020
View reviewed changes
keyboards/kira80/config.h Outdated Show resolved Hide resolved
keyboards/kira80/readme.md Outdated Show resolved Hide resolved
@kb-elmo @fauxpark
Apply suggestions from code review
e7d44e9 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@kb-elmo kb-elmo requested a review from fauxpark March 9, 2020 10:56
@noroadsleft noroadsleft merged commit 5e4fcfa into qmk:master Mar 9, 2020
@noroadsleft
Copy link
Member

Thanks!

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Mar 11, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
4f559f7 
* 'master' of https://github.com/qmk/qmk_firmware: (107 commits)
  Add VIA support to Tokyo60. (qmk#8362)
  fix kira80 matrix mapping and add more preset layouts (qmk#8361)
  Rename qmk json-keymap to qmk json2c (qmk#8372)
  format code according to conventions [skip ci]
  Feature: RGBLight layers (qmk#7768)
  Refactor Equinox PCB revisions (qmk#8266)
  Replace tab indentation with spaces in is0 default keymap. (qmk#8368)
  Fix layer debug calls (qmk#8370)
  [Keymap] Added HHKB Keymap and user config (qmk#8119)
  Refactor rgblight_reconfig.h (qmk#7773)
  [Keyboard] Palette1202 (qmk#7736)
  [Keyboard] Helix add split common option (qmk#7718)
  Enable bootmagic lite for CU80 (qmk#8363)
  [Keymap] Update personal keymap (qmk#8354)
  Remove NO_UART defines from config.h for V-USB boards (qmk#8351)
  [Keyboard] Add Kira 80 support (qmk#8342)
  [Keyboard] Add PRKL30 keyboard (qmk#8319)
  Update Dvorak, Colemak and Workman keycode aliases (qmk#8217)
  Move splittest I2C (qmk#8346)
  [Keymap] planck layout for kifinnsson (qmk#8324)
  ...
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@kb-elmo @c0psrul3
[Keyboard] Add Kira 80 support (qmk#8342)
aa97435 
* add kira 80 initial support

* Delete config.h

* Update keyboards/kira80/keymaps/default/keymap.c

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/rules.mk

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* update readme and fix wrong LED assignment (scrolllock instead of numlock)

* Update keyboards/kira80/rules.mk

* fix weird double commit

* exchange images in readme for smaller versions

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Apply suggestions from code review

* Apply suggestions from code review
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Apr 2, 2020
@kb-elmo @sowbug
[Keyboard] Add Kira 80 support (qmk#8342)
202d79c 
* add kira 80 initial support

* Delete config.h

* Update keyboards/kira80/keymaps/default/keymap.c

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/rules.mk

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* update readme and fix wrong LED assignment (scrolllock instead of numlock)

* Update keyboards/kira80/rules.mk

* fix weird double commit

* exchange images in readme for smaller versions

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Apply suggestions from code review

* Apply suggestions from code review
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Apr 10, 2020
@kb-elmo @HokieGeek
[Keyboard] Add Kira 80 support (qmk#8342)
7e45456 
* add kira 80 initial support

* Delete config.h

* Update keyboards/kira80/keymaps/default/keymap.c

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/rules.mk

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* update readme and fix wrong LED assignment (scrolllock instead of numlock)

* Update keyboards/kira80/rules.mk

* fix weird double commit

* exchange images in readme for smaller versions

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Apply suggestions from code review

* Apply suggestions from code review
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@kb-elmo @kujawakk
[Keyboard] Add Kira 80 support (qmk#8342)
69c8a49 
* add kira 80 initial support

* Delete config.h

* Update keyboards/kira80/keymaps/default/keymap.c

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/rules.mk

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* update readme and fix wrong LED assignment (scrolllock instead of numlock)

* Update keyboards/kira80/rules.mk

* fix weird double commit

* exchange images in readme for smaller versions

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Apply suggestions from code review

* Apply suggestions from code review
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@kb-elmo @jakobaa
[Keyboard] Add Kira 80 support (qmk#8342)
acfb6af 
* add kira 80 initial support

* Delete config.h

* Update keyboards/kira80/keymaps/default/keymap.c

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/rules.mk

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* update readme and fix wrong LED assignment (scrolllock instead of numlock)

* Update keyboards/kira80/rules.mk

* fix weird double commit

* exchange images in readme for smaller versions

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Apply suggestions from code review

* Apply suggestions from code review
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
@kb-elmo @jakeisnt
[Keyboard] Add Kira 80 support (qmk#8342)
ef1240a 
* add kira 80 initial support

* Delete config.h

* Update keyboards/kira80/keymaps/default/keymap.c

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/rules.mk

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* Update keyboards/kira80/usbconfig.h

* update readme and fix wrong LED assignment (scrolllock instead of numlock)

* Update keyboards/kira80/rules.mk

* fix weird double commit

* exchange images in readme for smaller versions

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Update keyboards/kira80/readme.md

* Apply suggestions from code review

* Apply suggestions from code review
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

@noroadsleft noroadsleft noroadsleft 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.
3 participants
@kb-elmo @noroadsleft @fauxpark