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

[BOARD]: CanaryOne #3150

Merged
merged 30 commits into from
Feb 10, 2024
Merged

[BOARD]: CanaryOne #3150

merged 30 commits into from
Feb 10, 2024

Conversation

hdngr
Copy link
Contributor

@hdngr hdngr commented Jan 30, 2024

@CLAassistant
Copy link

CLAassistant commented Jan 30, 2024

CLA assistant check
All committers have signed the CLA.

.vscode/extensions.json Outdated Show resolved Hide resolved
@hdngr
Copy link
Contributor Author

hdngr commented Feb 10, 2024

@thebentern bumped protobuf submodule... anything else you need on this? We're picking up boards next week and should have some to the development team soon.

@thebentern
Copy link
Contributor

@hdngr looks good to me. Once you merge or rebase on upstream master, I'll get this one integrated

@hdngr
Copy link
Contributor Author

hdngr commented Feb 10, 2024

@thebentern reverted change to src/mesh/generated/meshtastic/mesh.pb.h

My understanding is everything under src/mesh/generated is generated from protobuffs in CI build.

Also - good news, your CI pipeline caught it. :-)

cc: @lolsborn

thebentern added a commit to meshtastic/artifacts that referenced this pull request Feb 10, 2024
@thebentern thebentern merged commit 13c8dca into meshtastic:master Feb 10, 2024
64 checks passed
mverch67 pushed a commit that referenced this pull request Feb 12, 2024
* compiling w/o e-ink display

* pinout changes

* progress getting LoRa and LCD working

* fix for bootloader, gps pins

* add canary to build matrix

* merge with main

* fix build by excluding BellModem in RadioLib

* fixes for GPS

* Fix LED_BLUE and GPS RX/TX pins

* Variant changes for merge

* make GPS baud rate configurable

* fix debug config

* Canary v1.2 changes

* Fixes for GPS

* pass trunk check

* bump protobufs to master

* update build flags to use CANARYONE enum

* use canaryone throughout for consistency.

* #define 0 is still defined

* add back .vscode/extensions.json

* bump protobufs

* revert manual change to generated file

---------

Co-authored-by: Steven Osborn <steven@lolsborn.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants