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.

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

Add BIOI Keyboards #9602

Merged
merged 22 commits into from
Jan 11, 2021
Merged

Add BIOI Keyboards #9602

merged 22 commits into from
Jan 11, 2021

Conversation

scottywei
Copy link

Description

Add keyboards from BIOI, including dual-mode G60, Morgan65, and S65.

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

Add keyboards from BIOI, including dual-mode G60, Morgan65, and S65
@scottywei scottywei mentioned this pull request Jul 2, 2020
13 tasks
@zvecr zvecr requested review from fauxpark and a team July 3, 2020 21:32
@zvecr zvecr added the keyboard label Jul 3, 2020
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

So, I'm not really liking the BLE code here. I think we should hold off on this until I can refactor the Bluetooth support in QMK into something more manageable.

keyboards/bioi/g60/config.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/config.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/config.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/g60.c Outdated Show resolved Hide resolved
keyboards/bioi/g60/g60.c Outdated Show resolved Hide resolved
keyboards/bioi/s65/s65.c Outdated Show resolved Hide resolved
keyboards/bioi/s65/s65.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/info.json Outdated Show resolved Hide resolved
keyboards/bioi/morgan65/info.json Outdated Show resolved Hide resolved
keyboards/bioi/s65/info.json Outdated Show resolved Hide resolved
scottywei and others added 8 commits July 7, 2020 15:54
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@scottywei
Copy link
Author

scottywei commented Jul 7, 2020

So, I'm not really liking the BLE code here. I think we should hold off on this until I can refactor the Bluetooth support in QMK into something more manageable.

Thank you so much for your work! I think maybe we can consider the BLE code here as the keyboard level custom functions. It almost the same way as the code for RN42 HHKB controller. I think I would help to bring the USB/Bluetooth switching code into the QMK core in the future.

@nfp0
Copy link

nfp0 commented Aug 4, 2020

Is there anything blocking this?

@noroadsleft noroadsleft requested a review from a team August 5, 2020 09:27
@stale
Copy link

stale bot commented Sep 19, 2020

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@scottywei
Copy link
Author

Any progress?

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.

Is there any difference between the G60 and the G60BLE?

@stale stale bot removed the awaiting changes label Oct 1, 2020
@scottywei
Copy link
Author

Is there any difference between the G60 and the G60BLE?

This is an official submission and as a duo-mode keyboard, this version contains the Bluetooth codes.

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.

Additionally:

  • All your new .c and .h files need to have license headers.
  • There are inconsistencies in the USB Device IDs. The already-in-QMK bioi/g60ble uses 0x6583 as the Vendor ID to avoid a collision with Wilba's boards, and 0x4249 is used by the binepad/bn003. Ideally all the BIOI boards should use the same Vendor ID to each other, and each should have a different Product ID.

keyboards/bioi/ble.h Outdated Show resolved Hide resolved
keyboards/bioi/ble.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/config.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/config.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/config.h Outdated Show resolved Hide resolved
keyboards/bioi/s65/info.json Outdated Show resolved Hide resolved
keyboards/bioi/s65/readme.md Outdated Show resolved Hide resolved
keyboards/bioi/s65/readme.md Outdated Show resolved Hide resolved
keyboards/bioi/s65/rules.mk Outdated Show resolved Hide resolved
keyboards/bioi/s65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
@stale
Copy link

stale bot commented Dec 20, 2020

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@stale stale bot removed the awaiting changes label Dec 24, 2020
@scottywei
Copy link
Author

Change Vender ID for BIOI to 8101

keyboards/bioi/ble.h Outdated Show resolved Hide resolved
keyboards/bioi/ble.h Outdated Show resolved Hide resolved
keyboards/bioi/ble.c Outdated Show resolved Hide resolved
keyboards/bioi/ble.h Outdated Show resolved Hide resolved
keyboards/bioi/g60/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/bioi/g60/keymaps/via/keymap.c Show resolved Hide resolved
scottywei and others added 2 commits December 25, 2020 09:59
@github-actions github-actions bot added keymap via Adds via keymap and/or updates keyboard for via support labels Dec 25, 2020
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.

I think this reads better, but everything else looks good to me.

keyboards/bioi/s65/readme.md Outdated Show resolved Hide resolved
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
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.

Looks good to me.

@drashna drashna merged commit 6edbd84 into qmk:master Jan 11, 2021
@nfp0
Copy link

nfp0 commented Jan 11, 2021

Awesome!

@scottywei scottywei deleted the bioi-keyboards branch March 28, 2023 08:39
@qmk qmk deleted a comment from aymanbagabas Apr 9, 2023
@qmk qmk locked as off-topic and limited conversation to collaborators Apr 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants