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

[Keymap] Added 5x6_5 keymap #10272

Merged
merged 9 commits into from
Oct 4, 2020
Merged

[Keymap] Added 5x6_5 keymap #10272

merged 9 commits into from
Oct 4, 2020

Conversation

333fred
Copy link
Contributor

@333fred 333fred commented Sep 9, 2020

Description

I have a new keyboard, so as usual I'm upstreaming the keymap I created for it. I have some LCD screens on this board, so I added a quote displayer for a few quotes from books in The Stormlight Archive and The Wheel of Time.

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

@333fred
Copy link
Contributor Author

333fred commented Sep 10, 2020

Some updates from a day of usage:

  • I wanted to make sure that my random quote display mechanism wasn't waking the display up every 5 minutes, so I added a small utility function to the OLED driver to tell if the display is on. I also updated the docs to include it, please let me know if there is anywhere else I should add it to.
  • I've filled my keyboard with as many random quotes from The Stormlight Archive and The Wheel of Time as I could fit. I currently have 6 bytes free, so if we could just never add features that take more memory again that would be fantastic... 😅

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.

Could the oled code be pulled out into a separate PR?

users/333fred/333fred.h Show resolved Hide resolved
users/333fred/rules.mk Outdated Show resolved Hide resolved
@333fred
Copy link
Contributor Author

333fred commented Sep 21, 2020

Rebased this PR to put the oled change first. When #10382 is merged, I can rebase this PR on top of master and drop that commit.

@drashna
Copy link
Member

drashna commented Sep 22, 2020

Is merged, so rebase away!

* Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes.
* Turn off the OLEDs after 5 minutes
* Move the keys around a bit.
* Add many more quotes.
… Adjusted the keymap slightly. Adjust the mods display to include one_shots.
@333fred
Copy link
Contributor Author

333fred commented Sep 22, 2020

Done, thanks!

@333fred
Copy link
Contributor Author

333fred commented Sep 24, 2020

@noroadsleft what are the options? I generally tend to prefer licenses like MIT or BSD-3, but I'm not sure how that squares with the rest of the QMK repo itself, as it's GPL

@noroadsleft
Copy link
Member

what are the options? I generally tend to prefer licenses like MIT or BSD-3, but I'm not sure how that squares with the rest of the QMK repo itself, as it's GPL

My understanding of this from recent conversations is that both MIT and BSD-3 are compatible with GPL2 distribution.

@333fred
Copy link
Contributor Author

333fred commented Oct 1, 2020

@noroadsleft sorry for the delay. I wanted to get all my keymaps at once.

users/333fred/rgb.c Outdated Show resolved Hide resolved
Co-authored-by: Ryan <fauxpark@gmail.com>
@Erovia Erovia requested a review from a team October 1, 2020 21:20
@@ -7,3 +7,4 @@ endif
TAP_DANCE_ENABLE=yes
NKRO_ENABLE = yes
PERMISSIVE_HOLD = yes
LTO_ENABLE = yes
Copy link
Member

Choose a reason for hiding this comment

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

You may not want this applying to everything, as it can cause issues on ChibiOS (ARM). Though, that may not be an issue for you, at least, as of yet.

@drashna drashna merged commit 1aacbc4 into qmk:master Oct 4, 2020
@333fred 333fred deleted the manuform branch October 4, 2020 19:29
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Oct 7, 2020
* 'master' of https://github.com/qmk/qmk_firmware: (178 commits)
  Docs: fix udev rules
  [CLI] Add c2json (qmk#8817)
  Improve LAYOUT macro searching (qmk#9530)
  CLI: update subcommands to use return instead of exit() (qmk#10323)
  Fixes small typo in docs (qmk#10515)
  Update personal keymap for Let's Split keyboard. (qmk#10536)
  [Keymap] Move my custom functions and keymaps to userspace (qmk#10502)
  [Keyboard] add support for ymd75 rev3 (qmk#10483)
  [Keyboard] Add soy20 PCB (qmk#10440)
  Fix for MIDI sustain effect issue (qmk#10361)
  format code according to conventions [skip ci]
  [Keyboard] Add Yugo-M Controller (qmk#10389)
  [Keymap] Add onekey keymap for OLED testing (qmk#10380)
  [Keymap] Add winterNebs keymaps  (qmk#10328)
  [Keymap] Added 333fred 5x6_5 keymap (qmk#10272)
  [Keyboard] Add hannah60rgb rev.2 PCB (qmk#10287)
  Adding VIA support to katana60 rev2 (qmk#10442)
  OLED driver fixes (qmk#10377)
  IS31FL3741 driver fixup (qmk#10519)
  add info.json for XD75 keyboard (qmk#10523)
  ...
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
* First pass at manuform layout.

* Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer.

* Use a 32-bit timer that can actually hit 5 minutes.

* Some updates after a day of usage:

* Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes.
* Turn off the OLEDs after 5 minutes
* Move the keys around a bit.
* Add many more quotes.

* Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots.

* Revert osm on lgui as it makes start menu search impossible to use.

* Use LTO_ENABLE flag.

* License all of my (333fred's) keymaps as MIT.

* Update users/333fred/rgb.c

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
oscarcarlsson pushed a commit to oscarcarlsson/qmk_firmware that referenced this pull request Nov 2, 2020
* First pass at manuform layout.

* Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer.

* Use a 32-bit timer that can actually hit 5 minutes.

* Some updates after a day of usage:

* Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes.
* Turn off the OLEDs after 5 minutes
* Move the keys around a bit.
* Add many more quotes.

* Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots.

* Revert osm on lgui as it makes start menu search impossible to use.

* Use LTO_ENABLE flag.

* License all of my (333fred's) keymaps as MIT.

* Update users/333fred/rgb.c

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
* First pass at manuform layout.

* Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer.

* Use a 32-bit timer that can actually hit 5 minutes.

* Some updates after a day of usage:

* Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes.
* Turn off the OLEDs after 5 minutes
* Move the keys around a bit.
* Add many more quotes.

* Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots.

* Revert osm on lgui as it makes start menu search impossible to use.

* Use LTO_ENABLE flag.

* License all of my (333fred's) keymaps as MIT.

* Update users/333fred/rgb.c

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
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.

5 participants