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

Keyboard rura66 #15853

Merged
merged 27 commits into from
Dec 12, 2022
Merged

Keyboard rura66 #15853

merged 27 commits into from
Dec 12, 2022

Conversation

ShinoharaTa
Copy link
Contributor

@ShinoharaTa ShinoharaTa commented Jan 12, 2022 •
edited
Loading

Please open this pull request again as #13613 has not been fixed.
The fix for #13613 has been merged into this pull request for me.
Please do a code review again.

drashna
drashna requested changes Jan 12, 2022
View reviewed changes
keyboards/rura66/readme.md Outdated Show resolved Hide resolved
keyboards/rura66/rev1/config.h Outdated Show resolved Hide resolved
keyboards/rura66/rev1/config.h Outdated Show resolved Hide resolved
keyboards/rura66/rev1/oled_display.c Outdated Show resolved Hide resolved
keyboards/rura66/rules.mk Outdated Show resolved Hide resolved
keyboards/rura66/rura66.h Show resolved Hide resolved
@drashna drashna requested a review from a team January 12, 2022 22:29
@github-actions github-actions bot added cli qmk cli command core dependencies documentation python translation via Adds via keymap and/or updates keyboard for via support labels Jan 13, 2022
@tzarc
Copy link
Member

tzarc commented Jan 16, 2022

Please fix your merge such that it's only your changes.

@github-actions github-actions bot added CI and removed cli qmk cli command dependencies labels Jan 17, 2022
@ShinoharaTa
Copy link
Contributor Author

I'm sorry.
There are many changes.
Delete this branch once, create a new branch from develop, and submit your pull request.
Please close this pull request.

@drashna
Copy link
Member

drashna commented Jan 17, 2022

rebasing it will most likely fix most of these issues.

@noroadsleft
Copy link
Member

noroadsleft commented Mar 10, 2022 •
edited
Loading

If rebasing is too intimidating or confusing, you can use git checkout to grab the files from another branch/commit, at the cost of losing the original Git history.

# Change to your local `Keyboard_RURA66` branch
git checkout Keyboard_RURA66

# Updates your local repo's `master` branch to be identical to that of QMK's `master` branch
git fetch upstream master:master

# Rewrites your local repo's `Keyboard_RURA66` branch to be identical to that of your local `master` branch
git reset --hard master                                                   

# Retrieves the contents of the `keyboards/rura66/` directory as of commit `0cf502fa96d30a643f0607650c628287a39b30ea`
git checkout 0cf502fa96d30a643f0607650c628287a39b30ea -- keyboards/rura66/

# Commit to branch as usual
git commit -m "Add RURA66 new keyboard"

# Push your local `Keyboard_RURA66` branch to GitHub, overwriting the changes to the `Keyboard_RURA66` branch that are on your GitHub fork
git push --force-with-lease

yswallow and others added 7 commits December 6, 2022 16:53
@yswallow
Fix config.h
6d9bd44 
- UNUSED_PINS is deprecated
- accept suggestion on PR
@yswallow
Fix oled_display.c
b9b112a 
- remove snprintf()
- OLED_DRIVER_ENABLE->OLED_ENABLE
- oled_task_user() returns false
@yswallow
Fix config.h
5568e41 
- no SPLIT_HAND_MATRIX_GRID
- no RGB Matrix
@yswallow
move default keymap readme
61ab121
@yswallow
add VIA keymap
ad934c1
@yswallow
Fix info.json
7140781 
- Fix keyboard URL
- Change VID/PID
@ShinoharaTa
Merge pull request #1 from yswallow/fix-RURA66
4c68429 
Fix rura66
@github-actions github-actions bot added the via Adds via keymap and/or updates keyboard for via support label Dec 10, 2022
@yswallow
Copy link
Contributor

I did many changes:

  • add instructions to how to enter bootloader on README
  • remove snprintf() on oled_display.c
  • disable RGB Matrix and backlight
  • disable SPLIT_HAND_MATRIX_GRID
  • change VID/PID
  • add VIA keymap

We're sorry that we enabled unnecessary features and that we make changes after your reviews.

@drashna drashna requested a review from a team December 11, 2022 02:44
fauxpark
fauxpark requested changes Dec 11, 2022
View reviewed changes
keyboards/rura66/rules.mk Outdated Show resolved Hide resolved
keyboards/rura66/rules.mk Show resolved Hide resolved
keyboards/rura66/rules.mk Outdated Show resolved Hide resolved
noroadsleft
noroadsleft requested changes Dec 12, 2022
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

One small thing from me:

keyboards/rura66/rev1/info.json Outdated Show resolved Hide resolved
@noroadsleft noroadsleft merged commit 6d0f944 into qmk:master Dec 12, 2022
@noroadsleft
Copy link
Member

Thanks!

@ShinoharaTa
Copy link
Contributor Author

Thanks for the merge.
I appreciate all of you.

