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

add tofu_jr keyboard #18960

Merged
merged 34 commits into from
Dec 14, 2022
Merged

add tofu_jr keyboard #18960

merged 34 commits into from
Dec 14, 2022

Conversation

moyi4681
Copy link
Contributor

@moyi4681 moyi4681 commented Nov 5, 2022 •
edited
Loading

Description

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

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

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Nov 5, 2022
drashna
drashna requested changes Nov 13, 2022
View reviewed changes
keyboards/dztech/tofu/jr/v1/halconf.h Show resolved Hide resolved
keyboards/dztech/tofu/jr/v1/mcuconf.h Show resolved Hide resolved
keyboards/dztech/tofu/jr/v1/v1.c Outdated Show resolved Hide resolved
users/mechmerlin/mechmerlin.c Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team November 15, 2022 18:29
fauxpark
fauxpark requested changes Nov 16, 2022
View reviewed changes
keyboards/dztech/tofu/jr/v1/v1.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/v1/v1.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/keymaps/default/keymap.c Outdated Show resolved Hide resolved
moyi4681 and others added 8 commits November 17, 2022 08:07
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/v1/v1.c
8d154a0 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/v1/v1.c
0625156 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/keymaps/via/keymap.c
03fde8c 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/keymaps/via/keymap.c
9810208 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/keymaps/via/keymap.c
72d474f 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/keymaps/default/keymap.c
8fb58da 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/keymaps/default/keymap.c
c628552 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/keymaps/default/keymap.c
3d0c72b 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 moyi4681 requested a review from fauxpark November 17, 2022 01:09
@moyi4681 moyi4681 mentioned this pull request Nov 19, 2022
Closed
6 tasks
@drashna drashna requested a review from a team November 20, 2022 05:30
fauxpark
fauxpark requested changes Nov 29, 2022
View reviewed changes
keyboards/dztech/tofu/jr/v1/config.h Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/v1/config.h Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/v1/info.json Outdated Show resolved Hide resolved
keyboards/dztech/tofu/jr/v1/v1.c Outdated Show resolved Hide resolved
moyi4681 and others added 4 commits November 29, 2022 20:01
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/v1/config.h
b3e33e8 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/v1/config.h
fb9f785 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/v1/info.json
58e5fcf 
Co-authored-by: Ryan <fauxpark@gmail.com>
@moyi4681 @fauxpark
Update keyboards/dztech/tofu/jr/v1/v1.c
df2f31f 
Co-authored-by: Ryan <fauxpark@gmail.com>
@drashna drashna requested a review from a team December 4, 2022 02:32
@fauxpark
Copy link
Member

fauxpark commented Dec 14, 2022 •
edited
Loading

Last commit should be reverted, I think, and fixed on develop after merge.

@moyi4681
Revert "FIX I2C setting"
f62b50e 
This reverts commit 336300e.
@tzarc tzarc merged commit 4c5e060 into qmk:master Dec 14, 2022
@moyi4681 moyi4681 deleted the JR branch December 14, 2022 22:37
@moyi4681 moyi4681 mentioned this pull request Dec 15, 2022
Merged
6 tasks
crembz pushed a commit to crembz/qmk_firmware that referenced this pull request Dec 18, 2022
@moyi4681 @fauxpark @crembz
add tofu_jr keyboard (qmk#18960)
a15ab62 
Co-authored-by: Ryan <fauxpark@gmail.com>
sbhal pushed a commit to sbhal/qmk_firmware that referenced this pull request Dec 30, 2022
@moyi4681 @fauxpark
add tofu_jr keyboard (qmk#18960)
61a261d 
Co-authored-by: Ryan <fauxpark@gmail.com>
omikronik pushed a commit to omikronik/qmk_firmware that referenced this pull request Jan 22, 2023
@moyi4681 @fauxpark @omikronik
add tofu_jr keyboard (qmk#18960)
ecefd8e 
Co-authored-by: Ryan <fauxpark@gmail.com>
ideas32 pushed a commit to ideas32/qmk_firmware that referenced this pull request Jan 25, 2023
@moyi4681 @fauxpark @ideas32
add tofu_jr keyboard (qmk#18960)
4dbea2e 
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
Reviewers

@drashna drashna drashna approved these changes

@tzarc tzarc tzarc 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.
4 participants
@moyi4681 @fauxpark @drashna @tzarc