mirror of
https://github.com/mikecarper/MeshCore.git
synced 2026-09-07 04:23:55 +00:00
First upstream merge since the 2026-06-06 base (191 upstream commits). 14 files conflicted; resolutions below. Fleet-critical check (Constraint 1): upstream reordered NodePrefs members (rx_boosted_gain / path_hash_mode moved to the struct tail) but did NOT change /com_prefs. Persistence is written field-by-field at explicit offsets, so member order is in-memory only. Verified the fork's writeCommonPrefsImage() is byte-identical to upstream's inline writer at every offset (79 pad, 121, 122, 290-294). No migration needed. Resolutions: - CommonCLI.h: kept the fork's NodePrefs (superset) and adopted upstream's setRxBoostedGain(bool)->bool signature change, which CommonCLI.cpp now uses to report unsupported. Corrected a stale comment claiming rx_boosted_gain lives at offset 79 (it is a pad; the field is at 290). - CommonCLI.cpp: kept the fork's legacy /com_prefs migration and the extracted writeCommonPrefsImage() call. - UITask.cpp: three-way merge - upstream's drawTextCentered + powering-off screen, plus the fork's WITH_WEBCONFIG portal/reboot screens. - ESP32Board.cpp, MeshCore.h, platformio.ini: kept both sides (fork OTA additions alongside upstream powerOff/enterDeepSleep and Packet.cpp). - MicroNMEALocationProvider.h: took upstream's claim/release and added the _claims member they depend on. - MyMesh.cpp/.h (repeater + room server): kept the fork's superset defaults. - Removed duplicate declarations auto-merge produced: RadioLibWrapper::_cad_enabled and MyMesh::getCADEnabled(). Verification: native suite 15/15 (incl. upstream's new test_mesh_tables), both MQTT smoke builds green, ArduinoJson pin check passes. Hardware validation next.
107 lines
2.8 KiB
C++
107 lines
2.8 KiB
C++
#include "HeltecTrackerV2Board.h"
|
|
|
|
void HeltecTrackerV2Board::begin() {
|
|
ESP32Board::begin();
|
|
|
|
pinMode(PIN_ADC_CTRL, OUTPUT);
|
|
digitalWrite(PIN_ADC_CTRL, LOW); // Initially inactive
|
|
|
|
loRaFEMControl.init();
|
|
|
|
esp_reset_reason_t reason = esp_reset_reason();
|
|
if (reason != ESP_RST_DEEPSLEEP) {
|
|
delay(1); // GC1109 startup time after cold power-on
|
|
}
|
|
|
|
periph_power.begin();
|
|
if (reason == ESP_RST_DEEPSLEEP) {
|
|
long wakeup_source = esp_sleep_get_ext1_wakeup_status();
|
|
if (wakeup_source & (1 << P_LORA_DIO_1)) { // received a LoRa packet (while in deep sleep)
|
|
startup_reason = BD_STARTUP_RX_PACKET;
|
|
}
|
|
|
|
rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS);
|
|
rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1);
|
|
}
|
|
}
|
|
|
|
void HeltecTrackerV2Board::onBeforeTransmit(void) {
|
|
digitalWrite(P_LORA_TX_LED, HIGH); // turn TX LED on
|
|
loRaFEMControl.setTxModeEnable();
|
|
}
|
|
|
|
void HeltecTrackerV2Board::onAfterTransmit(void) {
|
|
digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED off
|
|
loRaFEMControl.setRxModeEnable();
|
|
}
|
|
|
|
void HeltecTrackerV2Board::powerOff() {
|
|
// Turn off PA
|
|
digitalWrite(P_LORA_PA_POWER, LOW);
|
|
rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_POWER);
|
|
|
|
ESP32Board::powerOff();
|
|
}
|
|
|
|
uint16_t HeltecTrackerV2Board::getBattMilliVolts() {
|
|
analogReadResolution(10);
|
|
digitalWrite(PIN_ADC_CTRL, HIGH);
|
|
delay(10);
|
|
uint32_t raw = 0;
|
|
for (int i = 0; i < 8; i++) {
|
|
raw += analogRead(PIN_VBAT_READ);
|
|
}
|
|
raw = raw / 8;
|
|
|
|
digitalWrite(PIN_ADC_CTRL, LOW);
|
|
|
|
return (5.42 * (3.3 / 1024.0) * raw) * 1000;
|
|
}
|
|
|
|
const char* HeltecTrackerV2Board::getManufacturerName() const {
|
|
// The v1.1 environment reuses this V2 board implementation (same variant
|
|
// dir), so report the correct identity per build flag — this string feeds
|
|
// WebConfig and MQTT status/board metadata.
|
|
#ifdef HELTEC_TRACKER_V1_1
|
|
return "Heltec Tracker V1.1";
|
|
#else
|
|
return "Heltec Tracker V2";
|
|
#endif
|
|
}
|
|
|
|
bool HeltecTrackerV2Board::setLoRaFemLnaEnabled(bool enable) {
|
|
if (!loRaFEMControl.isLnaCanControl()) {
|
|
return false;
|
|
}
|
|
|
|
loRaFEMControl.setLNAEnable(enable);
|
|
loRaFEMControl.setRxModeEnable();
|
|
return true;
|
|
}
|
|
|
|
bool HeltecTrackerV2Board::canControlLoRaFemLna() const {
|
|
return loRaFEMControl.isLnaCanControl();
|
|
}
|
|
|
|
bool HeltecTrackerV2Board::isLoRaFemLnaEnabled() const {
|
|
return loRaFEMControl.isLNAEnabled();
|
|
}
|
|
|
|
bool HeltecTrackerV2Board::setLoRaFemLnaEnabled(bool enable) {
|
|
if (!loRaFEMControl.isLnaCanControl()) {
|
|
return false;
|
|
}
|
|
|
|
loRaFEMControl.setLNAEnable(enable);
|
|
loRaFEMControl.setRxModeEnable();
|
|
return true;
|
|
}
|
|
|
|
bool HeltecTrackerV2Board::canControlLoRaFemLna() const {
|
|
return loRaFEMControl.isLnaCanControl();
|
|
}
|
|
|
|
bool HeltecTrackerV2Board::isLoRaFemLnaEnabled() const {
|
|
return loRaFEMControl.isLNAEnabled();
|
|
}
|