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

Personal user space and CRKBD R2G keymap #15888

Merged
merged 70 commits into from
Mar 10, 2022
Merged

Personal user space and CRKBD R2G keymap #15888

merged 70 commits into from
Mar 10, 2022

Conversation

RMeli
Copy link
Contributor

@RMeli RMeli commented Jan 15, 2022 •
edited
Loading

Personal user space and keymap for CRKBD R2G.

Description

Added Unicode keys and useful tap dances (parenthesis, shift, caps lock).

Added personal keymap for the CRKBD (R2G version).

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

e11i0t23 and others added 30 commits November 28, 2021 00:28
@e11i0t23
r2g folder groundwork
7474bbe
@e11i0t23
Default mb keymap featuring mb logos
0631529
@e11i0t23
Migrate Oled to keyboard folder
cf927c1
@e11i0t23
Move rules configs to support config better
96dac1b
@e11i0t23
update readmes
67f89bb
@e11i0t23
Liscnece update
85851b5
@e11i0t23
Update config and fix issues caused by redef errs
91d4150
@e11i0t23
funciton name adjusts, define specific rgb modes
00b9af0
@e11i0t23
move default oled font to postconfig
0601c17
@e11i0t23
update oled in line with develop merge
58caead
@e11i0t23
fix return value
674a2eb
@e11i0t23
Add some default rgb matrix defines
c6a0c84
@e11i0t23
del ugfx
faf2269
@e11i0t23
remove #include <stdio.h>
74b0603
@RMeli
create personal keymap for r2g
097ee4d
@RMeli
reduce firmware size
b2afe51
@RMeli
change keymap to follow physical layout
87c6116
@RMeli
remove RGBlight config lines to make both sides work (@Dasky on Mechb…
e6941a1 
…oardsUK Discord)
@RMeli
strip down configuration, similar to crkbd/r2g:mb_via
38c08c7
@RMeli
remove wrong oled code overwriting the r2g one
7a54ef7
@RMeli
broken code with RGB matrix (briks right side)
c8208ef
@RMeli
remove high max brightness limit
f292c87
@RMeli
caps lock tap dance and RGB indicator for active caps lock
e909026
@RMeli
fix caps lock led on right side
eac36b9
@RMeli
add test macro
96dbd70
@RMeli
remove latex macro which is too slow
21f58c4
@RMeli
move caps lock tap dance to RALT and add space cadet shift
6da634f
@RMeli
switch CTL with ALT in first layer
9f06d39
@RMeli
add tap dance for ESC/DEL
69f3450
@RMeli
space cadet tap dance with caps lock; shift works by needs a short pause
dd47bb2
drashna
drashna requested changes Jan 29, 2022
View reviewed changes
keyboards/crkbd/keymaps/rmeli/keymap.c Outdated Show resolved Hide resolved
keyboards/crkbd/keymaps/rmeli/keymap.c Outdated Show resolved Hide resolved
users/rmeli/keyrecords/tap_dances.c Show resolved Hide resolved
users/rmeli/keyrecords/tap_dances.h Show resolved Hide resolved
users/rmeli/keyrecords/unicode.h Show resolved Hide resolved
users/rmeli/oled/oled.c Show resolved Hide resolved
users/rmeli/oled/oled.h Show resolved Hide resolved
users/rmeli/rmeli.h Show resolved Hide resolved
@RMeli
Copy link
Contributor Author

RMeli commented Jan 29, 2022

Thank you @drashna for having a look at this! I think I addressed all the issues.

@RMeli RMeli requested a review from drashna January 29, 2022 09:47
@drashna drashna requested a review from a team January 29, 2022 16:13
@noroadsleft noroadsleft merged commit ee71362 into qmk:master Mar 10, 2022
@noroadsleft
Copy link
Member

Thanks!

For future reference, we recommend against committing to your master branch as you've done here, because pull requests from modified master branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your fork updated here:

Best Practices: Your Fork's Master: Update Often, Commit Never

Fixing Your Branch will walk you through fixing up your master branch moving forward. If you need any help with this just ask.

Thanks for contributing!

@RMeli
Copy link
Contributor Author

RMeli commented Mar 11, 2022

Not sure why I worked directly in master here, I switched to branches for other keyboards.Many thanks @noroadsleft for the review and merging.

@RMeli RMeli deleted the master branch March 11, 2022 10:08
@RMeli RMeli restored the master branch March 11, 2022 10:08
@RMeli RMeli deleted the master branch March 11, 2022 10:08
@RMeli RMeli restored the master branch March 11, 2022 10:08
0xcharly pushed a commit to Bastardkb/bastardkb-qmk that referenced this pull request Jul 4, 2022
@RMeli @zykrah
Personal user space and CRKBD R2G keymap (qmk#15888)
3f7123a 
* r2g folder groundwork

* Default mb keymap featuring mb logos

* Migrate Oled to keyboard folder

* Move rules configs to support config better

* update readmes

* Liscnece update

* Update config and fix issues caused by redef errs

* funciton name adjusts, define specific rgb modes

* move default oled font to postconfig

* update oled in line with develop merge

* fix return value

* Add some default rgb matrix defines

* del ugfx

* remove #include <stdio.h>

* create personal keymap for r2g

* reduce firmware size

* change keymap to follow physical layout

* remove RGBlight config lines to make both sides work (@Dasky on MechboardsUK Discord)

* strip down configuration, similar to crkbd/r2g:mb_via

* remove wrong oled code overwriting the r2g one

* broken code with RGB matrix (briks right side)

* remove high max brightness limit

* caps lock tap dance and RGB indicator for active caps lock

* fix caps lock led on right side

* add test macro

* remove latex macro which is too slow

* move caps lock tap dance to RALT and add space cadet shift

* switch CTL with ALT in first layer

* add tap dance for ESC/DEL

* space cadet tap dance with caps lock; shift works by needs a short pause

* add space cadet tap dance with caps lock on the right; shift works by needs a short pause and does not hold

* make more keys transparent

* enable auto shift and use logo on both oleds

* add user oled logo, slows down linking considerably

* oled name

* add arrow keys in usual configuration and add linear configuration to symbol layer

* add unicoede support

* add accents

* update to latest version

* add colemak dh layer

* report auto shift timeout

* define layer name shorcuts correctly

* disable VIA to enable more layers

* enable NKRO

* move some rules and unicode to user space

* move oled and tap dances to user space

* move tap dances fully out of keymap

* expand unicode map

* fix unicode code

* revert changes to r2g, make it equal to merged code

* revert changes to r2g, make it equal to merged code

* clang-format userspace

* clang-format config file

* Update keyboards/crkbd/keymaps/rmeli/keymap.c

* replace define with enum

* add licenses
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@RMeli @noroadsleft @drashna @e11i0t23