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

Adding Bear 65 Ergo Keyboard To QMK #10384

Merged
merged 5 commits into from
Sep 24, 2020
Merged

Adding Bear 65 Ergo Keyboard To QMK #10384

merged 5 commits into from
Sep 24, 2020

Conversation

MudkipMao
Copy link
Contributor

Jacky, the maker of the S7 has a new board and I ported it into QMK

Description

Not much to say, please take a look at the changes. I have the board in hand and it's running nicely

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

  • N/A

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

@MudkipMao
Copy link
Contributor Author

Hi QMK maintainers, one thing I do want to ask is how we want to structure this folder. Jacky is the designer of the S7_Elephant which currently has its own folder. Should I consolidate both of these boards under 1 folder?

drashna
drashna requested changes Sep 22, 2020
View reviewed changes
keyboards/bear_65/info.json Outdated Show resolved Hide resolved
keyboards/bear_65/info.json Outdated Show resolved Hide resolved
keyboards/bear_65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/bear_65/rules.mk Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team September 22, 2020 04:42
@drashna drashna added keyboard via Adds via keymap and/or updates keyboard for via support labels Sep 22, 2020
fauxpark
fauxpark requested changes Sep 22, 2020
View reviewed changes
keyboards/bear_65/config.h Outdated Show resolved Hide resolved
keyboards/bear_65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/bear_65/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/bear_65/rules.mk Outdated Show resolved Hide resolved
keyboards/bear_65/info.json Show resolved Hide resolved
@MudkipMao
Copy link
Contributor Author

MudkipMao commented Sep 23, 2020 •
edited
Loading

@drashna any reason you had me remove the key_count: field in the info.json? Here https://beta.docs.qmk.fm/developing-qmk/qmk-reference/reference_info_json it says that the field is required

@fauxpark
Copy link
Member

IMO the docs are wrong on that point. key_count isn't really needed as you can determine the number of keys by just counting the number of elements in the layout array.

@MudkipMao MudkipMao mentioned this pull request Sep 23, 2020
Merged
6 tasks
@noroadsleft
Copy link
Member

Hi QMK maintainers, one thing I do want to ask is how we want to structure this folder. Jacky is the designer of the S7_Elephant which currently has its own folder. Should I consolidate both of these boards under 1 folder?

It would be more straightforward to move both boards in a PR where neither of the codebases is changing. I vote to keep the boards in their own folders for now.

noroadsleft
noroadsleft requested changes Sep 24, 2020
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.

GitHub tip: You can apply multiple suggestions to a single commit by using the Files Changed tab.

keyboards/bear_65/bear_65.h Outdated Show resolved Hide resolved
keyboards/bear_65/config.h Outdated Show resolved Hide resolved
keyboards/bear_65/config.h Outdated Show resolved Hide resolved
keyboards/bear_65/info.json Outdated Show resolved Hide resolved
keyboards/bear_65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/bear_65/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/bear_65/readme.md Outdated Show resolved Hide resolved
keyboards/bear_65/rules.mk Outdated Show resolved Hide resolved
@fauxpark
Copy link
Member

Thanks!

@fauxpark fauxpark merged commit 9c596c1 into qmk:master Sep 24, 2020
tomohisa pushed a commit to tomohisa/qmk_firmware that referenced this pull request Sep 28, 2020
Merge branch 'master' of https://github.com/qmk/qmk_firmware
8c2197d 
* 'master' of https://github.com/qmk/qmk_firmware: (3643 commits)
  Swapparoo of bottom row keys (qmk#10277)
  [Keyboard] Add PloopyCo devices (qmk#7935)
  Keyboard update: SL40 (qmk#10445)
  [keyboard] Add SP-111 support (qmk#10193)
  Add logic for AT90USBxx7 where needed (qmk#10203)
  Trifecta Keymap
  [Docs] Wording & formatting changes in the Tapping Force Hold section of the Tap Hold page + removed trailing whitespaces (qmk#10391)
  `setrgb()`: Use arrow operator (qmk#10451)
  [Keyboard] add Percent Canoe Gen2 (qmk#10344)
  [Keyboard] add hannah65 by Team Mechlovin (qmk#10284)
  Fix Belgian sendstring properly (qmk#10444)
  Add VIA support for lazydesigners/the30 (qmk#10374)
  [Keyboard] add duckboard by doodboard (qmk#10318)
  Fix Belgian sendstring file (qmk#10443)
  [Keyboard] added Bolsa65 keyboard by FJLabs (qmk#10394)
  CLI/Doctor: Print QMK_HOME (qmk#10398)
  Add Wyvern Keyboard (qmk#10378)
  Adding Bear 65 Ergo Keyboard To QMK (qmk#10384)
  VIA Support: Gray Studio HB85 (qmk#10329)
  format code according to conventions [skip ci]
  ...
rgoulter pushed a commit to rgoulter/qmk_firmware that referenced this pull request Oct 4, 2020
@MudkipMao @drashna
@noroadsleft @rgoulter
Adding Bear 65 Ergo Keyboard To QMK (qmk#10384)
1dbd471 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: James Young <[email protected]>
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
@MudkipMao @drashna @noroadsleft
Adding Bear 65 Ergo Keyboard To QMK (qmk#10384)
8da704d 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: James Young <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna requested changes

@fauxpark fauxpark fauxpark approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

Assignees
No one assigned
Labels
keyboard 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
@MudkipMao @fauxpark @noroadsleft @drashna