pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-11 23:52:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into T-beam-display-no-touch

Browse Source
This commit is contained in:
Nasimovy 2025-05-25 20:17:36 +02:00 committed by GitHub
commit 10cb204e17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.cpp
View File

@ -213,7 +213,7 @@ std::string InkHUD::NotificationApplet::getNotificationText(uint16_t widthAvaila
// Sender id // Sender id
if (node && node->has_user) if (node && node->has_user)
text += node->user.short_name; text += parseShortName(node);
else else
text += hexifyNodeNum(message->sender); text += hexifyNodeNum(message->sender);
@ -227,7 +227,7 @@ std::string InkHUD::NotificationApplet::getNotificationText(uint16_t widthAvaila
// Sender id // Sender id
if (node && node->has_user) if (node && node->has_user)
text += node->user.short_name; text += parseShortName(node);
else else
text += hexifyNodeNum(message->sender); text += hexifyNodeNum(message->sender);

6
src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.cpp
View File

@ -67,13 +67,13 @@ void InkHUD::AllMessageApplet::onRender()
} }
// Sender's id // Sender's id
// - shortname, if available, or // - short name and long name, if available, or
// - node id // - node id
meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(message->sender); meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(message->sender);
if (sender && sender->has_user) { if (sender && sender->has_user) {
header += sender->user.short_name; header += parseShortName(sender); // May be last-four of node if unprintable (emoji, etc)
header += " ("; header += " (";
header += sender->user.long_name; header += parse(sender->user.long_name);
header += ")"; header += ")";
} else } else
header += hexifyNodeNum(message->sender); header += hexifyNodeNum(message->sender);

6
src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.cpp
View File

@ -63,13 +63,13 @@ void InkHUD::DMApplet::onRender()
} }
// Sender's id // Sender's id
// - shortname, if available, or // - shortname and long name, if available, or
// - node id // - node id
meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(latestMessage->dm.sender); meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(latestMessage->dm.sender);
if (sender && sender->has_user) { if (sender && sender->has_user) {
header += sender->user.short_name; header += parseShortName(sender); // May be last-four of node if unprintable (emoji, etc)
header += " ("; header += " (";
header += sender->user.long_name; header += parse(sender->user.long_name);
header += ")"; header += ")";
} else } else
header += hexifyNodeNum(latestMessage->dm.sender); header += hexifyNodeNum(latestMessage->dm.sender);

4
src/modules/Telemetry/DeviceTelemetry.cpp
View File

@ -9,6 +9,7 @@
#include "Router.h" #include "Router.h"
#include "configuration.h" #include "configuration.h"
#include "main.h" #include "main.h"
#include "memGet.h"
#include <OLEDDisplay.h> #include <OLEDDisplay.h>
#include <OLEDDisplayUi.h> #include <OLEDDisplayUi.h>
#include <meshUtils.h> #include <meshUtils.h>
@ -133,6 +134,9 @@ meshtastic_Telemetry DeviceTelemetryModule::getLocalStatsTelemetry()
telemetry.variant.local_stats.num_packets_rx_bad = SimRadio::instance->rxBad; telemetry.variant.local_stats.num_packets_rx_bad = SimRadio::instance->rxBad;
telemetry.variant.local_stats.num_tx_relay = SimRadio::instance->txRelay; telemetry.variant.local_stats.num_tx_relay = SimRadio::instance->txRelay;
} }
#else
telemetry.variant.local_stats.heap_total_bytes = memGet.getHeapSize();
telemetry.variant.local_stats.heap_free_bytes = memGet.getFreeHeap();
#endif #endif
if (router) { if (router) {
telemetry.variant.local_stats.num_rx_dupe = router->rxDupe; telemetry.variant.local_stats.num_rx_dupe = router->rxDupe;