From 31ec2da0e9e17d7f6e0e9a43cfb428c1e076f3f8 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 4 Dec 2022 15:40:28 -0600 Subject: [PATCH 1/2] Text message mode for serial --- src/modules/SerialModule.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp index 05ed44cd7..509b0d67e 100644 --- a/src/modules/SerialModule.cpp +++ b/src/modules/SerialModule.cpp @@ -214,7 +214,6 @@ int32_t SerialModule::runOnce() MeshPacket *SerialModuleRadio::allocReply() { - auto reply = allocDataPacket(); // Allocate a packet for sending return reply; @@ -266,7 +265,10 @@ ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp) if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_DEFAULT || moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_SIMPLE) { Serial2.printf("%s", p.payload.bytes); - + } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG) { + NodeInfo *node = nodeDB.getNode(getFrom(&mp)); + String sender = (node && node->has_user) ? node->user.short_name : "???"; + Serial2.printf("\n%s: %s\n\n", sender, p.payload.bytes); } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) { // TODO this needs to be implemented } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_NMEA) { From a3a24e02166f0cbde9331b0bd4eaa2a57ce0c655 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 4 Dec 2022 16:03:57 -0600 Subject: [PATCH 2/2] Don't put newlines in the text buffer --- src/modules/SerialModule.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp index 509b0d67e..aaaf3b144 100644 --- a/src/modules/SerialModule.cpp +++ b/src/modules/SerialModule.cpp @@ -268,7 +268,9 @@ ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp) } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG) { NodeInfo *node = nodeDB.getNode(getFrom(&mp)); String sender = (node && node->has_user) ? node->user.short_name : "???"; - Serial2.printf("\n%s: %s\n\n", sender, p.payload.bytes); + Serial2.println(); + Serial2.printf("%s: %s", sender, p.payload.bytes); + Serial2.println(); } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) { // TODO this needs to be implemented } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_NMEA) {