mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

finish TLora C6 Support, without bluetooth for now

pull/4692/head
Thomas Göttgens 2024-09-28 13:42:32 +02:00
rodzic f3213a5b2f
commit c650e7d273
4 zmienionych plików z 5 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
arch/esp32/esp32c6.ini
Wyświetl plik

@ -1,6 +1,6 @@
[esp32c6_base] [esp32c6_base]
extends = esp32_base extends = esp32_base
platform = https://github.com/Jason2866/platform-espressif32.git#92cd8e2ed8ec8392b32adc89451aecfcbbaa1726 platform = https://github.com/Jason2866/platform-espressif32.git#22faa566df8c789000f8136cd8d0aca49617af55
build_flags = build_flags =
${arduino_base.build_flags} ${arduino_base.build_flags}
-Wall -Wall

3
src/SerialConsole.cpp
Wyświetl plik

@ -46,7 +46,8 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
Port.setRX(SERIAL2_RX); Port.setRX(SERIAL2_RX);
#endif #endif
Port.begin(SERIAL_BAUD); Port.begin(SERIAL_BAUD);
#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040) #if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040) || \
defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
time_t timeout = millis(); time_t timeout = millis();
while (!Port) { while (!Port) {
if (Throttle::isWithinTimespanMs(timeout, FIVE_SECONDS_MS)) { if (Throttle::isWithinTimespanMs(timeout, FIVE_SECONDS_MS)) {

2
src/platform/esp32/architecture.h
Wyświetl plik

@ -90,6 +90,8 @@
#define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P6 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P6
#elif defined(TLORA_V2_1_18) #elif defined(TLORA_V2_1_18)
#define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P8 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P8
#elif defined(TLORA_C6)
#define HW_VENDOR meshtastic_HardwareModel_TLORA_C6
#elif defined(T_DECK) #elif defined(T_DECK)
#define HW_VENDOR meshtastic_HardwareModel_T_DECK #define HW_VENDOR meshtastic_HardwareModel_T_DECK
#elif defined(T_WATCH_S3) #elif defined(T_WATCH_S3)

1
variants/tlora_c6/platformio.ini
Wyświetl plik

@ -3,7 +3,6 @@ extends = esp32c6_base
board = esp32-c6-devkitm-1 board = esp32-c6-devkitm-1
build_flags = build_flags =
${esp32c6_base.build_flags} ${esp32c6_base.build_flags}
-D PRIVATE_HW
-D TLORA_C6 -D TLORA_C6
-I variants/tlora_c6 -I variants/tlora_c6
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1