Mvi keymaps

[MVi06]

Description

The keymaps I made for bépo french layout on Planck and Corne keyboards.

I had a problem with the variable is_master (extern uint8_t is_master) in the keymap.c file of the crkbd/keymaps/mvi directory. I commented out the lines in the file but since I have only one OLED screen I don’t know if it is OK for keyboards with two screens. I am pretty sure it is not.

Types of Changes

• [ ] Core
• [ ] Bugfix
• [ ] New feature
• [ ] Enhancement/optimization
• [ ] Keyboard (addition or update)
• [x] 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
• [x] 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.
• [x] I have tested the changes and verified that they work and don't break anything (as well as I can manage).

[stale[bot]]

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

[stale[bot]]

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

[stale[bot]]

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

[MVi06]

That’s precisely what I thought I did. Trying to follow the documentatino, I did: git rev-list --left-right --count HEAD...upstream/master and then: git rebase upstream/master So I think my local branch was rebased. And then I did: git push to merge with MVi06/qmk_firmware.

What did I do wrong?

[noroadsleft]

86c07ed is the problem commit.

Evidence of this is that the above commit, as a merge commit, it has two parent commits: 2ba84a1 and f90b029. These parent commits have the same contents, but different commit hashes, which only happens if the histories of the branches has diverged, thus indicating that at some point your local branch diverged from your GitHub-hosted branch.

You should run the method you followed in the documentation, but rebasing your local mvi-keymaps branch upon your GitHub-hosted mvi-keymaps branch.

Should be something like:

git checkout mvi-keymaps

# Fetches the current state of your GitHub fork:
git fetch origin

# This command will likely return a non-zero number on both sides, which indicates a diverged history:
git rev-list --left-right --count HEAD...origin/mvi-keymaps

# Attempts to rebase your local branch upon your GitHub-hosted branch:
git rebase origin/mvi-keymaps

# Any merge conflicts between the local and remote (GitHub) branches needs to be fixed at this point

git push --force-with-lease origin mvi-keymaps

[MVi06]

Thanks a lot for trying to help me. I did get two 0 (after the checkout and the fetch command). $ git rev-list --left-right --count HEAD...origin/mvi-keymaps 0 0 So I didn’t do the following commands.

[noroadsleft]

Oops, my mistake. The above would have worked before merging one branch into the other.

Here's a new method to resynchronize the branches. It's less involved than the other method, but it comes at the cost of the existing Git history for the files that are modified.

git checkout mvi-keymaps

# Retrieve the status of QMK's master branch:
git fetch upstream master

# Resynchronize the local mvi-keymaps branch to match the state of QMK's master branch:
git reset --hard upstream/master

# Retrieve the files that you wish to add to the pull request from a commit's state (this removes their existing histories):
#   6f35a7166eb68c1f2dd882ffc6dc741eb76a9b35  because it's the current branch HEAD
git checkout 6f35a7166eb68c1f2dd882ffc6dc741eb76a9b35 -- keyboards/crkbd/keymaps/mvi/ keyboards/planck/keymaps/a2b/ keyboards/planck/keymaps/mvi/

# adds the files as if they are all brand-new files
git commit

git push --force-with-lease origin mvi-keymaps

[MVi06]

This time it seemed to work well. Thanks again for your help.

[stale[bot]]

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

[github-actions[bot]]

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[bot]]

Thank you for your contribution! This pull request has been automatically closed because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready. // [stale-action-closed]