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

Putting all IBM Model M projects under one folder #12370 #12792

Closed
wants to merge 2,145 commits into from
Closed

Putting all IBM Model M projects under one folder #12370 #12792

wants to merge 2,145 commits into from

Conversation

nuess0r
Copy link
Contributor

@nuess0r nuess0r commented May 3, 2021

As discussed in #12370:
The maintainers of several Model M replacement
controller projects agreed to cosolidate them
under one common folder.

Description

Types of Changes

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

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels May 3, 2021
@zvecr zvecr changed the base branch from master to develop May 4, 2021 00:23
@zvecr zvecr added the breaking_change Changes that need to wait for a version increment label May 4, 2021
@drashna drashna requested a review from a team May 27, 2021 03:47
@nuess0r
Copy link
Contributor Author

nuess0r commented Jul 15, 2021

any news on this pull request?
Seems that none of the Model M developers has a need to comment here or a wish to change something.

@drashna
Copy link
Member

drashna commented Jul 20, 2021

Looks like you have a merge conflict that needs to be resolved, at the very least.

@nuess0r
Copy link
Contributor Author

nuess0r commented Jul 20, 2021

Merge conflict solved

@drashna
Copy link
Member

drashna commented Jul 20, 2021

It looks like you may need to rebase to properly fix this.

@nuess0r
Copy link
Contributor Author

nuess0r commented Jul 20, 2021 •
edited
Loading

OK, I tried to follow your guide: https://docs.qmk.fm/#/newbs_git_resolving_merge_conflicts

This is a new process for me. Hope I did it right.

@drashna
Copy link
Member

drashna commented Jul 30, 2021

it looks like you merged, rather than rebased. Unfortunately that leaves it in the same position.

If you want, I should be able to see about helping out with this.

