mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-30 11:23:53 +00:00
Merge pull request #2020 from meshtastic/serial-textmessage
Serial textmessage mode
This commit is contained in:
commit
61598c5942
@ -214,7 +214,6 @@ int32_t SerialModule::runOnce()
|
|||||||
|
|
||||||
MeshPacket *SerialModuleRadio::allocReply()
|
MeshPacket *SerialModuleRadio::allocReply()
|
||||||
{
|
{
|
||||||
|
|
||||||
auto reply = allocDataPacket(); // Allocate a packet for sending
|
auto reply = allocDataPacket(); // Allocate a packet for sending
|
||||||
|
|
||||||
return reply;
|
return reply;
|
||||||
@ -266,7 +265,12 @@ ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)
|
|||||||
if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_DEFAULT ||
|
if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_DEFAULT ||
|
||||||
moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_SIMPLE) {
|
moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_SIMPLE) {
|
||||||
Serial2.printf("%s", p.payload.bytes);
|
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.println();
|
||||||
|
Serial2.printf("%s: %s", sender, p.payload.bytes);
|
||||||
|
Serial2.println();
|
||||||
} else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) {
|
} else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) {
|
||||||
// TODO this needs to be implemented
|
// TODO this needs to be implemented
|
||||||
} else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_NMEA) {
|
} else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_NMEA) {
|
||||||
|
Loading…
Reference in New Issue
Block a user