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 jels60v2 support #21337

Merged
merged 10 commits into from
Jul 7, 2023
Merged

add jels60v2 support #21337

merged 10 commits into from
Jul 7, 2023

Conversation

Jels02
Copy link
Contributor

@Jels02 Jels02 commented Jun 22, 2023

Description

add support for v2 of the PCB using rp2040

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 keymap via Adds via keymap and/or updates keyboard for via support labels Jun 22, 2023
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

keyboard updates and refactors (eg. to data driven) must go through develop to reduce master -> develop merge conflicts

This would include adding to data/mappings/keyboard_aliases.hjson for jels/jels60 to jels/jels60/v1 compatibility.

keyboards/jels/jels60/v2/info.json Outdated Show resolved Hide resolved
keyboards/jels/jels60/v2/info.json Outdated Show resolved Hide resolved
keyboards/jels/jels60/v2/info.json Outdated Show resolved Hide resolved
keyboards/jels/jels60/v2/info.json Outdated Show resolved Hide resolved
keyboards/jels/jels60/v1/info.json Outdated Show resolved Hide resolved
@Jels02
Copy link
Contributor Author

Jels02 commented Jun 23, 2023

@zvecr would I be able to add a temporary keyboard (i.e jels/jels60v2) to master (so that I can change VIA) and then put in a pr for refactoring targeted towards develop?

Co-authored-by: Joel Challis <git@zvecr.com>
@Jels02 Jels02 changed the base branch from master to develop June 28, 2023 08:57
Jels02 and others added 2 commits June 28, 2023 18:58
Co-authored-by: Joel Challis <git@zvecr.com>
@drashna
Copy link
Member

drashna commented Jul 3, 2023

@zvecr would I be able to add a temporary keyboard (i.e jels/jels60v2) to master (so that I can change VIA) and then put in a pr for refactoring targeted towards develop?

IIRC, via doesn't actually provide firmware images. The collection that they have is very much out of date, I believe. So, really, it's up to you to provide them. So compiling from source means that you should be able to compile from develop. So shouldn't be an issue.

@drashna drashna requested a review from a team July 3, 2023 10:35
@drashna drashna merged commit 901e043 into qmk:develop Jul 7, 2023
jesperhellberg pushed a commit to jesperhellberg/qmk_firmware that referenced this pull request Sep 9, 2023
Co-authored-by: Joel Challis <git@zvecr.com>
thismarvin pushed a commit to thismarvin/qmk_firmware that referenced this pull request Sep 27, 2023
Co-authored-by: Joel Challis <git@zvecr.com>
akeep pushed a commit to akeep/qmk_firmware that referenced this pull request Oct 2, 2023
Co-authored-by: Joel Challis <git@zvecr.com>
csolje pushed a commit to csolje/qmk_firmware that referenced this pull request Oct 21, 2023
Co-authored-by: Joel Challis <git@zvecr.com>
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
Co-authored-by: Joel Challis <git@zvecr.com>
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.

4 participants