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

[Keyboard] Add "Uno" rev2 #14071

Merged
merged 22 commits into from
Mar 13, 2022
Merged

[Keyboard] Add "Uno" rev2 #14071

merged 22 commits into from
Mar 13, 2022

Conversation

spencer-p
Copy link

@spencer-p spencer-p commented Aug 19, 2021 •
edited

Description

Adds support for the second revision of Uno, courtesy of @Snipeye.

Types of Changes

  • Keyboard (addition or update)

Issues Fixed or Closed by This PR

  • N/A

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.
  • N/A 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).

@Snipeye
Copy link
Contributor

Snipeye commented Aug 19, 2021

I was going to say something about modifying the default keymap, but then I saw that you put it as a "demo" keymap - really appreciate the work you put in, thank you.

@drashna drashna requested a review from a team August 20, 2021 04:38
fauxpark
fauxpark requested changes Sep 6, 2021
View reviewed changes
keyboards/uno/info.json Outdated Show resolved Hide resolved
keyboards/uno/info.json Outdated Show resolved Hide resolved
keyboards/uno/readme.md Outdated Show resolved Hide resolved
keyboards/uno/readme.md Outdated Show resolved Hide resolved
keyboards/uno/readme.md Outdated Show resolved Hide resolved
keyboards/uno/rev1/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/rev1/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/rev2/config.h Outdated Show resolved Hide resolved
keyboards/uno/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/rev2/rules.mk Outdated Show resolved Hide resolved
@Snipeye @spencer-p
[Keyboard] Add "Uno" rev2
1e22b07 
Adds support for the second revision of Uno, courtesy of @Snipeye.
@spencer-p
Copy link
Author

@fauxpark Merged your changes and fixup'd into the original commit.

@drashna drashna requested review from fauxpark and a team September 11, 2021 05:09
fauxpark
fauxpark requested changes Sep 11, 2021
View reviewed changes
keyboards/uno/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/rev1/rules.mk Outdated Show resolved Hide resolved
drashna
drashna reviewed Sep 15, 2021
View reviewed changes
keyboards/uno/uno.h Outdated Show resolved Hide resolved
spencer-p and others added 4 commits September 16, 2021 16:23
@spencer-p @fauxpark
Update keyboards/uno/rev2/rules.mk
a4c6921 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/rev1/rules.mk
c8435df 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @drashna
Update keyboards/uno/uno.h
21d20a7 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@spencer-p
Merge branch 'master' into unorev2
e7262fd
@spencer-p
Copy link
Author

Committed all requested changes; Github still thinks @fauxpark changes are outstanding (??)

@drashna drashna requested review from a team and fauxpark September 18, 2021 19:26
@spencer-p
Copy link
Author

@fauxpark Can you verify your requested changes have been accepted?

fauxpark
fauxpark requested changes Nov 6, 2021
View reviewed changes
keyboards/uno/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/rev1/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/keymaps/demo/keymap.c Outdated Show resolved Hide resolved
keyboards/uno/keymaps/demo/keymap.c Outdated Show resolved Hide resolved
keyboards/uno/keymaps/demo/keymap.c Outdated Show resolved Hide resolved
spencer-p and others added 5 commits November 5, 2021 22:28
@spencer-p @fauxpark
Update keyboards/uno/rev2/rules.mk
5d0c943 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/rev1/rules.mk
200bf32 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/keymaps/demo/keymap.c
8324c5d 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/keymaps/demo/keymap.c
11cfb2d 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/keymaps/demo/keymap.c
d492ffd 
Co-authored-by: Ryan <fauxpark@gmail.com>
@drashna drashna requested a review from a team November 10, 2021 14:17
@spencer-p
Copy link
Author

@fauxpark Can you confirm there are no outstanding changes required?

fauxpark
fauxpark requested changes Dec 14, 2021
View reviewed changes
keyboards/uno/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/uno/rev1/rules.mk Outdated Show resolved Hide resolved
spencer-p and others added 2 commits December 14, 2021 09:08
@spencer-p @fauxpark
Update keyboards/uno/rev2/rules.mk
00de3de 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/rev1/rules.mk
4954d11 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p
Copy link
Author

@fauxpark Done

