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 Y&R Studio zhou65 keyboard #14192

Merged
merged 41 commits into from
Mar 8, 2022
Merged

Conversation

jiaxin96
Copy link
Contributor

@jiaxin96 jiaxin96 commented Aug 27, 2021

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 Aug 27, 2021
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

Also, just a heads up:

#14195

keyboards/yandrstudio/zhou65/config.h Outdated Show resolved Hide resolved
keyboards/yandrstudio/zhou65/f401/matrix.c Outdated Show resolved Hide resolved
keyboards/yandrstudio/zhou65/zhou65.c Outdated Show resolved Hide resolved
jiaxin96 and others added 4 commits August 29, 2021 20:45
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@jiaxin96
Copy link
Contributor Author

Also, just a heads up:

#14195

I am paying attention to this pr. after the development of this branch is completed, I think I can do some tests and simplify my keyboard files, but so far, the STM32F401 EEPROM driver I modified works well.

@jiaxin96 jiaxin96 requested a review from drashna August 29, 2021 13:59
@zvecr
Copy link
Member

zvecr commented Aug 29, 2021

but so far, the STM32F401 EEPROM driver I modified works well.

The issue is that its not maintainable, as per your original PR it was added to multiple keyboards. While this can be worked round by having your own "vendor" version, my preference of course would be to merge the keyboards without eeprom support (this has been the expectation set for other f4 keyboards currently in the repo).

@jiaxin96
Copy link
Contributor Author

The issue is that its not maintainable, as per your original PR it was added to multiple keyboards. While this can be worked round by having your own "vendor" version, my preference of course would be to merge the keyboards without eeprom support (this has been the expectation set for other f4 keyboards currently in the repo).

OK, but this will make some functions on the F4 series keyboard work abnormally, such as via (need to read EEPROM), but I hope it can run after the merger #14195 Feature/eeprom f4 is successful. At present, it seems that the best solution is to delete the relevant code to merge. Thank you for your suggestion.

keyboards/yandrstudio/zhou65/f401/board.h Outdated Show resolved Hide resolved
keyboards/yandrstudio/zhou65/f401/chconf.h Outdated Show resolved Hide resolved
jiaxin96 and others added 2 commits February 22, 2022 20:27
keyboards/yandrstudio/zhou65/info.json Outdated Show resolved Hide resolved
keyboards/yandrstudio/zhou65/rules.mk Outdated Show resolved Hide resolved
jiaxin96 and others added 2 commits February 28, 2022 17:42
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@jiaxin96 jiaxin96 requested a review from drashna March 7, 2022 05:31
@drashna drashna requested a review from a team March 8, 2022 04:01
keyboards/yandrstudio/zhou65/rules.mk Outdated Show resolved Hide resolved
Co-authored-by: Ryan <fauxpark@gmail.com>
@jiaxin96 jiaxin96 requested a review from fauxpark March 8, 2022 04:44
@fauxpark fauxpark requested a review from a team March 8, 2022 05:30
@drashna drashna merged commit 40d6766 into qmk:master Mar 8, 2022
@drashna
Copy link
Member

drashna commented Mar 8, 2022

Thanks!

0xcharly pushed a commit to Bastardkb/bastardkb-qmk that referenced this pull request Jul 4, 2022
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
@AllieMinogue
Copy link

AllieMinogue commented Aug 7, 2022

Hi @jiaxin96 do you happen to have the firmware of the Korno65/Zhou65 kit with Bluetooth? context is:

  • I bought 1 so-called keyboard kit Korno65/Zhou65 (with Bluetooth, not the common 1-mode Korno65) from another user. It has been working well in both modes.
  • Today I tried to flash its firmware & stupidly flashed the 1-mode Korno65 (https://config.qmk.fm/#/yandrstudio/zhou65/LAYOUT) into my kit & it seems that my kit turned into brick, cannot connect either in wire or bluetooth mode.
    Would be great if we can chat here or discord alleviator#1492, text me via +84935733337, or vu.duytan.89@gmail.com. Thanks for your help.

@jiaxin96
Copy link
Contributor Author

jiaxin96 commented Aug 7, 2022

yes, but it's not in the qmk master repo, you can find the source code in my fork (https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware), or just download the firmware of zhou65BLE version in this page (https://github.com/Oh-My-Mechanical-Keyboard/oh-my-mechanical-keyboard.github.io/releases/tag/zhou65ble).

@AllieMinogue
Copy link

great then. Sorry another thing @jiaxin96 how can I put the PCB to DFU? I tried shorting the BT0 & 3V3 pins but it worked this morning, not now.

@AllieMinogue
Copy link

no worry on this. I fixed this beautifully already thanks to your firmware. Thank you a lot for your help @jiaxin96 . Have a nice day.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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