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

Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B #18584

Merged
merged 44 commits into from
Dec 19, 2022
Merged

Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B #18584

merged 44 commits into from
Dec 19, 2022

Conversation

4pplet
Copy link
Contributor

@4pplet 4pplet commented Oct 4, 2022

Description

Adding new revision of the Duck Viper V2/V3 and Duck Eagle V2/V3 replacement PCB. Switching to APM32F072 or STM32F072 from ATmega32U2, adding split space options and USB-C.

Thanks! <3

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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).

4pplet and others added 30 commits January 31, 2021 16:16
enable rgb underglow for VIA-firmware
4822ba3
Merge remote-tracking branch 'upstream/master'
95d87c6
Merge remote-tracking branch 'upstream/master'
6d1ca39
update master branch from remote
1bb162a
Merge remote-tracking branch 'upstream/master'
e32af47
Merge remote-tracking branch 'upstream/master'
baa29b1
cont
3d4c946
Merge remote-tracking branch 'upstream/master'
456835e
Merge remote-tracking branch 'upstream/master'
7564a8f
Merge remote-tracking branch 'upstream/master'
92f7266
Merge remote-tracking branch 'upstream/master'
a619d57
@4pplet
Merge remote-tracking branch 'upstream/master'
d31268c
@4pplet
Merge remote-tracking branch 'upstream/master'
475cd46
@4pplet
Merge remote-tracking branch 'upstream/master'
cd4f7e9
@4pplet
Merge remote-tracking branch 'upstream/master'
32eb4bf
@4pplet
Merge remote-tracking branch 'upstream/master'
8a8921c
@4pplet
Merge remote-tracking branch 'upstream/master'
5d58560
@4pplet
Merge remote-tracking branch 'upstream/master'
40aef4b
@4pplet
Merge branch 'master' of https://github.com/4pplet/qmk_firmware
308b2f2
@4pplet
Added build command for rev c and bootloader instruction in the main …
1fd4987 
…readme

Added build command for rev c and bootloader instruction in the main readme
@4pplet
Merge remote-tracking branch 'upstream/master'
ff49df5
@4pplet
Merge remote-tracking branch 'upstream/master'
86365b8
@4pplet
Merge remote-tracking branch 'upstream/master'
1ea2c7b
@4pplet
Merge remote-tracking branch 'upstream/master'
9be56a8
@4pplet
Merge branch 'master' of https://github.com/4pplet/qmk_firmware
e14011f
@4pplet
Merge remote-tracking branch 'upstream/master'
e73f608
@4pplet
Merge remote-tracking branch 'upstream/master'
aaca0ae
@4pplet
Merge remote-tracking branch 'upstream/master'
4488505
@4pplet
Merge remote-tracking branch 'upstream/master'
fb35260
@4pplet
Merge remote-tracking branch 'upstream/master'
f1c44c4
drashna
drashna reviewed Nov 20, 2022
View reviewed changes
keyboards/4pplet/eagle_viper_rep/rev_b/config.h Outdated Show resolved Hide resolved
keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c Outdated Show resolved Hide resolved
keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c Outdated Show resolved Hide resolved
@4pplet
Copy link
Contributor Author

4pplet commented Nov 20, 2022

Thanks for the feedback and suggestions! <3

@4pplet 4pplet requested a review from drashna November 20, 2022 11:47
@drashna
Copy link
Member

drashna commented Nov 30, 2022

This has a number of merge conflicts that need to be addressed.

@4pplet
Removing RGBLIGHT_ANIMATIONS define for revision A
2b320c9 
Removing RGBLIGHT_ANIMATIONS define for revision A
@4pplet
Copy link
Contributor Author

4pplet commented Nov 30, 2022

This has a number of merge conflicts that need to be addressed.

Yes, please let me know how I can address it.

The changes in this PR should be used for this file:
keyboards/4pplet/eagle_viper_rep/rev_a/config.h

These two files (and the keymaps directory) should be removed:
keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c
keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c

@drashna
Copy link
Member

drashna commented Dec 4, 2022

git merge upstream/master should let you fix this. You'll have to manually fix the merge conflict in the config.h.

But unfortunately, since the PR was opened with the option to allow maintainers to edit disabled, I can't do anything on our end. (but the merge should fix the issue)

@4pplet
Copy link
Contributor Author

4pplet commented Dec 4, 2022

git merge upstream/master should let you fix this. You'll have to manually fix the merge conflict in the config.h.

But unfortunately, since the PR was opened with the option to allow maintainers to edit disabled, I can't do anything on our end. (but the merge should fix the issue)

Thanks! I believe it's ready for merge now, I'll make sure to enable that maintainers can edit for future PRs ^^

@drashna drashna requested a review from a team December 14, 2022 20:57
@tzarc tzarc merged commit 8d43f20 into qmk:master Dec 19, 2022
@adiron adiron mentioned this pull request Dec 19, 2022
Closed
2 tasks
@4pplet 4pplet mentioned this pull request Dec 22, 2022
Merged
6 tasks
sbhal pushed a commit to sbhal/qmk_firmware that referenced this pull request Dec 30, 2022
@4pplet @drashna
Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B (qmk#18584)
4344c4f 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: 4pplet <[email protected]>
omikronik pushed a commit to omikronik/qmk_firmware that referenced this pull request Jan 22, 2023
@4pplet @drashna @omikronik
Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B (qmk#18584)
7786739 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: 4pplet <[email protected]>
ideas32 pushed a commit to ideas32/qmk_firmware that referenced this pull request Jan 25, 2023
@4pplet @drashna @ideas32
Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B (qmk#18584)
823e06d 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: 4pplet <[email protected]>
@4pplet 4pplet mentioned this pull request Feb 24, 2023
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@tzarc tzarc tzarc approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap 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.
4 participants
@4pplet @drashna @tzarc @fauxpark