rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 10:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into t5-epaper-pro

Browse Source
This commit is contained in:
Manuel
2025-10-30 13:43:54 +01:00
committed by GitHub
parent 9dd5487ba3 756efa7f00
commit 9f81d9637e
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/Screen.cpp
View File

@@ -446,7 +446,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
if (uiconfig.screen_brightness == 1) if (uiconfig.screen_brightness == 1)
digitalWrite(PIN_EINK_EN, HIGH); digitalWrite(PIN_EINK_EN, HIGH);
#elif defined(PCA_PIN_EINK_EN) #elif defined(PCA_PIN_EINK_EN)
if (uiconfig.screen_brightness == 1) if (uiconfig.screen_brightness > 0)
io.digitalWrite(PCA_PIN_EINK_EN, HIGH); io.digitalWrite(PCA_PIN_EINK_EN, HIGH);
#endif #endif

2
src/graphics/draw/MenuHandler.cpp
View File

@@ -515,7 +515,7 @@ void menuHandler::homeBaseMenu()
} }
saveUIConfig(); saveUIConfig();
#elif defined(PCA_PIN_EINK_EN) #elif defined(PCA_PIN_EINK_EN)
if (uiconfig.screen_brightness == 1) { if (uiconfig.screen_brightness > 0) {
uiconfig.screen_brightness = 0; uiconfig.screen_brightness = 0;
io.digitalWrite(PCA_PIN_EINK_EN, LOW); io.digitalWrite(PCA_PIN_EINK_EN, LOW);
} else { } else {

1
src/mesh/RF95Interface.cpp
View File

@@ -260,6 +260,7 @@ void RF95Interface::addReceiveMetadata(meshtastic_MeshPacket *mp)
{ {
mp->rx_snr = lora->getSNR(); mp->rx_snr = lora->getSNR();
mp->rx_rssi = lround(lora->getRSSI()); mp->rx_rssi = lround(lora->getRSSI());
LOG_DEBUG("Corrected frequency offset: %f", lora->getFrequencyError());
} }
void RF95Interface::setStandby() void RF95Interface::setStandby()

2
variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
View File

@@ -14,6 +14,8 @@
#define BATTERY_PIN 8 #define BATTERY_PIN 8
#define ADC_CHANNEL ADC1_GPIO8_CHANNEL #define ADC_CHANNEL ADC1_GPIO8_CHANNEL
#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
#define PIN_BUZZER 9 #define PIN_BUZZER 9
// Buttons // Buttons