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

[Keyboard] Add Olly JF Rev.2 #21775

Merged
merged 54 commits into from
Jan 14, 2024
Merged

[Keyboard] Add Olly JF Rev.2 #21775

merged 54 commits into from
Jan 14, 2024

Conversation

mechlovin
Copy link
Contributor

Description

Add support for Olly JF Rev. 2 PCB (APM32F103, IS31FL3731 mono LED).
Thanks.

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 18, 2023
@lendunistus
Copy link
Contributor

lendunistus commented Aug 21, 2023 •
edited
Loading

from the PR checklist:

  • keyboard moves within the repository must go through the develop branch instead of master, so as to ensure compatibility for users
  • data/mappings/keyboard_aliases.hjson must be updated to reflect the move, so users with pre-created configurator keymap.json files continue to detect the correct keyboard

@mechlovin mechlovin changed the base branch from master to develop August 21, 2023 08:05
dunk2k
dunk2k suggested changes Aug 24, 2023
View reviewed changes
keyboards/mechlovin/olly/jf/rev2/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev1/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev1/info.json Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev1/info.json Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev1/rules.mk Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c Outdated Show resolved Hide resolved
mechlovin and others added 14 commits August 24, 2023 16:00
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/config.h
cae10be 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev1/info.json
0da5415 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev1/info.json
674bd7f 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev1/rules.mk
4603bbe 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev1/readme.md
4de3ac9 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c
60bd1ac 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev1/readme.md
40d5d7f 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs…
490ae5b 
…_rshift/keymap.c

Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/readme.md
a2983ab 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/readme.md
b32dce7 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c
5087838 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c
7f26177 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c
dfc0ead 
Co-authored-by: Duncan Sutherland <[email protected]>
@mechlovin @dunk2k
Update keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_…
252528f 
…rshift/keymap.c

Co-authored-by: Duncan Sutherland <[email protected]>
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 7, 2023

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 bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Dec 7, 2023
@mechlovin mechlovin requested a review from dunk2k December 7, 2023 03:25
@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Dec 9, 2023
@dunk2k
Copy link
Contributor

dunk2k commented Dec 18, 2023 •
edited
Loading

Does keyboards/olly/jf/matrix_diagram.md apply to both rev1 and rev2?
It appears, from layout information, that aforementioned file is applicable to rev1 only. Could it be moved into rev1 directory and have rev1 appended to title?

@drashna drashna requested review from a team and removed request for dunk2k December 23, 2023 08:12
@drashna drashna self-requested a review December 23, 2023 08:13
@drashna
Copy link
Member

drashna commented Dec 23, 2023

This has some config errors that are preventing it from compiling. These need addressing.

@mechlovin
Copy link
Contributor Author

Does keyboards/olly/jf/matrix_diagram.md apply to both rev1 and rev2? It appears, from layout information, that aforementioned file is applicable to rev1 only. Could it be moved into rev1 directory and have rev1 appended to title?

Hi, It just for rev.1. I will move to rev.1.
Thank you.

@mechlovin
Copy link
Contributor Author

This has some config errors that are preventing it from compiling. These need addressing.

Solved, Thank you.

fauxpark
fauxpark requested changes Dec 28, 2023
View reviewed changes
keyboards/mechlovin/olly/jf/rev2/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/olly/jf/rev2/rev2.c Outdated Show resolved Hide resolved
@drashna drashna merged commit de6ae34 into qmk:develop Jan 14, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dunk2k dunk2k dunk2k requested changes

@drashna drashna drashna 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.

None yet
5 participants
@mechlovin @lendunistus @dunk2k @drashna @fauxpark