crembz pushed a commit to crembz/qmk_firmware that referenced this pull request Dec 18, 2022
@ShinoharaTa @yswallow @crembz
Keyboard rura66 (qmk#15853)
7861102 
* add : BlackMask60 and MayShi.No30

* fix:spell miss

* change:keyboard name area

* change: default keymap

* 配列を自分用に変更

* MyKemap Update

* 構成変更

* Add RURA66 new keyboard

* remove additional files

* fix file

* fix info.json from rura66

* fix KC_LANG to KC_LNG from rura66

* Fix readme
- fix purchase URL
- adjust to the recent standard

* Fix rules.mk
- no backlight
- remove DIP switch/Bluetooth
- OLED_DRIVER_ENABLE -> OLED_ENABLE

* Fix rura66.h: add LICENSE

* Fix config.h
- UNUSED_PINS is deprecated
- accept suggestion on PR

* Fix oled_display.c
- remove snprintf()
- OLED_DRIVER_ENABLE->OLED_ENABLE
- oled_task_user() returns false

* Fix config.h
- no SPLIT_HAND_MATRIX_GRID
- no RGB Matrix

* move default keymap readme

* add VIA keymap

* Fix info.json
- Fix keyboard URL
- Change VID/PID

* Fix comments in rules.mk

* fix info.json keyboard url

Co-authored-by: yswallow <[email protected]>
sbhal pushed a commit to sbhal/qmk_firmware that referenced this pull request Dec 30, 2022
@ShinoharaTa @yswallow
Keyboard rura66 (qmk#15853)
4c7c7d9 
* add : BlackMask60 and MayShi.No30

* fix:spell miss

* change:keyboard name area

* change: default keymap

* 配列を自分用に変更

* MyKemap Update

* 構成変更

* Add RURA66 new keyboard

* remove additional files

* fix file

* fix info.json from rura66

* fix KC_LANG to KC_LNG from rura66

* Fix readme
- fix purchase URL
- adjust to the recent standard

* Fix rules.mk
- no backlight
- remove DIP switch/Bluetooth
- OLED_DRIVER_ENABLE -> OLED_ENABLE

* Fix rura66.h: add LICENSE

* Fix config.h
- UNUSED_PINS is deprecated
- accept suggestion on PR

* Fix oled_display.c
- remove snprintf()
- OLED_DRIVER_ENABLE->OLED_ENABLE
- oled_task_user() returns false

* Fix config.h
- no SPLIT_HAND_MATRIX_GRID
- no RGB Matrix

* move default keymap readme

* add VIA keymap

* Fix info.json
- Fix keyboard URL
- Change VID/PID

* Fix comments in rules.mk

* fix info.json keyboard url

Co-authored-by: yswallow <[email protected]>
omikronik pushed a commit to omikronik/qmk_firmware that referenced this pull request Jan 22, 2023
@ShinoharaTa @yswallow @omikronik
Keyboard rura66 (qmk#15853)
bdd060e 
* add : BlackMask60 and MayShi.No30

* fix:spell miss

* change:keyboard name area

* change: default keymap

* 配列を自分用に変更

* MyKemap Update

* 構成変更

* Add RURA66 new keyboard

* remove additional files

* fix file

* fix info.json from rura66

* fix KC_LANG to KC_LNG from rura66

* Fix readme
- fix purchase URL
- adjust to the recent standard

* Fix rules.mk
- no backlight
- remove DIP switch/Bluetooth
- OLED_DRIVER_ENABLE -> OLED_ENABLE

* Fix rura66.h: add LICENSE

* Fix config.h
- UNUSED_PINS is deprecated
- accept suggestion on PR

* Fix oled_display.c
- remove snprintf()
- OLED_DRIVER_ENABLE->OLED_ENABLE
- oled_task_user() returns false

* Fix config.h
- no SPLIT_HAND_MATRIX_GRID
- no RGB Matrix

* move default keymap readme

* add VIA keymap

* Fix info.json
- Fix keyboard URL
- Change VID/PID

* Fix comments in rules.mk

* fix info.json keyboard url

Co-authored-by: yswallow <[email protected]>
ideas32 pushed a commit to ideas32/qmk_firmware that referenced this pull request Jan 25, 2023
@ShinoharaTa @yswallow @ideas32
Keyboard rura66 (qmk#15853)
06e5502 
* add : BlackMask60 and MayShi.No30

* fix:spell miss

* change:keyboard name area

* change: default keymap

* 配列を自分用に変更

* MyKemap Update

* 構成変更

* Add RURA66 new keyboard

* remove additional files

* fix file

* fix info.json from rura66

* fix KC_LANG to KC_LNG from rura66

* Fix readme
- fix purchase URL
- adjust to the recent standard

* Fix rules.mk
- no backlight
- remove DIP switch/Bluetooth
- OLED_DRIVER_ENABLE -> OLED_ENABLE

* Fix rura66.h: add LICENSE

* Fix config.h
- UNUSED_PINS is deprecated
- accept suggestion on PR

* Fix oled_display.c
- remove snprintf()
- OLED_DRIVER_ENABLE->OLED_ENABLE
- oled_task_user() returns false

* Fix config.h
- no SPLIT_HAND_MATRIX_GRID
- no RGB Matrix

* move default keymap readme

* add VIA keymap

* Fix info.json
- Fix keyboard URL
- Change VID/PID

* Fix comments in rules.mk

* fix info.json keyboard url

Co-authored-by: yswallow <[email protected]>
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

@noroadsleft noroadsleft noroadsleft approved these changes

@fauxpark fauxpark Awaiting requested review from fauxpark

Assignees
No one assigned
Labels
awaiting changes 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.

None yet
7 participants
@ShinoharaTa @tzarc @drashna @noroadsleft @yswallow @fauxpark @keyboard-magpie