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.

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

Added rev2 & move rev1+rev2 to parent folder #10973

Merged
merged 17 commits into from
Jan 11, 2021
Merged

Conversation

Aplyard
Copy link
Contributor

@Aplyard Aplyard commented Nov 18, 2020

Moved aplx6 to parent folder, renamed it to rev1 and added rev2

rev2 has different keymap.c from rev1

Description

Aplx6 has a new rev and a new pcb with encoder & oled display support.
Made a parent folder named aplx, renamed aplx6 to rev and added rev2 folder and files.
Edited old rev1 readme.md to correct the make: example.
Sorry for any bad coding in advance :P

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).Screenshot 2020-11-18 at 8 27 44 PM

Moved aplx6 to parent folder, renamed it to rev1 and added rev2
@zvecr zvecr added the breaking_change Changes that need to wait for a version increment label Nov 18, 2020
keyboards/aplx/aplx6/rev1/config.h Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/config.h Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/rev2.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/rev2.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/rev2.h Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/rules.mk Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team November 19, 2020 17:46
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.

Also, more of a general question, but why not aplyard as the parent directory? You're using that as your Manufacturer name for the USB strings.

It's not wrong or anything, but it strikes me as unusual.

keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/readme.md Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/aplx/aplx6/rev2/rules.mk Outdated Show resolved Hide resolved
@noroadsleft
Copy link
Member

Also, as this moves the rev1 in a way that's not backwards compatible with the previous workflow (the make command changes), this should target the develop branch.

@noroadsleft noroadsleft changed the base branch from master to develop December 5, 2020 18:05
@Aplyard
Copy link
Contributor Author

Aplyard commented Dec 6, 2020

Also, more of a general question, but why not aplyard as the parent directory? You're using that as your Manufacturer name for the USB strings.

It's not wrong or anything, but it strikes me as unusual.

Hey and thanks for a the suggestions. I simply use Aplx as a Category name for anything that has to do with a Keyboard. At first i tried it as " /aplyard/aplx6/rev2/... " and with the " qmk compile -kb aplyard/aplx6/rev2 -km default " i was getting an error which i couldnt figure out. Simply by changing the parent folder to aplx, it was compiling ok.
Now after your suggestion i renamed the parent to "aplyard", i tried "cd" to qmk folder and did a
" make aplyard/aplx6/rev2:default " and it worked, don't know why. I guess i should have tried the make command from day1.
I will change the parent folder to " aplyard " and i will correct the build instructions on the 2 readme.mds

@Aplyard
Copy link
Contributor Author

Aplyard commented Jan 4, 2021

hello, is there anything else you want me to do? made all the suggested changes.
Thank you again

@drashna drashna requested a review from a team January 6, 2021 05:07
@drashna drashna merged commit a06dda1 into qmk:develop Jan 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking_change Changes that need to wait for a version increment keyboard keymap
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants