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

Port Adelais en Ciel rev3 #412

Merged
merged 6 commits into from
Apr 16, 2023
Merged

Port Adelais en Ciel rev3 #412

merged 6 commits into from
Apr 16, 2023

Conversation

stanrc85
Copy link
Contributor

Port for Adelais en Ciel rev3 PCB

@stanrc85
Copy link
Contributor Author

stanrc85 commented Mar 14, 2023 •
edited
Loading

I put the VIAL files in the keyboards\mechlovin\adelais\rgb_led\rev3\keymaps folder to avoid conflict with other PCB version keymaps but it seems to still call the keyboards\mechlovin\adelais\keymaps\vial files when compiling with make mechlovin/adelais/rgb_led/rev3:vial -j 20.

If I rename keyboards\mechlovin\adelais\rgb_led\rev3\keymaps\vial to keyboards\mechlovin\adelais\rgb_led\rev3\keymaps\vial2 and compile with make mechlovin/adelais/rgb_led/rev3:vial2 -j 20 then it compiles fine, no errors.

Any ideas?

@lesshonor
Copy link
Contributor

This is happening because of a bug that has since been fixed upstream: qmk/qmk_firmware#18449

...Not sure what you want to do about that now, though. 🤷🏾

@stanrc85
Copy link
Contributor Author

Ok good to know, I can mark it as draft until the next merge from QMK. Thanks

@stanrc85 stanrc85 marked this pull request as draft March 15, 2023 21:11
@stanrc85 stanrc85 marked this pull request as ready for review April 10, 2023 01:53
@stanrc85
Copy link
Contributor Author

This can be merged now that #432 has been merged, there is no longer a conflict in the keymap folders

lesshonor
lesshonor suggested changes Apr 13, 2023
View reviewed changes
Copy link
Contributor

@lesshonor lesshonor left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This can be merged now that #432 has been merged, there is no longer a conflict in the keymap folders

It still doesn't build, though.

(I get the same result locally, for the record.)

My mistake, I needed to update that CI test branch with the latest changes. You should still fix all the other problems, though.

keyboards/mechlovin/adelais/rgb_led/rev3/keymaps/vial/vial.json Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/keymaps/vial/vial.json Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/keymaps/vial/vial.json Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/keymaps/vial/keymap.c Outdated Show resolved Hide resolved
@xyzz xyzz merged commit be7f5a9 into vial-kb:vial Apr 16, 2023
@stanrc85 stanrc85 deleted the adelais-rgb-fixed branch April 16, 2023 22:13
DPoplin pushed a commit to DPoplin/vial-qmk that referenced this pull request Apr 19, 2023
@stanrc85 @DPoplin
Port Adelais en Ciel rev3 (vial-kb#412)
eae7b65 
* Port Adelais en Ciel rev3

* Add readme

* Requested Change

* Proper Encoder rules

* Remove lines, fix custom keycodes and encoders
lesshonor pushed a commit to lesshonor/vial-qmk that referenced this pull request Apr 19, 2023
@stanrc85 @lesshonor
Port Adelais en Ciel rev3 (vial-kb#412)
16f9dc7 
* Port Adelais en Ciel rev3

* Add readme

* Requested Change

* Proper Encoder rules

* Remove lines, fix custom keycodes and encoders
@lesshonor lesshonor mentioned this pull request Apr 19, 2023
Closed
lesshonor pushed a commit to lesshonor/vial-qmk that referenced this pull request Jun 15, 2023
@stanrc85 @lesshonor
Port Adelais en Ciel rev3 (vial-kb#412)
539bf79 
* Port Adelais en Ciel rev3

* Add readme

* Requested Change

* Proper Encoder rules

* Remove lines, fix custom keycodes and encoders
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lesshonor lesshonor lesshonor requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stanrc85 @lesshonor @xyzz