fix: sd card shares the radio SPI object

Bu işleme şunda yer alıyor:
Jared Dohrman
2026-04-21 16:01:19 +10:00
ebeveyn eb1a934849
işleme 746396aee9
13 değiştirilmiş dosya ile 273 ekleme ve 13 silme
+117 -3
Dosyayı Görüntüle
@@ -1,5 +1,19 @@
#include "TBeam1WBoard.h"
namespace {
constexpr float kFanTempOnC = 48.0f;
constexpr float kFanTempOffC = 42.0f;
constexpr uint32_t kFanControlCheckMs = 5000;
constexpr uint32_t kFanPostTxHoldMs = 30000;
constexpr float kNtcSeriesResistorOhms = 10000.0f;
constexpr float kNtcBeta = 3950.0f;
constexpr float kNtcRoomTempKelvin = 298.15f;
constexpr float kNtcRoomResistanceOhms = 10000.0f;
constexpr float kNtcVrefVolts = 3.3f;
constexpr uint32_t kMinFanPostTxHoldMs = 0;
constexpr uint32_t kMaxFanPostTxHoldMs = 600000;
}
void TBeam1WBoard::begin() {
ESP32Board::begin();
@@ -17,16 +31,25 @@ void TBeam1WBoard::begin() {
// Initialize fan control (on by default - 1W PA can overheat)
pinMode(FAN_CTRL_PIN, OUTPUT);
digitalWrite(FAN_CTRL_PIN, HIGH);
setFanEnabled(true);
fan_force_on_until = millis() + fan_post_tx_hold_ms;
next_fan_control_check_at = millis() + kFanControlCheckMs;
}
void TBeam1WBoard::onBeforeTransmit() {
// RF switching handled by RadioLib via SX126X_DIO2_AS_RF_SWITCH and setRfSwitchPins()
digitalWrite(LED_PIN, HIGH); // TX LED on
if (fan_mode == FanMode::Auto) {
fan_force_on_until = millis() + fan_post_tx_hold_ms;
setFanEnabled(true);
}
}
void TBeam1WBoard::onAfterTransmit() {
digitalWrite(LED_PIN, LOW); // TX LED off
if (fan_mode == FanMode::Auto) {
fan_force_on_until = millis() + fan_post_tx_hold_ms;
}
}
uint16_t TBeam1WBoard::getBattMilliVolts() {
@@ -57,15 +80,106 @@ void TBeam1WBoard::powerOff() {
// Turn off LED and fan
digitalWrite(LED_PIN, LOW);
digitalWrite(FAN_CTRL_PIN, LOW);
setFanEnabled(false);
ESP32Board::powerOff();
}
void TBeam1WBoard::setFanEnabled(bool enabled) {
fan_enabled = enabled;
digitalWrite(FAN_CTRL_PIN, enabled ? HIGH : LOW);
}
bool TBeam1WBoard::isFanEnabled() const {
return digitalRead(FAN_CTRL_PIN) == HIGH;
return fan_enabled;
}
void TBeam1WBoard::setFanMode(FanMode mode) {
fan_mode = mode;
next_fan_control_check_at = 0;
updateFanControl(true);
}
TBeam1WBoard::FanMode TBeam1WBoard::getFanMode() const {
return fan_mode;
}
const char* TBeam1WBoard::getFanModeName() const {
switch (fan_mode) {
case FanMode::On:
return "on";
case FanMode::Off:
return "off";
case FanMode::Auto:
default:
return "auto";
}
}
float TBeam1WBoard::getLastBoardTemperatureC() const {
return last_board_temperature_c;
}
bool TBeam1WBoard::setFanPostTxHoldMs(uint32_t hold_ms) {
if (hold_ms < kMinFanPostTxHoldMs || hold_ms > kMaxFanPostTxHoldMs) {
return false;
}
fan_post_tx_hold_ms = hold_ms;
return true;
}
uint32_t TBeam1WBoard::getFanPostTxHoldMs() const {
return fan_post_tx_hold_ms;
}
float TBeam1WBoard::readBoardTemperatureC() const {
const float millivolts = analogReadMilliVolts(NTC_PIN);
if (millivolts <= 0.0f || millivolts >= (kNtcVrefVolts * 1000.0f)) {
return NAN;
}
const float voltage = millivolts / 1000.0f;
const float resistance = kNtcSeriesResistorOhms * ((kNtcVrefVolts / voltage) - 1.0f);
if (!(resistance > 0.0f)) {
return NAN;
}
const float kelvin = 1.0f / ((log(resistance / kNtcRoomResistanceOhms) / kNtcBeta) + (1.0f / kNtcRoomTempKelvin));
return kelvin - 273.15f;
}
void TBeam1WBoard::updateFanControl(bool force) {
const uint32_t now = millis();
if (!force && now < next_fan_control_check_at) {
return;
}
next_fan_control_check_at = now + kFanControlCheckMs;
if (fan_mode == FanMode::On) {
setFanEnabled(true);
return;
}
if (fan_mode == FanMode::Off) {
setFanEnabled(false);
return;
}
if (now < fan_force_on_until) {
setFanEnabled(true);
return;
}
const float temperature = readBoardTemperatureC();
last_board_temperature_c = temperature;
if (isnan(temperature)) {
// Keep the fan on if temperature sensing is unavailable.
setFanEnabled(true);
return;
}
if (temperature >= kFanTempOnC) {
setFanEnabled(true);
} else if (temperature <= kFanTempOffC) {
setFanEnabled(false);
}
}
+21
Dosyayı Görüntüle
@@ -28,8 +28,22 @@
// - Battery must support 2A+ discharge for high-power TX
class TBeam1WBoard : public ESP32Board {
public:
enum class FanMode : uint8_t {
Auto = 0,
On,
Off
};
private:
bool radio_powered = false;
bool fan_enabled = true;
uint32_t fan_force_on_until = 0;
uint32_t next_fan_control_check_at = 0;
uint32_t fan_post_tx_hold_ms = 30000;
FanMode fan_mode = FanMode::Auto;
float last_board_temperature_c = NAN;
float readBoardTemperatureC() const;
public:
void begin();
@@ -42,4 +56,11 @@ public:
// Fan control methods
void setFanEnabled(bool enabled);
bool isFanEnabled() const;
void setFanMode(FanMode mode);
FanMode getFanMode() const;
const char* getFanModeName() const;
float getLastBoardTemperatureC() const;
bool setFanPostTxHoldMs(uint32_t hold_ms);
uint32_t getFanPostTxHoldMs() const;
void updateFanControl(bool force = false);
};
+4 -1
Dosyayı Görüntüle
@@ -10,6 +10,10 @@ TBeam1WBoard board;
static SPIClass spi;
SPIClass* getBoardSharedArchiveSPI() {
return &spi;
}
RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
WRAPPER_CLASS radio_driver(radio, board);
@@ -62,4 +66,3 @@ mesh::LocalIdentity radio_new_identity() {
RadioNoiseListener rng(radio);
return mesh::LocalIdentity(&rng);
}
+2 -1
Dosyayı Görüntüle
@@ -20,9 +20,10 @@ extern WRAPPER_CLASS radio_driver;
extern AutoDiscoverRTCClock rtc_clock;
extern EnvironmentSensorManager sensors;
SPIClass* getBoardSharedArchiveSPI();
bool radio_init();
uint32_t radio_get_rng_seed();
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
void radio_set_tx_power(int8_t dbm);
mesh::LocalIdentity radio_new_identity();