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

Add the Kyria keyboard to the repository #7222

Merged
merged 45 commits into from
Nov 3, 2019
Merged

Add the Kyria keyboard to the repository #7222

merged 45 commits into from
Nov 3, 2019

Conversation

splitkb
Copy link
Contributor

@splitkb splitkb commented Oct 31, 2019

Description

The Kyria is a new keyboard by Thomas Baart. With this pull request I'd like to add this keyboard to QMK's repository.

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

There are no issues fixed or closed by this PR. Issue #7055 is related and can be reproduced on this keyboard with the attached keymaps.

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

Considering the amount of intermediate changes, please squash the changes.

Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

From https://docs.qmk.fm/#/contributing?id=general-guidelines:

Separate PRs into logical units. For example, do not submit one PR covering two separate features, instead submit a separate PR for each feature.

Personally, I would like to see the core changes to oled driver and encoder pulled out into separate PRs.

Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

I have to agree with @zvecr here. The driver and quantum changes should be pulled out to a separate PR, as per our contributing guidelines.

keyboards/kyria/config.h Outdated Show resolved Hide resolved
keyboards/kyria/config.h Outdated Show resolved Hide resolved
keyboards/kyria/config.h Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/kyria/rev1/rev1.h Outdated Show resolved Hide resolved
keyboards/kyria/rev1/rev1.h Outdated Show resolved Hide resolved
keyboards/kyria/rules.mk Outdated Show resolved Hide resolved
keyboards/kyria/rules.mk Outdated Show resolved Hide resolved
keyboards/kyria/rules.mk Outdated Show resolved Hide resolved
Thomas Baart and others added 3 commits October 31, 2019 21:05
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: Drashna Jaelre <drashna@live.com>
keyboards/kyria/readme.md Outdated Show resolved Hide resolved
keyboards/kyria/rules.mk Outdated Show resolved Hide resolved
keyboards/kyria/rules.mk Outdated Show resolved Hide resolved
keyboards/kyria/rules.mk Outdated Show resolved Hide resolved
keyboards/kyria/readme.md Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/default/keymap.c Outdated Show resolved Hide resolved
Thomas Baart and others added 5 commits November 1, 2019 00:42
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Thomas Baart and others added 5 commits November 1, 2019 00:47
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/thomasbaart/keymap.c Outdated Show resolved Hide resolved
Thomas Baart and others added 8 commits November 1, 2019 01:05
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@splitkb
Copy link
Contributor Author

splitkb commented Nov 1, 2019

I have resolved most of the feedback, with some points of attention:

I still have a question regarding the VENDOR_ID and PRODUCT_ID. Are there guidelines to get unique IDs for this? I wouldn't know what to put there.

@drashna drashna requested review from a team, zvecr and fauxpark November 2, 2019 00:32
@drashna drashna merged commit 25d4c0c into qmk:master Nov 3, 2019
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
* Added raw api for sending data directly to the buffer

* Added default keymap variant

* Applied proposed OLED display fix

* Keymap progress

* Keymap progress

* Fixed inconsistent tabs

* Fixed oled_write_raw apis

* Updated keymap

* Personal keymap

* Added functionality to own keymap

* Fixed spacing and build error

* Keymap changes

* Revert "Updated split encoders so indexes are based on left hand encoders first (qmk#6382)"

This reverts commit 46c49ae.

* Updated keymaps and configs

* Revert "Revert "Updated split encoders so indexes are based on left hand encoders first (qmk#6382)""

This reverts commit f6a85fe.

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/rev1.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Processed keymap feedback

* Reverted OLED raw API functionality
patrl pushed a commit to patrl/qmk_firmware that referenced this pull request Dec 29, 2019
* Added raw api for sending data directly to the buffer

* Added default keymap variant

* Applied proposed OLED display fix

* Keymap progress

* Keymap progress

* Fixed inconsistent tabs

* Fixed oled_write_raw apis

* Updated keymap

* Personal keymap

* Added functionality to own keymap

* Fixed spacing and build error

* Keymap changes

* Revert "Updated split encoders so indexes are based on left hand encoders first (qmk#6382)"

This reverts commit 46c49ae.

* Updated keymaps and configs

* Revert "Revert "Updated split encoders so indexes are based on left hand encoders first (qmk#6382)""

This reverts commit f6a85fe.

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/rev1.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Processed keymap feedback

* Reverted OLED raw API functionality
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
* Added raw api for sending data directly to the buffer

* Added default keymap variant

* Applied proposed OLED display fix

* Keymap progress

* Keymap progress

* Fixed inconsistent tabs

* Fixed oled_write_raw apis

* Updated keymap

* Personal keymap

* Added functionality to own keymap

* Fixed spacing and build error

* Keymap changes

* Revert "Updated split encoders so indexes are based on left hand encoders first (qmk#6382)"

This reverts commit 46c49ae.

* Updated keymaps and configs

* Revert "Revert "Updated split encoders so indexes are based on left hand encoders first (qmk#6382)""

This reverts commit f6a85fe.

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/rev1.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/rev1/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

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

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kyria/keymaps/thomasbaart/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Processed keymap feedback

* Reverted OLED raw API functionality
@leah-splitkb leah-splitkb deleted the kyria branch October 13, 2022 15:59
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.

6 participants