Disarray ProductID change #12440
Merged
Disarray ProductID change #12440
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
keyboard
keymap
via
|
This has some merge conflicts that need to be addressed. |
Initial commit for alice clone pcb
Co-authored-by: Joel Challis <git@zvecr.com>
* add support for --clean to compile and flash * compile standalone JSON keymaps without polluting the tree * Add support for passing environment vars to make * make flake8 happy * document changes to qmk compile and flash * add -e support to json export compiling * Fix python 3.6 * honor $MAKE * add support for parallel builds
Updated folders to include separate readme.md for each pcb version
This reverts commit 76892ad.
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Moved LED indicators to #define in config.h
moved LED indicator to #define in config.h
Renamed corresponding .h and .c files in each subfolder to match the folder name (ortho/staggered). also, changed the referenced file in each .c file correspondingly.
Updated folders to include separate readme.md for each pcb version
This reverts commit 76892ad.
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Moved LED indicators to #define in config.h
moved LED indicator to #define in config.h
Renamed corresponding .h and .c files in each subfolder to match the folder name (ortho/staggered). also, changed the referenced file in each .c file correspondingly.
github-actions
bot
added
dependencies
and removed
keymap
via
|
ok. I was able to clear the config.h file conflict by rebasing to upstream master with Erovia's help |
This reverts commit ed45c2a.
|
reverted the update back to the current ChibiOS modules version ffe54d6 and ChibiOS-Contrib to 61baa6b. Rebasing set these modules older than current, which has now been corrected |
Erovia
approved these changes
Apr 3, 2021
fauxpark
approved these changes
Apr 4, 2021
makenova
pushed a commit
to makenova/qmk_firmware
that referenced
this pull request
Apr 26, 2021
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@gmail.com>
HokieGeek
pushed a commit
to HokieGeek/qmk_firmware
that referenced
this pull request
Jul 11, 2021
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changed ProductID for Disarray Staggered version to 2, as it was incorrectly labeled as 3. Change is needed for VIA compatibility
Description
Types of Changes
Issues Fixed or Closed by This PR
Fixed incorrect ProductID number for Staggered Disarray in config.h that prevents proper recognition with VIA
Checklist