diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp index c471100b..73d066ba 100644 --- a/examples/simple_repeater/MyMesh.cpp +++ b/examples/simple_repeater/MyMesh.cpp @@ -446,14 +446,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 diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h index 8857a1f7..c13e00c2 100644 --- a/examples/simple_repeater/MyMesh.h +++ b/examples/simple_repeater/MyMesh.h @@ -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; diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp index 0cb04412..fafa4f87 100644 --- a/examples/simple_room_server/MyMesh.cpp +++ b/examples/simple_room_server/MyMesh.cpp @@ -193,14 +193,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) { diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h index 9e2fbffd..7dde402b 100644 --- a/examples/simple_room_server/MyMesh.h +++ b/examples/simple_room_server/MyMesh.h @@ -124,7 +124,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; diff --git a/src/Dispatcher.h b/src/Dispatcher.h index 68c3da89..5ae41e19 100644 --- a/src/Dispatcher.h +++ b/src/Dispatcher.h @@ -185,7 +185,13 @@ protected: virtual DispatcherAction onRecvPacket(Packet* pkt) = 0; - virtual void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) { } // custom hook + virtual void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) { // custom hook + #if MESH_PACKET_LOGGING + _packet_log.printf("%s RAW: ", getLogDateTime()); + mesh::Utils::printHex(_packet_log, raw, len); + _packet_log.print("\n"); + #endif + } virtual void logRx(Packet* packet, int len, float score) { } // hooks for custom logging virtual void logTx(Packet* packet, int len) { }