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

Add revision 1 and revision 2 to ProjectKB Alice PCB #8718

Merged
merged 5 commits into from
Apr 15, 2020
Merged

Add revision 1 and revision 2 to ProjectKB Alice PCB #8718

merged 5 commits into from
Apr 15, 2020

Conversation

awkannan
Copy link
Contributor

@awkannan awkannan commented Apr 7, 2020 •
edited
Loading

Description

Adding a new revision of the ProjectKB Alice PCB

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

@zvecr zvecr added the keyboard label Apr 11, 2020
@zvecr zvecr requested a review from a team April 11, 2020 22:17
zvecr
zvecr requested changes Apr 11, 2020
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

So rules.mk can go either way, either

  1. keyboards/projectkb/alice/rules.mk has all the common stuff, feature enabled/disabled logic and the rev rules.mk contains just overrides
  2. keyboards/projectkb/alice/rules.mk is kinda empty (in this case just the default folder) and the rev rules.mk contains everything

Would be happy with either, maybe a slight preference for 2.

@zvecr zvecr requested a review from a team April 11, 2020 22:30
@noroadsleft
Copy link
Member

So rules.mk can go either way, either

1. `keyboards/projectkb/alice/rules.mk` has all the common stuff, feature enabled/disabled logic and the rev `rules.mk` contains just overrides

2. `keyboards/projectkb/alice/rules.mk` is kinda empty (in this case just the default folder) and the rev `rules.mk` contains everything

Would be happy with either, maybe a slight preference for 2.

I prefer Option 2 because eventually I hope we can completely do away with DEFAULT_FOLDER.

noroadsleft
noroadsleft requested changes Apr 13, 2020
View reviewed changes
keyboards/projectkb/alice/rules.mk Outdated Show resolved Hide resolved
keyboards/projectkb/alice/rev1/rules.mk Outdated Show resolved Hide resolved
keyboards/projectkb/alice/rev2/rules.mk Outdated Show resolved Hide resolved
Andrew Kannan and others added 2 commits April 13, 2020 16:18
@awkannan
Copy link
Contributor Author

@zvecr @noroadsleft thanks again for the feedback! Updated.

@noroadsleft noroadsleft merged commit 17d0f63 into qmk:master Apr 15, 2020
@noroadsleft
Copy link
Member

Thanks!

galactic1969 added a commit to galactic1969/qmk_firmware that referenced this pull request Apr 16, 2020
@galactic1969
Merge remote-tracking branch 'upstream/master'
6a9d5c0 
* upstream/master: (1967 commits)
  [Docs] Japanese translation of docs/feature_combo.md (qmk#8671)
  Remove old setup scripts (qmk#8811)
  [Keyboard] ProjectKB Alice rev2 (qmk#8718)
  MILC: Fix setting config values for store_true and store_false (qmk#8813)
  KC60 Refactor (qmk#8782)
  Fix quick7 build command (qmk#8812)
  Miscellaneous stuff: remove clang-complete and autocomplete.sh, fix some rules.mk comments (qmk#8784)
  [Keyboard] add new keyboard quick7 (qmk#8670)
  [Keymap] Added custom layout for KBDFans KBD67 rev2 (qmk#8752)
  [keyboard] Add kudox rev3 (qmk#8704)
  CLI: Fix doctor error when can't run `bin/qmk --version`. (qmk#8796)
  deleted unused keymap (qmk#8797)
  Add missing repository name to qmk setup w/ github (qmk#8792)
  Configure RGBLIGHT_SPLIT for Mint60 (qmk#8788)
  [Keyboard] Aplx6 (qmk#8727)
  update pvinis keymap (qmk#8746)
  CLI: Use `shutil.which` to detect gmake, instead of OS check.
  CLI: Invoke gmake on FreeBSD when using `qmk compile`.
  [Docs] Japanese translation of docs/feature_dip_switch.md (qmk#8673)
  Fix broken KBD8X MKII Hardware link (qmk#8787)
  ...
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@kujawakk
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
3d60959 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
violet-fish pushed a commit to violet-fish/qmk_firmware that referenced this pull request May 3, 2020
@violet-fish
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
ad109a4 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
@lorenzoernesto
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
6c4656d 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@sowbug
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
42d1f10 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@turky
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
7be0a30 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@jakobaa
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
ec41c88 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
@sjmacneil
[Keyboard] ProjectKB Alice rev2 (qmk#8718)
64fc546 
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr requested changes

@noroadsleft noroadsleft noroadsleft approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@awkannan @noroadsleft @drashna @zvecr