-
-
Notifications
You must be signed in to change notification settings - Fork 40.3k
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
Re-refactor Mokulua #17125
Re-refactor Mokulua #17125
Conversation
…g for it to be fixed upstream
Co-authored-by: Drashna Jaelre <drashna@live.com>
@waffle87 If you could check this out and see if it is clear what I am trying to do. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conflicts need to be resolved where the branch was reused from a previous PR.
@zvecr Fixed. Thanks. Sorry I missed that. |
Because of the error in PR Lint check, would it be better served to have an individal info.json for each of the PCB versions (mirrored and standard)? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you have changes to the submodules here. These need to be reverted before the PR can be approved.
Rebasing sometimes will fix this. Otherwise, you'd want to do something like this to fix them:
git checkout master
git submodule foreach 'git log -n1 --oneline'
# remember the first abcdef1234 on the submodules that have an issue
git checkout @@your-branch@@
# for each of the problematic repo's:
cd lib/@@name@@
git checkout abcdef1234
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Slight __attribute__ ((weak))
✔️.
I diff'd the previous mirrored
/standard
implementation and came to the same conclusion @waffle87 seems to have done, but if the keyboard maintainer says some of the supported hardware doesn't work on the post-refactor version, I'm inclined to believe them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Took another look at this and spotted an error in the original refactor that this PR solves.
Thanks! |
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream * initial commit for mokulua keyboard * Split the board into mirrored and standard layouts. * Prepping for PR. Silly keymap added. * prepped for PR * Apply suggestions from code review * Fixing firmware from the refactor that removed the mirrored layout. * Small tweaks using changes from refactor * Changed the name of the layouts back to match the original to resolve conflict in info.json * these files needed to be removed as well, they were added as a part of the refactor * info.json moveds to be different for each build * Another file had to be removed and the mirrored.c file changed to call mirrored.h instead of standard.h * fixing chibios ver * force deleting to revert * fixing chibios shit * Update keyboards/mechwild/mokulua/mirrored/mirrored.c * Update keyboards/mechwild/mokulua/standard/standard.c * Removing tabs and replacing with 4 spaces. Small style and formatting changes.
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream * initial commit for mokulua keyboard * Split the board into mirrored and standard layouts. * Prepping for PR. Silly keymap added. * prepped for PR * Apply suggestions from code review * Fixing firmware from the refactor that removed the mirrored layout. * Small tweaks using changes from refactor * Changed the name of the layouts back to match the original to resolve conflict in info.json * these files needed to be removed as well, they were added as a part of the refactor * info.json moveds to be different for each build * Another file had to be removed and the mirrored.c file changed to call mirrored.h instead of standard.h * fixing chibios ver * force deleting to revert * fixing chibios shit * Update keyboards/mechwild/mokulua/mirrored/mirrored.c * Update keyboards/mechwild/mokulua/standard/standard.c * Removing tabs and replacing with 4 spaces. Small style and formatting changes.
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream * initial commit for mokulua keyboard * Split the board into mirrored and standard layouts. * Prepping for PR. Silly keymap added. * prepped for PR * Apply suggestions from code review * Fixing firmware from the refactor that removed the mirrored layout. * Small tweaks using changes from refactor * Changed the name of the layouts back to match the original to resolve conflict in info.json * these files needed to be removed as well, they were added as a part of the refactor * info.json moveds to be different for each build * Another file had to be removed and the mirrored.c file changed to call mirrored.h instead of standard.h * fixing chibios ver * force deleting to revert * fixing chibios shit * Update keyboards/mechwild/mokulua/mirrored/mirrored.c * Update keyboards/mechwild/mokulua/standard/standard.c * Removing tabs and replacing with 4 spaces. Small style and formatting changes.
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream * initial commit for mokulua keyboard * Split the board into mirrored and standard layouts. * Prepping for PR. Silly keymap added. * prepped for PR * Apply suggestions from code review * Fixing firmware from the refactor that removed the mirrored layout. * Small tweaks using changes from refactor * Changed the name of the layouts back to match the original to resolve conflict in info.json * these files needed to be removed as well, they were added as a part of the refactor * info.json moveds to be different for each build * Another file had to be removed and the mirrored.c file changed to call mirrored.h instead of standard.h * fixing chibios ver * force deleting to revert * fixing chibios shit * Update keyboards/mechwild/mokulua/mirrored/mirrored.c * Update keyboards/mechwild/mokulua/standard/standard.c * Removing tabs and replacing with 4 spaces. Small style and formatting changes.
* allowing the kt60 file to be modified so I can do things while waiting for it to be fixed upstream * initial commit for mokulua keyboard * Split the board into mirrored and standard layouts. * Prepping for PR. Silly keymap added. * prepped for PR * Apply suggestions from code review * Fixing firmware from the refactor that removed the mirrored layout. * Small tweaks using changes from refactor * Changed the name of the layouts back to match the original to resolve conflict in info.json * these files needed to be removed as well, they were added as a part of the refactor * info.json moveds to be different for each build * Another file had to be removed and the mirrored.c file changed to call mirrored.h instead of standard.h * fixing chibios ver * force deleting to revert * fixing chibios shit * Update keyboards/mechwild/mokulua/mirrored/mirrored.c * Update keyboards/mechwild/mokulua/standard/standard.c * Removing tabs and replacing with 4 spaces. Small style and formatting changes.
Description
The refactor of the Mokulua firmware removed the support for one of the 2 possible PCBs that this split board can use. This readds support for the second PCB while keeping a couple of the changes that were suggested by that refactor.
Types of Changes
Issues Fixed or Closed by This PR
Checklist