Pylon and others added 11 commits September 19, 2021 11:47
[Keyboard] Enabled Mousekeys by default on Boston (qmk#14507)
e83fb69
@vomindoraan @drashna
[Keymap] Updates to existing keymaps and userspace (qmk#14503)
4348e2f 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@peott-fr
[Keymap] Adding my Mun keymap. (qmk#14501)
4e7801d
@noroadsleft
cKeys theDora Refactor (qmk#14495)
53c2f67
@davidxia
[Docs] fix wrong directory for RGB Matrix animations (qmk#14494)
ddb6821
@jweickm @drashna @fauxpark
[Keymap] Added my own keymap for MIT Planck (qmk#14481)
a068b14 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@lyso1 @fauxpark
[Keyboard] Add LeFishe Keyboard (qmk#14498)
121ca7e 
Co-authored-by: Ryan <fauxpark@gmail.com>
@XScorpion2
Doc Fixes & Custom Matrix Fix (qmk#14526)
4dbeeaa
[Keymap] blipson corne keymap (qmk#14469)
e25d374 
revert lib/chibios

revert lib/chibios

Finish up

remove files

Update copyrights

remove copyrights

readd copyrights

add stop macro

PR suggestions

PR suggestions

readme lowercase

fix rotate for oled

Co-authored-by: Z003YW4 <ben.lipson@target.com>
@fauxpark
Remove backlight pin references in rules.mk (qmk#14513)
574b673
@fauxpark
Remove audio pin references in rules.mk (qmk#14532)
6b74e48
precondition and others added 24 commits October 20, 2021 01:26
@precondition
[DOCS] Fix the STENO_COMBINEDMAP table (qmk#14883)
5fbcbc6
@sigprof
Make the MAGIC_TOGGLE_GUI keycode work (qmk#14886)
c9562eb
@drashna
Fix type of Tap Dance max index variable (qmk#14887)
0fd45d5
@noroadsleft
Pteron36 Refactor (qmk#14904)
3979137 
* reformat info.json

- friendly-format info.json
- move the right half to the left by 0.5u (improves readability, for me anyway)
- correct key sequence

* refactor default keymap

- use short-form keycodes
- use four-space indent

* refactor via keymap

- use short-form keycodes
- use four-space indent

* update maintainer field in info.json

Use the maintainer's GitHub username.

* readme touch-up

Minor edit to the lead paragraph, and reformat the Hardware Availability section.

* change BOOTMAGIC_ENABLE from `lite` to `yes`
@nooges
Fix right half of Nyquist in 4x12 mode having row shifted up by one (q…
1e13d07 
…mk#14914)
@daskygit
Check usb transmit status in send_extra() (qmk#14643)
1953a96
@TW59420
[Keyboard] Add MW75 support (qmk#14833)
8ec1afd
@Gondolindrim @fauxpark
[Keyboard] Update encoder callback on Evolv75 (qmk#14757)
d71c962 
Co-authored-by: Ryan <fauxpark@gmail.com>
@jurassic73
Corrected keyboard layout which was causing issue in QMK configurator (…
09daafd 
…qmk#14891)
@Jonavin
[Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (q…
443d306 
…mk#14880)

Co-authored-by: Jonavin <=>
@ingomancer
Reformat iris keymap antonlindstrom to be a bit more readable and con…
bfddc7d 
…sistent (qmk#14902)

Co-authored-by: Ingo Junefjord <ingo.junefjord@attentec.se>
@riblee
[Keymap] Simplify unicode input mode change and CTRL and GUI swapping (…
a167a95 
…qmk#14874)
@GeorgePetri
[Keymap] Add Gergoplex keymap (qmk#14768)
974e9e0
@ForsakenRei
[Docs] Add default case to tap dance example 5. (qmk#14893)
ff39890
@riblee
[Keymap] Add logo to riblee userspace (qmk#14875)
ec8c1e0
@fauxpark
Tidy up ADNS9800 and PMW3360 firmware blobs (qmk#14936)
6ee29d9
@coliss86
Fix Typo in documentation (qmk#14942)
0002acd
@lucasrodrigues10
[Keyboard] temporary fix for SpiderIsland 78 (qmk#14935) (qmk#14941)
6e8eb2c
@drashna
Remove unused KEYBOARD_LOCK_ENABLE from rules (qmk#14920)
028edfc
@nuess0r
Putting all IBM Model M projects under one folder
15a8685 
As discussed in qmk#12370:
The maintainers of several Model M replacement
controller projects agreed to cosolidate them
under one common folder.
@nuess0r
Add readme files for the different mschwingen targets
041e9e4 
This fixes a linter error.
@nuess0r
Merge from develop branch
aba957a
@nuess0r
Merge branch 'consolidate_modelm' of https://github.com/nuess0r/qmk_f…
13baea5 
…irmware into consolidate_modelm
@nuess0r
Move Model M SSK controller based on Teensy++ 2.0 to consolidated folder
f14d21a
@github-actions github-actions bot removed the cli qmk cli command label Oct 26, 2021
@nuess0r
Copy link
Contributor Author

nuess0r commented Oct 26, 2021

Today I invested some other hour to rebase my changes.

I even found a new project for the Model M SSK that appeared in the meantime. I moved that as well.

Github shows now still two merge conficts, but I don't understand why. Is it possible to merge it like that or do you need something more from me?

@drashna
Copy link
Member

drashna commented Oct 27, 2021

It looks like it needs a rebase, rather than a merge.

@nuess0r nuess0r mentioned this pull request Oct 31, 2021
Merged
14 tasks
@nuess0r
Copy link
Contributor Author

nuess0r commented Oct 31, 2021

I did try to rebase but seems that long ago I did a merge by mistake. I'm new to rebase, never needed that at work.
I didn't knew how to fix it in this branch so I created a new branch and cherry-picked what was correct: #14996

So I close this one.

@nuess0r nuess0r closed this Oct 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
breaking_change Changes that need to wait for a version increment CI core documentation keyboard keymap python translation via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.