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

Jump to bottom

Two new shields: Jorne and Jian #331

Merged
merged 2 commits into from Nov 17, 2020
Merged

Two new shields: Jorne and Jian #331

merged 2 commits into from Nov 17, 2020

Conversation

krikun98
Copy link
Contributor

@krikun98 krikun98 commented Nov 4, 2020

Added support for two new shields: Jorne (Corne with an extra key for cyrillic and other languages, open source) and Jian (closed-source, the GB recently concluded). The keymaps are identical, but the matrices are quite different.

@innovaker innovaker added enhancement New feature or request shields PRs and issues related to shields labels Nov 5, 2020
@innovaker
Copy link
Contributor

innovaker commented Nov 5, 2020 •
edited

Thanks @krikun98. Any chance you could rebase onto main's HEAD rather than that merge from main please? If so, it's probably worth squashing down the GUI fix whilst you're at it (the adjustments too).

@krikun98
Copy link
Contributor Author

krikun98 commented Nov 5, 2020

Thanks @krikun98. Any chance you could rebase onto main's HEAD rather than that merge from main please? If so, it's probably worth squashing down the GUI fix whilst you're at it (the adjustments too).

I haven't worked with rebase much, hope this worked. The files are all the same.

@innovaker
Copy link
Contributor

The rework looks much better from a cursory look 👍

How have you tested them please (after the rework)?

@krikun98
Copy link
Contributor Author

krikun98 commented Nov 5, 2020

The rework looks much better from a cursory look 👍

How have you tested them please (after the rework)?

I've been typing on the Jian for two weeks with @okke-formsma's initial implementation for shifted keycodes, and I flashed the reworked version yesterday and kept going. Every key works, it's a joy to use. The only gripe I have is it's currently impossible to reset the peripheral half via software, but that's probably not a keymap issue.

The Jorne is essentially the same matrix as the Corne, I've just added the extra key and confirmed everything works. The keymap is the same as the Jian, so it should be all right. I haven't been able to turn on the LEDs nor the OLEDs, though.

@krikun98 krikun98 force-pushed the jorne_and_jian branch 2 times, most recently from 2eeece7 to 0f8d508 Compare November 5, 2020 20:45
Nicell
Nicell requested changes Nov 10, 2020
View reviewed changes
Copy link
Member

@Nicell Nicell left a comment

Choose a reason for hiding this comment

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

Thanks for these. I have some comments on deprecated pieces as well as a possible keymap mistake. Also if you could add changes to these files, that'd be great:

docs/docs/hardware.md: You should add the Jorne and Jian to this list

docs/static/setup.ps1 and docs/static/setup.sh: Jorne and Jian should be added as split options for both files.

app/boards/shields/jian/jian_left.overlay Outdated Show resolved Hide resolved
app/boards/shields/jorne/jorne.dtsi Outdated Show resolved Hide resolved
app/boards/shields/jorne/jorne_left.overlay Outdated Show resolved Hide resolved
app/boards/shields/jorne/jorne_right.overlay Outdated Show resolved Hide resolved
app/boards/shields/jian/jian.dtsi Outdated Show resolved Hide resolved
app/boards/shields/jian/jian_right.overlay Outdated Show resolved Hide resolved
app/boards/shields/jian/jian.keymap Outdated Show resolved Hide resolved
app/boards/shields/jorne/jorne.conf Outdated Show resolved Hide resolved
@krikun98 krikun98 force-pushed the jorne_and_jian branch 2 times, most recently from 2e4ee83 to 79427db Compare November 10, 2020 20:45
@krikun98
Copy link
Contributor Author

krikun98 commented Nov 10, 2020 •
edited

@Nicell, this should address all your comments. Thanks for the review!

@krikun98 krikun98 requested a review from Nicell November 11, 2020 05:45
@krikun98 krikun98 force-pushed the jorne_and_jian branch 2 times, most recently from bc11c27 to c4c68f3 Compare November 11, 2020 06:37
@krikun98
Copy link
Contributor Author

Also fixed a spot in hardware.md, it was in an incorrect format for the splits.

@krikun98 krikun98 requested a review from Nicell November 11, 2020 12:59
@innovaker innovaker self-assigned this Nov 17, 2020
@innovaker innovaker merged commit f604398 into zmkfirmware:main Nov 17, 2020
@innovaker
Copy link
Contributor

Thanks @krikun98 and @Nicell.

@krikun98 krikun98 deleted the jorne_and_jian branch November 17, 2020 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nicell Nicell Nicell approved these changes

Assignees

@innovaker innovaker

Labels
enhancement New feature or request shields PRs and issues related to shields
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@krikun98 @innovaker @Nicell @petejohanson