meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge d8e838fe4d into dee3e26ac0

Browse source
This commit is contained in:
Sybren A. Stüvel 2026-04-20 10:05:07 +00:00 • committed by GitHub
commit 7d55e13a05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 295 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/simple_repeater/MyMesh.cpp
View file

@ -459,14 +459,6 @@ const char *MyMesh::getLogDateTime() {
return tmp;
}
void MyMesh::logRxRaw(float snr, float rssi, const uint8_t raw[], int len) {
#if MESH_PACKET_LOGGING
Serial.print(getLogDateTime());
Serial.print(" RAW: ");
mesh::Utils::printHex(Serial, raw, len);
Serial.println();
#endif
}
void MyMesh::logRx(mesh::Packet *pkt, int len, float score) {
#ifdef WITH_BRIDGE

2
examples/simple_repeater/MyMesh.h
View file

@ -137,8 +137,6 @@ protected:
bool allowPacketForward(const mesh::Packet* packet) override;
const char* getLogDateTime() override;
void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override;
void logRx(mesh::Packet* pkt, int len, float score) override;
void logTx(mesh::Packet* pkt, int len) override;
void logTxFail(mesh::Packet* pkt, int len) override;

19
examples/simple_repeater/main.cpp
View file

@ -2,6 +2,17 @@
#include <Mesh.h>
#include "MyMesh.h"
#if BLE_PACKET_LOGGING
#if defined(NRF52_PLATFORM) || defined(ESP32)
#include <helpers/BLELogInterface.h>
#else
#error "BLE_PACKET_LOGGING is not supported on this platform (only ESP32 and nRF52)"
#endif
#endif
#if MESH_PACKET_LOGGING && BLE_PACKET_LOGGING && (defined(NRF52_PLATFORM) || defined(ESP32))
static BLELogInterface ble_log;
#endif
#ifdef DISPLAY_CLASS
#include "UITask.h"
@ -95,6 +106,11 @@ void setup() {
the_mesh.begin(fs);
#if MESH_PACKET_LOGGING && BLE_PACKET_LOGGING && (defined(NRF52_PLATFORM) || defined(ESP32))
ble_log.begin(the_mesh.getNodeName());
the_mesh.setPacketLogStream(&ble_log);
#endif
#ifdef DISPLAY_CLASS
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
#endif
@ -153,6 +169,9 @@ void loop() {
ui_task.loop();
#endif
rtc_clock.tick();
#if MESH_PACKET_LOGGING && BLE_PACKET_LOGGING && defined(ESP32)
ble_log.loop();
#endif
if (the_mesh.getNodePrefs()->powersaving_enabled && !the_mesh.hasPendingWork()) {
#if defined(NRF52_PLATFORM)

8
examples/simple_room_server/MyMesh.cpp
View file

@ -199,14 +199,6 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
return 0; // unknown command
}
void MyMesh::logRxRaw(float snr, float rssi, const uint8_t raw[], int len) {
#if MESH_PACKET_LOGGING
Serial.print(getLogDateTime());
Serial.print(" RAW: ");
mesh::Utils::printHex(Serial, raw, len);
Serial.println();
#endif
}
void MyMesh::logRx(mesh::Packet *pkt, int len, float score) {
if (_logging) {

1
examples/simple_room_server/MyMesh.h
View file

@ -131,7 +131,6 @@ protected:
return _prefs.airtime_factor;
}
void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override;
void logRx(mesh::Packet* pkt, int len, float score) override;
void logTx(mesh::Packet* pkt, int len) override;
void logTxFail(mesh::Packet* pkt, int len) override;

19
examples/simple_room_server/main.cpp
View file

@ -2,6 +2,17 @@
#include <Mesh.h>
#include "MyMesh.h"
#if BLE_PACKET_LOGGING
#if defined(NRF52_PLATFORM) || defined(ESP32)
#include <helpers/BLELogInterface.h>
#else
#error "BLE_PACKET_LOGGING is not supported on this platform (only ESP32 and nRF52)"
#endif
#endif
#if MESH_PACKET_LOGGING && BLE_PACKET_LOGGING && (defined(NRF52_PLATFORM) || defined(ESP32))
static BLELogInterface ble_log;
#endif
#ifdef DISPLAY_CLASS
#include "UITask.h"
@ -72,6 +83,11 @@ void setup() {
the_mesh.begin(fs);
#if MESH_PACKET_LOGGING && BLE_PACKET_LOGGING && (defined(NRF52_PLATFORM) || defined(ESP32))
ble_log.begin(the_mesh.getNodeName());
the_mesh.setPacketLogStream(&ble_log);
#endif
#ifdef DISPLAY_CLASS
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
#endif
@ -113,4 +129,7 @@ void loop() {
ui_task.loop();
#endif
rtc_clock.tick();
#if MESH_PACKET_LOGGING && BLE_PACKET_LOGGING && defined(ESP32)
ble_log.loop();
#endif
}