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 launch_3 and launch_heavy_3 #181

Merged
merged 2 commits into from
Aug 3, 2023
Merged

Add launch_3 and launch_heavy_3 #181

merged 2 commits into from
Aug 3, 2023

Conversation

jackpot51
Copy link
Member

I'm not sure if this has everything required, but it works to show these boards in the configurator. Please do a thorough review.

@jackpot51 jackpot51 requested review from a team May 5, 2023 04:04
@jackpot51 jackpot51 self-assigned this May 5, 2023
ids1024
ids1024 previously approved these changes May 5, 2023
Copy link
Member

@ids1024 ids1024 left a comment

Choose a reason for hiding this comment

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

meta.json files seem to be correct, other files match launch_1/launch_2 and launch_heavy_1 as expected.

I've been meaning to de-duplicate things here so the same keymap.json files could be shared by all QMK boards and all EC boards, and launch_1/launch_2/launch_3 could have the same files in keyboards (which should also help with #139).

But this is right for how things currently work, assuming testing goes as expected.

@jackpot51
Copy link
Member Author

@pop-os/quality-assurance any thoughts on this?

@leviport
Copy link
Member

leviport commented Aug 2, 2023

Somehow I missed this, sorry about that. I'll look at it today.

@ids1024
Copy link
Member

ids1024 commented Aug 2, 2023

This will need to be updated slightly for the changes in #208. I can do that.

@jackpot51
Copy link
Member Author

That would be helpful, @ids1024. Thanks @leviport

@ids1024
Copy link
Member

ids1024 commented Aug 2, 2023

Okay, rebased, added the is_qmk field to meta.json, regenerated with layouts.py, and removed the files that are no longer needed.

layouts.py didn't change anything except layouts/keyboards/system76/launch_heavy_3/leds.json. Looks like the LED mapping has issues though. But it's different than launch_heavy_1, so I'm not sure exactly what would be correct: system76/qmk_firmware#35 (comment).

Edit: Or actually, do they match launch_heavy_1, and I was looking at the wrong thing? Then that shouldn't be a hard fix.

@ids1024
Copy link
Member

ids1024 commented Aug 2, 2023

Updated system76/qmk_firmware#35 and this to use LED mapping that should be correct.

@leviport
Copy link
Member

leviport commented Aug 2, 2023

I'm not sure if it's because of this PR or the firmware itself, but setting LEDs is not persistent across unplug/replugs. I can set the LEDs differently, but unplugging the keyboard and plugging it back in results in the default Spacetime LED pattern. Key binding changes still persist as expected, however.

@jackpot51
Copy link
Member Author

@leviport that would be firmware.

Copy link
Member

@leviport leviport left a comment

Choose a reason for hiding this comment

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

Since the LED bug is due to firmware, I think this update is good to go. --launch-test mode is working, keymap importing/exporting is working, and I can assign keys and LEDs on launch_3 and launch_heavy_3. Quick regression testing on launch_lite_1, launch_1, and my oryp9's bulit-in keyboard also went smoothly.

@jackpot51
Copy link
Member Author

@ids1024 can you do an engineering review?

@ids1024 ids1024 merged commit 706ad96 into master Aug 3, 2023
@ids1024 ids1024 deleted the launch-3 branch August 3, 2023 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants