-
-
Notifications
You must be signed in to change notification settings - Fork 39.9k
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
Adding alternative configs for Piantor and update example #21452
Conversation
@l4u Mind reviewing? |
In |
Sure thing, good idea.
…-------- Original Message --------
On Jul 5, 2023, 3:08 AM, Duncan Sutherland wrote:
In readme.md could you add a paragraph with conditions for when to compile no_vbus_sense?
—
Reply to this email directly, [view it on GitHub](#21452 (comment)), or [unsubscribe](https://github.com/notifications/unsubscribe-auth/AFNZ22GVT4J7I65WEY2S4XLXOU4KRANCNFSM6AAAAAAZ6D3VOA).
You are receiving this because you authored the thread.Message ID: ***@***.***>
|
We squash when we merge PRs. So the commit history from the PR doesn't really matter. Though, personally, I prefer that it's not "cleaned up", since it makes it easier to see when and where changes occurred. But that's just my preference. |
TODO for me:
|
Build failing on bcat targets here- I may need some guidance on how best to proceed to fix. |
Thankfully I've already a PR (#21205) for fixing that. |
@l4u just wanted to also check in with you on this one too |
@drashna Any other suggestions here? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should really be inverted, that way there is no need to undef. And keyboard updates need to go through develop
.
@fauxpark How do we invert such that the default config has that pin defined but the two special configs have variations (either a new pin in the case of the Weact microcontroller, or no pin, for that case)? |
Probably the easiest would be to split the board into two "revisions" instead of how you've done it here. Then make sure the "base" cannot be built, either by removing the rules.mk or setting |
@fauxpark Okay let's see if I am understanding this: we can remove the pin definition from the current "base" config and place this into a new folder, "base", with its own rules, and define a new constant DEFAULT_FOLDER in the root definition that points to "base", such that when building the config it will default to "base" if not specified? |
Basically. You'd have two subfolders named say |
Got it- that does seem cleaner. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inclined to agree with fauxpark that the top-level configuration shouldn't have USB_VBUS_PIN
defined.
The "reference" Pi Pico pin (GP24
) would be configured in a raspi
subfolder (...I think this might be a better name than pico
, since there are so many different "Pi Pico"s) and the WeAct Pi Pico pin (GP29
) would be configured in a weact
subfolder—e.g.:
piantor/
├── no_vbus_sense/
│ └── rules.mk
├── raspi/
│ ├── config.h
│ └── rules.mk
├── weact/
│ ├── config.h
│ └── rules.mk
├── README.md
├── config.h
└── rules.mk
(The no_vbus_sense
folder wouldn't be necessary if the default build didn't need to assume a pin.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# This file intentionally left blank |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# This file intentionally left blank |
// When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used. | ||
#define USB_VBUS_PIN GP24 // for Raspberry Pi Pico |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
// When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used. | |
#define USB_VBUS_PIN GP24 // for Raspberry Pi Pico |
// SPDX-License-Identifier: GPL-2.0-or-later | ||
#pragma once | ||
|
||
#undef USB_VBUS_PIN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#undef USB_VBUS_PIN |
Thanks for the feedback, I'll take a look |
Thank you for your contribution! |
Status update: I am slow |
Thank you for your contribution! |
Currently verifying some changes on local hardware.
…-------- Original Message --------
On Feb 2, 2024, 5:46 PM, github-actions[bot] wrote:
Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.
—
Reply to this email directly, [view it on GitHub](#21452 (comment)), or [unsubscribe](https://github.com/notifications/unsubscribe-auth/AFNZ22E4TT67FXQR277MOQDYRWJJFAVCNFSM6AAAAAAZ6D3VOCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSMRVGAYTANRYGM).
You are receiving this because you authored the thread.Message ID: ***@***.***>
|
Thank you for your contribution! |
Thank you for your contribution! |
Description
Here we add an entrypoint for the Weact controller which is an option that Beekeeb ships with their Piantor kits, as well as the required variable to define which vbus pin the vanilla Pico uses vs. the Weact Pico. Additionally, added an example flashing with the Weact config as well as an alternative layout, Miryoku (this was originally puzzling for me, and this would have been helpful).
Types of Changes
Issues Fixed or Closed by This PR
Checklist