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

added unix60, moved togehter with southpaw75 into fr4 folder #11195

Merged
merged 17 commits into from
Feb 21, 2021
Merged

added unix60, moved togehter with southpaw75 into fr4 folder #11195

merged 17 commits into from
Feb 21, 2021

Conversation

mkdl
Copy link

@mkdl mkdl commented Dec 12, 2020

Description

Added the "Unix60" keyboard. Moved the "Unix60" together with the "southpaw75" into the new folder "fr4". fr4 is a team effort by the kelvin hall and me. We worked on both keyboards together and will continue to do so in the future under the name fr4.

Types of Changes

  • [x ] Keyboard addition

Checklist

  • [x ] 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.
  • [x ] 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).

drashna
drashna requested changes Dec 22, 2020
View reviewed changes
keyboards/fr4/unix60/config.h Outdated Show resolved Hide resolved
keyboards/fr4/unix60/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/fr4/unix60/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/fr4/unix60/rules.mk Outdated Show resolved Hide resolved
keyboards/fr4/unix60/unix60.h Outdated Show resolved Hide resolved
mkdl and others added 5 commits December 23, 2020 21:48
@mkdl @drashna
Update keyboards/fr4/unix60/unix60.h
1e2c4e9 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@mkdl @drashna
Update keyboards/fr4/unix60/rules.mk
654634f 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@mkdl @drashna
Update keyboards/fr4/unix60/keymaps/default/keymap.c
e1c1593 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@mkdl @drashna
Update keyboards/fr4/unix60/keymaps/default/keymap.c
0b71a78 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@mkdl @drashna
Update keyboards/fr4/unix60/config.h
3005ede 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@drashna drashna added the breaking_change Changes that need to wait for a version increment label Dec 30, 2020
@drashna
Copy link
Member

drashna commented Dec 30, 2020

Could you retarget this to develop, since it's changing the folder location (and therefore compile command) for the keyboard.

You can edit the title, and select "develop" instead of "master".

@drashna drashna requested a review from a team December 30, 2020 03:24
fauxpark
fauxpark requested changes Dec 30, 2020
View reviewed changes
keyboards/fr4/unix60/readme.md Outdated Show resolved Hide resolved
keyboards/fr4/unix60/readme.md Show resolved Hide resolved
keyboards/fr4/unix60/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/fr4/unix60/rules.mk Outdated Show resolved Hide resolved
@mkdl mkdl changed the base branch from master to develop December 30, 2020 11:06
@mkdl
Copy link
Author

mkdl commented Dec 30, 2020

Could you retarget this to develop, since it's changing the folder location (and therefore compile command) for the keyboard.

You can edit the title, and select "develop" instead of "master".

done

mkdl and others added 4 commits December 30, 2020 12:09
@mkdl @fauxpark
Update keyboards/fr4/unix60/readme.md
b77d501 
Co-authored-by: Ryan <fauxpark@gmail.com>
@mkdl @fauxpark
Update keyboards/fr4/unix60/keymaps/default/keymap.c
3830958 
Co-authored-by: Ryan <fauxpark@gmail.com>
@mkdl @fauxpark
Update keyboards/fr4/unix60/rules.mk
b61d420 
Co-authored-by: Ryan <fauxpark@gmail.com>
@mkdl
Update readme.md
ea144b1
@drashna drashna requested a review from a team January 1, 2021 23:09
fauxpark
fauxpark requested changes Jan 2, 2021
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

Make example in the readme for the southpaw75 needs to be updated as well.

keyboards/fr4/unix60/readme.md Outdated Show resolved Hide resolved
@mkdl @fauxpark
Update keyboards/fr4/unix60/readme.md
0af3fc4 
Co-authored-by: Ryan <fauxpark@gmail.com>
noroadsleft
noroadsleft requested changes Jan 9, 2021
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

GitHub tip: You can apply multiple suggestions to a single commit by using the Files Changed tab.

keyboards/fr4/unix60/unix60.h Outdated Show resolved Hide resolved
keyboards/fr4/unix60/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/fr4/unix60/info.json Outdated Show resolved Hide resolved
keyboards/fr4/unix60/info.json Outdated Show resolved Hide resolved
keyboards/fr4/unix60/config.h Outdated Show resolved Hide resolved
keyboards/fr4/unix60/config.h Outdated Show resolved Hide resolved
mkdl and others added 4 commits January 20, 2021 00:52
@mkdl @noroadsleft
Update keyboards/fr4/unix60/unix60.h
4e35635 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@mkdl @noroadsleft
Update keyboards/fr4/unix60/keymaps/default/keymap.c
ceb68fd 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@mkdl @noroadsleft
Update keyboards/fr4/unix60/info.json
5b36618 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@mkdl @noroadsleft
Update keyboards/fr4/unix60/info.json
0768b41 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
mkdl and others added 2 commits January 20, 2021 00:53
@mkdl @noroadsleft
Update keyboards/fr4/unix60/config.h
d2824e4 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@mkdl @noroadsleft
Update keyboards/fr4/unix60/config.h
8fd63c2 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
mkdl
mkdl commented Feb 12, 2021
View reviewed changes
Copy link
Author

@mkdl mkdl left a comment

Choose a reason for hiding this comment

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

ok

mkdl
mkdl commented Feb 12, 2021
View reviewed changes
Copy link
Author

@mkdl mkdl left a comment

Choose a reason for hiding this comment

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

I thought it got approved already, but now the suggestions are "outdated and cannot be applied" Please help :)

@drashna drashna merged commit f6de408 into qmk:develop Feb 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
breaking_change Changes that need to wait for a version increment keyboard keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mkdl @drashna @fauxpark @noroadsleft