Check in partial work on S&F

This commit is contained in:
Jm Casler 2021-11-28 19:34:35 -08:00
parent 3ed4a1e3e1
commit 937f67c4ec
2 changed files with 19 additions and 1 deletions

View File

@ -5,6 +5,7 @@
#include "Router.h" #include "Router.h"
#include "configuration.h" #include "configuration.h"
#include "mesh-pb-constants.h" #include "mesh-pb-constants.h"
#include "mesh/generated/storeforward.pb.h"
#include "plugins/PluginDev.h" #include "plugins/PluginDev.h"
#include <Arduino.h> #include <Arduino.h>
#include <map> #include <map>
@ -223,6 +224,8 @@ void StoreForwardPlugin::sendMessage(NodeNum dest, char *str)
service.sendToMesh(p); service.sendToMesh(p);
//HardwareMessage_init_default
} }
ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp) ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
@ -232,6 +235,14 @@ ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
DEBUG_MSG("--- S&F Received something\n"); DEBUG_MSG("--- S&F Received something\n");
StoreAndForwardMessage sfm = StoreAndForwardMessage_init_default;
switch(sfm.rr) {
}
auto &p = mp.decoded; auto &p = mp.decoded;
// The router node should not be sending messages as a client. // The router node should not be sending messages as a client.
@ -258,6 +269,8 @@ ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
storeForwardPlugin->historyAdd(mp); storeForwardPlugin->historyAdd(mp);
} }
} else if (mp.decoded.portnum == PortNum_STORE_FORWARD_APP) {
} else { } else {
DEBUG_MSG("Packet came from an unknown port %u\n", mp.decoded.portnum); DEBUG_MSG("Packet came from an unknown port %u\n", mp.decoded.portnum);
} }

View File

@ -2,6 +2,8 @@
#include "SinglePortPlugin.h" #include "SinglePortPlugin.h"
#include "concurrency/OSThread.h" #include "concurrency/OSThread.h"
#include "mesh/generated/storeforward.pb.h"
#include "configuration.h" #include "configuration.h"
#include <Arduino.h> #include <Arduino.h>
#include <functional> #include <functional>
@ -53,7 +55,10 @@ class StoreForwardPlugin : public SinglePortPlugin, private concurrency::OSThrea
void sendPayload(NodeNum dest = NODENUM_BROADCAST, uint32_t packetHistory_index = 0); void sendPayload(NodeNum dest = NODENUM_BROADCAST, uint32_t packetHistory_index = 0);
void sendMessage(NodeNum dest, char *str); void sendMessage(NodeNum dest, char *str);
virtual MeshPacket *allocReply(); virtual MeshPacket *allocReply();
virtual bool wantPortnum(PortNum p) { return true; }; /*
Override the wantPortnum method.
*/
virtual bool wantPortnum(PortNum p) { return true; };
private: private:
void populatePSRAM(); void populatePSRAM();