noroadsleft
noroadsleft requested changes Mar 9, 2022
View reviewed changes
keyboards/uno/info.json Outdated Show resolved Hide resolved
keyboards/uno/rev1/config.h Outdated Show resolved Hide resolved
keyboards/uno/rev2/config.h Outdated Show resolved Hide resolved
keyboards/uno/rev2/config.h Outdated Show resolved Hide resolved
fauxpark
fauxpark requested changes Mar 10, 2022
View reviewed changes
keyboards/uno/rev2/config.h Outdated Show resolved Hide resolved
keyboards/uno/rev1/config.h Outdated Show resolved Hide resolved
spencer-p and others added 6 commits March 11, 2022 10:12
@spencer-p @noroadsleft
Update keyboards/uno/info.json
0a42b4e 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@spencer-p @noroadsleft
Update keyboards/uno/rev1/config.h
c993246 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@spencer-p @noroadsleft
Update keyboards/uno/rev2/config.h
6bb6d58 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@spencer-p @noroadsleft
Update keyboards/uno/rev2/config.h
7eb82c9 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@spencer-p @fauxpark
Update keyboards/uno/rev2/config.h
8ce1573 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p @fauxpark
Update keyboards/uno/rev1/config.h
c28aad6 
Co-authored-by: Ryan <fauxpark@gmail.com>
@spencer-p
Copy link
Author

@fauxpark @noroadsleft All suggested changes committed.

@noroadsleft noroadsleft merged commit 8fe3864 into qmk:master Mar 13, 2022
@noroadsleft
Copy link
Member

Thanks!

cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Mar 14, 2022
Merge remote-tracking branch 'qmk/develop' into develop
8e42d0f 
* qmk/develop: (696 commits)
  Sentence correction (qmk#16650)
  [Keyboard] Add via keymap to AL1 (qmk#16499)
  Rename TICK to TICK_EVENT to prevent naming conflicts (qmk#16649)
  [Keyboard] Add BAMFK-1 (qmk#16409)
  Disable RGB matrix pixel animations for some boards (qmk#16643)
  keebio/iris: Add ifdefs to encoder callbacks (qmk#16642)
  bolsa/damapad - Fix missing layout macro (qmk#16639)
  Mousekeys fix (qmk#16640)
  Fix oneshot toggle logic (qmk#16630)
  Fix 40percentclub USB descriptors (qmk#16638)
  [Core] Move `has_mouse_report_changed` function to `report.c`  (qmk#16543)
  ISP flashing guide: add instructions for flashing STM32duino bootloader (qmk#16568)
  Move keyboard USB IDs and strings to data driven: 0-9 (qmk#16481)
  USB-USB converter cleanup (qmk#16618)
  [Keyboard] Add "Uno" rev2 (qmk#14071)
  [Keyboard] Add support for Jels60 (qmk#16605)
  helix:edvorakjp keymap change to use split_common (qmk#16532)
  [Keymap] Update personal crkbd keymap (qmk#16624)
  [Keyboard] add missing endif in glitch keyboard (qmk#16629)
  [Keyboard] Add damapad (qmk#16443)
  ...
tacahiroy pushed a commit to tacahiroy/qmk_firmware that referenced this pull request Mar 18, 2022
@spencer-p @tacahiroy
[Keyboard] Add "Uno" rev2 (qmk#14071)
b9f1f40 
* [Keyboard] Add "Uno" rev2

Adds support for the second revision of Uno, courtesy of @Snipeye.

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/uno.h

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Align rules.mk comments

* Update keyboards/uno/info.json

* Update keyboards/uno/rev1/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev1/config.h
0xcharly pushed a commit to Bastardkb/bastardkb-qmk that referenced this pull request Jul 4, 2022
@spencer-p @zykrah
[Keyboard] Add "Uno" rev2 (qmk#14071)
ea32480 
* [Keyboard] Add "Uno" rev2

Adds support for the second revision of Uno, courtesy of @Snipeye.

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/uno.h

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Align rules.mk comments

* Update keyboards/uno/info.json

* Update keyboards/uno/rev1/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev1/config.h
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

@fauxpark fauxpark fauxpark requested changes

@noroadsleft noroadsleft noroadsleft approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@spencer-p @Snipeye @noroadsleft @drashna @fauxpark