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 Keymap, removed RGB animations, added custom font for 0xCB 1337 #12336

Merged
merged 6 commits into from
Apr 19, 2021
Merged

Added Keymap, removed RGB animations, added custom font for 0xCB 1337 #12336

merged 6 commits into from
Apr 19, 2021

Conversation

Conor-Burns
Copy link
Contributor

Signed-off-by: Conor Burns mail@conor-burns.com

Description

  • added the keymap "jakob"
  • made a custom font
  • changed some OLED code for clearing the display (thanks for all the help in the discord :))
  • added RGB mode display for a specific layer
  • flipped encoder

Types of Changes

  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)

Issues Fixed or Closed by This PR

  • only stuff from my board :D

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.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Mar 22, 2021
@Conor-Burns Conor-Burns changed the title Added Keymap, removed RGB animations, added custom font Added 0xCB 1337 Keymap, removed RGB animations, added custom font Mar 22, 2021
@Conor-Burns Conor-Burns changed the title Added 0xCB 1337 Keymap, removed RGB animations, added custom font Added Keymap, removed RGB animations, added custom font for 0xCB 1337 Mar 22, 2021
fauxpark
fauxpark requested changes Mar 27, 2021
View reviewed changes
keyboards/0xcb/1337/config.h Outdated Show resolved Hide resolved
@Conor-Burns
Copy link
Contributor Author

@fauxpark Could you rerun Travis CI? it exceeded the time limit?!

@fauxpark
Copy link
Member

You'll need to rebase the PR so that Travis only picks up these changes.

@Conor-Burns
added new keymap and made changes to the oled + custom font - also re…
4ea8183 
…moved some rgb animations

Signed-off-by: Conor Burns <mail@conor-burns.com>
@Conor-Burns
remove if
0cc4bfa 
Signed-off-by: Conor Burns <mail@conor-burns.com>
@Conor-Burns
Copy link
Contributor Author

Ah thanks - done

fauxpark
fauxpark requested changes Mar 28, 2021
View reviewed changes
keyboards/0xcb/1337/config.h Outdated Show resolved Hide resolved
@Conor-Burns
moved include for stdio.h to keymap
dc4ccc2 
Signed-off-by: Conor Burns <mail@conor-burns.com>
@fauxpark fauxpark requested a review from a team March 28, 2021 12:08
drashna
drashna requested changes Apr 3, 2021
View reviewed changes
keyboards/0xcb/1337/gfxfont.c Show resolved Hide resolved
keyboards/0xcb/1337/config.h Show resolved Hide resolved
@Conor-Burns
added licence to font
ddca5e1 
Signed-off-by: Conor Burns <mail@conor-burns.com>
@Conor-Burns Conor-Burns requested a review from drashna April 3, 2021 08:43
@Conor-Burns
changed encoder steps
177809f 
Signed-off-by: Conor Burns <mail@conor-burns.com>
@Conor-Burns
revertet encoder step change ._.
16175b6 
Signed-off-by: Conor Burns <mail@conor-burns.com>
@fauxpark fauxpark requested a review from a team April 12, 2021 04:22
@drashna
Copy link
Member

drashna commented Apr 19, 2021

Thanks!

@drashna drashna merged commit 0b56067 into qmk:master Apr 19, 2021
makenova pushed a commit to makenova/qmk_firmware that referenced this pull request Apr 26, 2021
@Conor-Burns @makenova
[Keyboard] Updates for 0xCB 1337 (qmk#12336)
99f3215
rizo pushed a commit to rizo/qmk_firmware that referenced this pull request May 10, 2021
@Conor-Burns @rizo
[Keyboard] Updates for 0xCB 1337 (qmk#12336)
e99561f
toddyamakawa pushed a commit to toddyamakawa/qmk_firmware that referenced this pull request May 19, 2021
@Conor-Burns @toddyamakawa
[Keyboard] Updates for 0xCB 1337 (qmk#12336)
aeb0325
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
@Conor-Burns @HokieGeek
[Keyboard] Updates for 0xCB 1337 (qmk#12336)
eb59aee
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

@fauxpark fauxpark fauxpark approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Conor-Burns @fauxpark @drashna