[BOARD]: CanaryOne (#3150)

* 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>
This commit is contained in:
Huston Hedinger
2024-02-10 15:55:32 -08:00
committed by GitHub
parent 404d0dda79
commit 13c8dca6b4
25 changed files with 361 additions and 23 deletions

View File

@@ -58,7 +58,7 @@
SerialModule *serialModule;
SerialModuleRadio *serialModuleRadio;
#ifdef TTGO_T_ECHO
#if defined(TTGO_T_ECHO) || defined(CANARYONE)
SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("SerialModule") {}
static Print *serialPrint = &Serial;
#else
@@ -140,7 +140,7 @@ int32_t SerialModule::runOnce()
Serial.begin(baud);
Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
}
#elif !defined(TTGO_T_ECHO)
#elif !defined(TTGO_T_ECHO) && !defined(CANARYONE)
if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
#ifdef ARCH_RP2040
Serial2.setFIFOSize(RX_BUFFER);
@@ -188,7 +188,7 @@ int32_t SerialModule::runOnce()
}
}
}
#if !defined(TTGO_T_ECHO)
#if !defined(TTGO_T_ECHO) && !defined(CANARYONE)
else {
while (Serial2.available()) {
serialPayloadSize = Serial2.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);