From 6bee95d6b280aba1a71cedbfc4f4da8a37511b6f Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Wed, 9 Mar 2022 19:01:43 +1100 Subject: [PATCH] Rename MeshPlugin, SinglePortPlugin and ProtobufPlugin --- src/graphics/Screen.cpp | 8 ++--- src/graphics/Screen.h | 2 +- src/input/RotaryEncoderInterruptBase.h | 2 +- src/mesh/{MeshPlugin.cpp => MeshModule.cpp} | 34 +++++++++---------- src/mesh/{MeshPlugin.h => MeshModule.h} | 10 +++--- src/mesh/NodeDB.cpp | 2 +- ...{ProtobufPlugin.cpp => ProtobufModule.cpp} | 2 +- .../{ProtobufPlugin.h => ProtobufModule.h} | 8 ++--- src/mesh/ReliableRouter.cpp | 4 +-- src/mesh/Router.cpp | 2 +- ...{SinglePortPlugin.h => SinglePortModule.h} | 6 ++-- src/modules/AdminModule.cpp | 4 +-- src/modules/AdminModule.h | 4 +-- src/modules/CannedMessageModule.cpp | 2 +- src/modules/CannedMessageModule.h | 4 +-- src/modules/ExternalNotificationModule.cpp | 2 +- src/modules/ExternalNotificationModule.h | 4 +-- src/modules/NodeInfoModule.cpp | 2 +- src/modules/NodeInfoModule.h | 4 +-- src/modules/PositionModule.cpp | 2 +- src/modules/PositionModule.h | 4 +-- src/modules/RemoteHardwareModule.cpp | 2 +- src/modules/RemoteHardwareModule.h | 4 +-- src/modules/ReplyModule.h | 6 ++-- src/modules/RoutingModule.cpp | 2 +- src/modules/RoutingModule.h | 4 +-- src/modules/Telemetry/Telemetry.h | 6 ++-- src/modules/TextMessageModule.h | 6 ++-- src/modules/esp32/RangeTestModule.h | 6 ++-- src/modules/esp32/SerialModule.cpp | 2 +- src/modules/esp32/SerialModule.h | 4 +-- src/modules/esp32/StoreForwardModule.cpp | 2 +- src/modules/esp32/StoreForwardModule.h | 4 +-- 33 files changed, 80 insertions(+), 80 deletions(-) rename src/mesh/{MeshPlugin.cpp => MeshModule.cpp} (92%) rename src/mesh/{MeshPlugin.h => MeshModule.h} (97%) rename src/mesh/{ProtobufPlugin.cpp => ProtobufModule.cpp} (50%) rename src/mesh/{ProtobufPlugin.h => ProtobufModule.h} (92%) rename src/mesh/{SinglePortPlugin.h => SinglePortModule.h} (84%) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index a1a4dffa7..94d997a8c 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -69,7 +69,7 @@ uint32_t dopThresholds[5] = {2000, 1000, 500, 200, 100}; // At some point, we're going to ask all of the modules if they would like to display a screen frame // we'll need to hold onto pointers for the modules that can draw a frame. -std::vector moduleFrames; +std::vector moduleFrames; // Stores the last 4 of our hardware ID, to make finding the device for pairing easier static char ourId[5]; @@ -194,7 +194,7 @@ static void drawModuleFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int // DEBUG_MSG("Screen is not in transition. Frame: %d\n\n", module_frame); } // DEBUG_MSG("Drawing Module Frame %d\n\n", module_frame); - MeshPlugin &pi = *moduleFrames.at(module_frame); + MeshModule &pi = *moduleFrames.at(module_frame); pi.drawFrame(display, state, x, y); } @@ -828,7 +828,7 @@ void Screen::setup() textMessageObserver.observe(textMessageModule); // Modules can notify screen about refresh - MeshPlugin::observeUIEvents(&uiFrameEventObserver); + MeshModule::observeUIEvents(&uiFrameEventObserver); } void Screen::forceDisplay() @@ -976,7 +976,7 @@ void Screen::setFrames() DEBUG_MSG("showing standard frames\n"); showingNormalScreen = true; - moduleFrames = MeshPlugin::GetMeshModulesWithUIFrames(); + moduleFrames = MeshModule::GetMeshModulesWithUIFrames(); DEBUG_MSG("Showing %d module frames\n", moduleFrames.size()); int totalFrameCount = MAX_NUM_NODES + NUM_EXTRA_FRAMES + moduleFrames.size(); DEBUG_MSG("Total frame count: %d\n", totalFrameCount); diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h index 9c178cd0a..2b0e3209b 100644 --- a/src/graphics/Screen.h +++ b/src/graphics/Screen.h @@ -40,7 +40,7 @@ class Screen #include "concurrency/OSThread.h" #include "power.h" #include -#include "mesh/MeshPlugin.h" +#include "mesh/MeshModule.h" // 0 to 255, though particular variants might define different defaults #ifndef BRIGHTNESS_DEFAULT diff --git a/src/input/RotaryEncoderInterruptBase.h b/src/input/RotaryEncoderInterruptBase.h index 72732261b..58e7b80e8 100644 --- a/src/input/RotaryEncoderInterruptBase.h +++ b/src/input/RotaryEncoderInterruptBase.h @@ -1,6 +1,6 @@ #pragma once -#include "SinglePortPlugin.h" // TODO: what header file to include? +#include "SinglePortModule.h" // TODO: what header file to include? #include "InputBroker.h" enum RotaryEncoderInterruptBaseStateType diff --git a/src/mesh/MeshPlugin.cpp b/src/mesh/MeshModule.cpp similarity index 92% rename from src/mesh/MeshPlugin.cpp rename to src/mesh/MeshModule.cpp index d3e0f584e..3e85cba71 100644 --- a/src/mesh/MeshPlugin.cpp +++ b/src/mesh/MeshModule.cpp @@ -1,38 +1,38 @@ #include "configuration.h" -#include "MeshPlugin.h" +#include "MeshModule.h" #include "Channels.h" #include "MeshService.h" #include "NodeDB.h" #include "modules/RoutingModule.h" #include -std::vector *MeshPlugin::modules; +std::vector *MeshModule::modules; -const MeshPacket *MeshPlugin::currentRequest; +const MeshPacket *MeshModule::currentRequest; /** * If any of the current chain of modules has already sent a reply, it will be here. This is useful to allow * the RoutingPlugin to avoid sending redundant acks */ -MeshPacket *MeshPlugin::currentReply; +MeshPacket *MeshModule::currentReply; -MeshPlugin::MeshPlugin(const char *_name) : name(_name) +MeshModule::MeshModule(const char *_name) : name(_name) { // Can't trust static initalizer order, so we check each time if (!modules) - modules = new std::vector(); + modules = new std::vector(); modules->push_back(this); } -void MeshPlugin::setup() {} +void MeshModule::setup() {} -MeshPlugin::~MeshPlugin() +MeshModule::~MeshModule() { assert(0); // FIXME - remove from list of modules once someone needs this feature } -MeshPacket *MeshPlugin::allocAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex) +MeshPacket *MeshModule::allocAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex) { Routing c = Routing_init_default; @@ -57,7 +57,7 @@ MeshPacket *MeshPlugin::allocAckNak(Routing_Error err, NodeNum to, PacketId idFr return p; } -MeshPacket *MeshPlugin::allocErrorResponse(Routing_Error err, const MeshPacket *p) +MeshPacket *MeshModule::allocErrorResponse(Routing_Error err, const MeshPacket *p) { auto r = allocAckNak(err, getFrom(p), p->id, p->channel); @@ -66,7 +66,7 @@ MeshPacket *MeshPlugin::allocErrorResponse(Routing_Error err, const MeshPacket * return r; } -void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src) +void MeshModule::callPlugins(const MeshPacket &mp, RxSource src) { // DEBUG_MSG("In call modules\n"); bool moduleFound = false; @@ -183,7 +183,7 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src) (src == RX_SRC_LOCAL) ? "LOCAL":"REMOTE"); } -MeshPacket *MeshPlugin::allocReply() +MeshPacket *MeshModule::allocReply() { auto r = myReply; myReply = NULL; // Only use each reply once @@ -194,7 +194,7 @@ MeshPacket *MeshPlugin::allocReply() * so that subclasses can (optionally) send a response back to the original sender. Implementing this method * is optional */ -void MeshPlugin::sendResponse(const MeshPacket &req) +void MeshModule::sendResponse(const MeshPacket &req) { auto r = allocReply(); if (r) { @@ -222,10 +222,10 @@ void setReplyTo(MeshPacket *p, const MeshPacket &to) p->decoded.request_id = to.id; } -std::vector MeshPlugin::GetMeshModulesWithUIFrames() +std::vector MeshModule::GetMeshModulesWithUIFrames() { - std::vector modulesWithUIFrames; + std::vector modulesWithUIFrames; if (modules) { for (auto i = modules->begin(); i != modules->end(); ++i) { auto &pi = **i; @@ -238,7 +238,7 @@ std::vector MeshPlugin::GetMeshModulesWithUIFrames() return modulesWithUIFrames; } -void MeshPlugin::observeUIEvents( +void MeshModule::observeUIEvents( Observer *observer) { if (modules) { @@ -254,7 +254,7 @@ void MeshPlugin::observeUIEvents( } } -AdminMessageHandleResult MeshPlugin::handleAdminMessageForAllPlugins(const MeshPacket &mp, AdminMessage *request, AdminMessage *response) +AdminMessageHandleResult MeshModule::handleAdminMessageForAllPlugins(const MeshPacket &mp, AdminMessage *request, AdminMessage *response) { AdminMessageHandleResult handled = AdminMessageHandleResult::NOT_HANDLED; if (modules) { diff --git a/src/mesh/MeshPlugin.h b/src/mesh/MeshModule.h similarity index 97% rename from src/mesh/MeshPlugin.h rename to src/mesh/MeshModule.h index 7abd56e14..cfc715497 100644 --- a/src/mesh/MeshPlugin.h +++ b/src/mesh/MeshModule.h @@ -52,23 +52,23 @@ typedef struct _UIFrameEvent { * Interally we use modules to implement the core meshtastic text messaging and gps position sharing features. You * can use these classes as examples for how to write your own custom module. See here: (FIXME) */ -class MeshPlugin +class MeshModule { - static std::vector *modules; + static std::vector *modules; public: /** Constructor * name is for debugging output */ - MeshPlugin(const char *_name); + MeshModule(const char *_name); - virtual ~MeshPlugin(); + virtual ~MeshModule(); /** For use only by MeshService */ static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO); - static std::vector GetMeshModulesWithUIFrames(); + static std::vector GetMeshModulesWithUIFrames(); static void observeUIEvents(Observer *observer); static AdminMessageHandleResult handleAdminMessageForAllPlugins( const MeshPacket &mp, AdminMessage *request, AdminMessage *response); diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 13e3812af..8c64c6f10 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -438,7 +438,7 @@ size_t NodeDB::getNumOnlineNodes() return numseen; } -#include "MeshPlugin.h" +#include "MeshModule.h" /** Update position info for this node based on received position data */ diff --git a/src/mesh/ProtobufPlugin.cpp b/src/mesh/ProtobufModule.cpp similarity index 50% rename from src/mesh/ProtobufPlugin.cpp rename to src/mesh/ProtobufModule.cpp index 9cb4b9c2d..cea2ecbf6 100644 --- a/src/mesh/ProtobufPlugin.cpp +++ b/src/mesh/ProtobufModule.cpp @@ -1,4 +1,4 @@ #include "configuration.h" -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" diff --git a/src/mesh/ProtobufPlugin.h b/src/mesh/ProtobufModule.h similarity index 92% rename from src/mesh/ProtobufPlugin.h rename to src/mesh/ProtobufModule.h index 72d80e0f3..e7eaac57a 100644 --- a/src/mesh/ProtobufPlugin.h +++ b/src/mesh/ProtobufModule.h @@ -1,5 +1,5 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" /** * A base class for mesh modules that assume that they are sending/receiving one particular protobuf based @@ -8,7 +8,7 @@ * If you are using protobufs to encode your packets (recommended) you can use this as a baseclass for your module * and avoid a bunch of boilerplate code. */ -template class ProtobufPlugin : protected SinglePortPlugin +template class ProtobufModule : protected SinglePortModule { const pb_msgdesc_t *fields; @@ -16,8 +16,8 @@ template class ProtobufPlugin : protected SinglePortPlugin /** Constructor * name is for debugging output */ - ProtobufPlugin(const char *_name, PortNum _ourPortNum, const pb_msgdesc_t *_fields) - : SinglePortPlugin(_name, _ourPortNum), fields(_fields) + ProtobufModule(const char *_name, PortNum _ourPortNum, const pb_msgdesc_t *_fields) + : SinglePortModule(_name, _ourPortNum), fields(_fields) { } diff --git a/src/mesh/ReliableRouter.cpp b/src/mesh/ReliableRouter.cpp index 96aca5026..ee513bae0 100644 --- a/src/mesh/ReliableRouter.cpp +++ b/src/mesh/ReliableRouter.cpp @@ -1,6 +1,6 @@ #include "configuration.h" #include "ReliableRouter.h" -#include "MeshPlugin.h" +#include "MeshModule.h" #include "MeshTypes.h" #include "mesh-pb-constants.h" @@ -92,7 +92,7 @@ void ReliableRouter::sniffReceived(const MeshPacket *p, const Routing *c) if (p->to == ourNode) { // ignore ack/nak/want_ack packets that are not address to us (we only handle 0 hop reliability // - not DSR routing) if (p->want_ack) { - if (MeshPlugin::currentReply) + if (MeshModule::currentReply) DEBUG_MSG("Someone else has replied to this message, no need for a 2nd ack\n"); else sendAckNak(Routing_Error_NONE, getFrom(p), p->id, p->channel); diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index f3210f1ec..08de01ccd 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -377,7 +377,7 @@ void Router::handleReceived(MeshPacket *p, RxSource src) } // call modules here - MeshPlugin::callPlugins(*p, src); + MeshModule::callPlugins(*p, src); } void Router::perhapsHandleReceived(MeshPacket *p) diff --git a/src/mesh/SinglePortPlugin.h b/src/mesh/SinglePortModule.h similarity index 84% rename from src/mesh/SinglePortPlugin.h rename to src/mesh/SinglePortModule.h index 564c03cdb..2e587cb89 100644 --- a/src/mesh/SinglePortPlugin.h +++ b/src/mesh/SinglePortModule.h @@ -1,12 +1,12 @@ #pragma once -#include "MeshPlugin.h" +#include "MeshModule.h" #include "Router.h" /** * Most modules are only interested in sending/receving one particular portnum. This baseclass simplifies that common * case. */ -class SinglePortPlugin : public MeshPlugin +class SinglePortModule : public MeshModule { protected: PortNum ourPortNum; @@ -15,7 +15,7 @@ class SinglePortPlugin : public MeshPlugin /** Constructor * name is for debugging output */ - SinglePortPlugin(const char *_name, PortNum _ourPortNum) : MeshPlugin(_name), ourPortNum(_ourPortNum) {} + SinglePortModule(const char *_name, PortNum _ourPortNum) : MeshModule(_name), ourPortNum(_ourPortNum) {} protected: /** diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index 41acfeeed..88c22b489 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -123,7 +123,7 @@ bool AdminModule::handleReceivedProtobuf(const MeshPacket &mp, AdminMessage *r) default: AdminMessage response = AdminMessage_init_default; - AdminMessageHandleResult handleResult = MeshPlugin::handleAdminMessageForAllPlugins(mp, r, &response); + AdminMessageHandleResult handleResult = MeshModule::handleAdminMessageForAllPlugins(mp, r, &response); if (handleResult == AdminMessageHandleResult::HANDLED_WITH_RESPONSE) { @@ -195,7 +195,7 @@ void AdminModule::handleSetRadio(RadioConfig &r) service.reloadConfig(); } -AdminModule::AdminModule() : ProtobufPlugin("Admin", PortNum_ADMIN_APP, AdminMessage_fields) +AdminModule::AdminModule() : ProtobufModule("Admin", PortNum_ADMIN_APP, AdminMessage_fields) { // restrict to the admin channel for rx boundChannel = Channels::adminChannel; diff --git a/src/modules/AdminModule.h b/src/modules/AdminModule.h index 98af9a677..b37fa496f 100644 --- a/src/modules/AdminModule.h +++ b/src/modules/AdminModule.h @@ -1,10 +1,10 @@ #pragma once -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" /** * Routing module for router control messages */ -class AdminModule : public ProtobufPlugin +class AdminModule : public ProtobufModule { public: /** Constructor diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 204330e8f..6bb048acf 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/src/modules/CannedMessageModule.cpp @@ -23,7 +23,7 @@ extern bool loadProto(const char *filename, size_t protoSize, size_t objSize, co extern bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, const void *dest_struct); CannedMessageModule::CannedMessageModule() - : SinglePortPlugin("canned", PortNum_TEXT_MESSAGE_APP), + : SinglePortModule("canned", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("CannedMessageModule") { if (radioConfig.preferences.canned_message_module_enabled) diff --git a/src/modules/CannedMessageModule.h b/src/modules/CannedMessageModule.h index 3a33b6acf..9a755c54e 100644 --- a/src/modules/CannedMessageModule.h +++ b/src/modules/CannedMessageModule.h @@ -1,5 +1,5 @@ #pragma once -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" #include "input/InputBroker.h" enum cannedMessageModuleRunState @@ -21,7 +21,7 @@ enum cannedMessageModuleRunState #define CANNED_MESSAGE_MODULE_MESSAGES_SIZE 800 class CannedMessageModule : - public SinglePortPlugin, + public SinglePortModule, public Observable, private concurrency::OSThread { diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp index d9f9f7d09..7412eb1d3 100644 --- a/src/modules/ExternalNotificationModule.cpp +++ b/src/modules/ExternalNotificationModule.cpp @@ -108,7 +108,7 @@ void ExternalNotificationModule::setExternalOff() // -------- ExternalNotificationModule::ExternalNotificationModule() - : SinglePortPlugin("ExternalNotificationModule", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread( + : SinglePortModule("ExternalNotificationModule", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread( "ExternalNotificationModule") { // restrict to the admin channel for rx diff --git a/src/modules/ExternalNotificationModule.h b/src/modules/ExternalNotificationModule.h index 40593aa83..a671d67c2 100644 --- a/src/modules/ExternalNotificationModule.h +++ b/src/modules/ExternalNotificationModule.h @@ -1,6 +1,6 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" #include "concurrency/OSThread.h" #include "configuration.h" #include @@ -10,7 +10,7 @@ * Radio interface for ExternalNotificationModule * */ -class ExternalNotificationModule : public SinglePortPlugin, private concurrency::OSThread +class ExternalNotificationModule : public SinglePortModule, private concurrency::OSThread { public: ExternalNotificationModule(); diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp index 9994d314f..4eeac349d 100644 --- a/src/modules/NodeInfoModule.cpp +++ b/src/modules/NodeInfoModule.cpp @@ -51,7 +51,7 @@ MeshPacket *NodeInfoModule::allocReply() } NodeInfoModule::NodeInfoModule() - : ProtobufPlugin("nodeinfo", PortNum_NODEINFO_APP, User_fields), concurrency::OSThread("NodeInfoModule") + : ProtobufModule("nodeinfo", PortNum_NODEINFO_APP, User_fields), concurrency::OSThread("NodeInfoModule") { isPromiscuous = true; // We always want to update our nodedb, even if we are sniffing on others setIntervalFromNow(30 * diff --git a/src/modules/NodeInfoModule.h b/src/modules/NodeInfoModule.h index 9030a83a9..db1b35575 100644 --- a/src/modules/NodeInfoModule.h +++ b/src/modules/NodeInfoModule.h @@ -1,10 +1,10 @@ #pragma once -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" /** * NodeInfo module for sending/receiving NodeInfos into the mesh */ -class NodeInfoModule : public ProtobufPlugin, private concurrency::OSThread +class NodeInfoModule : public ProtobufModule, private concurrency::OSThread { /// The id of the last packet we sent, to allow us to cancel it if we make something fresher PacketId prevPacketId = 0; diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp index 1deabae0f..e7556f440 100644 --- a/src/modules/PositionModule.cpp +++ b/src/modules/PositionModule.cpp @@ -10,7 +10,7 @@ PositionModule *positionModule; PositionModule::PositionModule() - : ProtobufPlugin("position", PortNum_POSITION_APP, Position_fields), concurrency::OSThread("PositionModule") + : ProtobufModule("position", PortNum_POSITION_APP, Position_fields), concurrency::OSThread("PositionModule") { isPromiscuous = true; // We always want to update our nodedb, even if we are sniffing on others setIntervalFromNow(60 * 1000); // Send our initial position 60 seconds after we start (to give GPS time to setup) diff --git a/src/modules/PositionModule.h b/src/modules/PositionModule.h index 8fbc5865c..2c964dca1 100644 --- a/src/modules/PositionModule.h +++ b/src/modules/PositionModule.h @@ -1,11 +1,11 @@ #pragma once -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" #include "concurrency/OSThread.h" /** * Position module for sending/receiving positions into the mesh */ -class PositionModule : public ProtobufPlugin, private concurrency::OSThread +class PositionModule : public ProtobufModule, private concurrency::OSThread { /// The id of the last packet we sent, to allow us to cancel it if we make something fresher PacketId prevPacketId = 0; diff --git a/src/modules/RemoteHardwareModule.cpp b/src/modules/RemoteHardwareModule.cpp index 7ceaffeab..b031f06e8 100644 --- a/src/modules/RemoteHardwareModule.cpp +++ b/src/modules/RemoteHardwareModule.cpp @@ -47,7 +47,7 @@ static uint64_t digitalReads(uint64_t mask) } RemoteHardwareModule::RemoteHardwareModule() - : ProtobufPlugin("remotehardware", PortNum_REMOTE_HARDWARE_APP, HardwareMessage_fields), concurrency::OSThread( + : ProtobufModule("remotehardware", PortNum_REMOTE_HARDWARE_APP, HardwareMessage_fields), concurrency::OSThread( "remotehardware") { } diff --git a/src/modules/RemoteHardwareModule.h b/src/modules/RemoteHardwareModule.h index 19811705a..e9c7794fb 100644 --- a/src/modules/RemoteHardwareModule.h +++ b/src/modules/RemoteHardwareModule.h @@ -1,12 +1,12 @@ #pragma once -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" #include "mesh/generated/remote_hardware.pb.h" #include "concurrency/OSThread.h" /** * A module that provides easy low-level remote access to device hardware. */ -class RemoteHardwareModule : public ProtobufPlugin, private concurrency::OSThread +class RemoteHardwareModule : public ProtobufModule, private concurrency::OSThread { /// The current set of GPIOs we've been asked to watch for changes uint64_t watchGpios = 0; diff --git a/src/modules/ReplyModule.h b/src/modules/ReplyModule.h index af17224a6..28a57a4bd 100644 --- a/src/modules/ReplyModule.h +++ b/src/modules/ReplyModule.h @@ -1,17 +1,17 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" /** * A simple example module that just replies with "Message received" to any message it receives. */ -class ReplyModule : public SinglePortPlugin +class ReplyModule : public SinglePortModule { public: /** Constructor * name is for debugging output */ - ReplyModule() : SinglePortPlugin("reply", PortNum_REPLY_APP) {} + ReplyModule() : SinglePortModule("reply", PortNum_REPLY_APP) {} protected: diff --git a/src/modules/RoutingModule.cpp b/src/modules/RoutingModule.cpp index 070231032..6acf5fe59 100644 --- a/src/modules/RoutingModule.cpp +++ b/src/modules/RoutingModule.cpp @@ -41,7 +41,7 @@ void RoutingModule::sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom, C router->sendLocal(p); // we sometimes send directly to the local node } -RoutingModule::RoutingModule() : ProtobufPlugin("routing", PortNum_ROUTING_APP, Routing_fields) +RoutingModule::RoutingModule() : ProtobufModule("routing", PortNum_ROUTING_APP, Routing_fields) { isPromiscuous = true; } diff --git a/src/modules/RoutingModule.h b/src/modules/RoutingModule.h index 66a326c7b..b2840ff58 100644 --- a/src/modules/RoutingModule.h +++ b/src/modules/RoutingModule.h @@ -1,11 +1,11 @@ #pragma once -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" #include "Channels.h" /** * Routing module for router control messages */ -class RoutingModule : public ProtobufPlugin +class RoutingModule : public ProtobufModule { public: /** Constructor diff --git a/src/modules/Telemetry/Telemetry.h b/src/modules/Telemetry/Telemetry.h index 40da90986..4e66b4b85 100644 --- a/src/modules/Telemetry/Telemetry.h +++ b/src/modules/Telemetry/Telemetry.h @@ -1,15 +1,15 @@ #pragma once #include "../mesh/generated/telemetry.pb.h" -#include "ProtobufPlugin.h" +#include "ProtobufModule.h" #include #include -class TelemetryModule : private concurrency::OSThread, public ProtobufPlugin +class TelemetryModule : private concurrency::OSThread, public ProtobufModule { public: TelemetryModule() : concurrency::OSThread("TelemetryModule"), - ProtobufPlugin("Telemetry", PortNum_TELEMETRY_APP, &Telemetry_msg) + ProtobufModule("Telemetry", PortNum_TELEMETRY_APP, &Telemetry_msg) { lastMeasurementPacket = nullptr; } diff --git a/src/modules/TextMessageModule.h b/src/modules/TextMessageModule.h index 184bb9e11..3b12dee48 100644 --- a/src/modules/TextMessageModule.h +++ b/src/modules/TextMessageModule.h @@ -1,17 +1,17 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" #include "Observer.h" /** * Text message handling for meshtastic - draws on the OLED display the most recent received message */ -class TextMessageModule : public SinglePortPlugin, public Observable +class TextMessageModule : public SinglePortModule, public Observable { public: /** Constructor * name is for debugging output */ - TextMessageModule() : SinglePortPlugin("text", PortNum_TEXT_MESSAGE_APP) {} + TextMessageModule() : SinglePortModule("text", PortNum_TEXT_MESSAGE_APP) {} protected: diff --git a/src/modules/esp32/RangeTestModule.h b/src/modules/esp32/RangeTestModule.h index 23ef0aaf6..76735d376 100644 --- a/src/modules/esp32/RangeTestModule.h +++ b/src/modules/esp32/RangeTestModule.h @@ -1,6 +1,6 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" #include "concurrency/OSThread.h" #include "configuration.h" #include @@ -23,12 +23,12 @@ extern RangeTestModule *rangeTestModule; * Radio interface for RangeTestModule * */ -class RangeTestModuleRadio : public SinglePortPlugin +class RangeTestModuleRadio : public SinglePortModule { uint32_t lastRxID = 0; public: - RangeTestModuleRadio() : SinglePortPlugin("RangeTestModuleRadio", PortNum_TEXT_MESSAGE_APP) {} + RangeTestModuleRadio() : SinglePortModule("RangeTestModuleRadio", PortNum_TEXT_MESSAGE_APP) {} /** * Send our payload into the mesh diff --git a/src/modules/esp32/SerialModule.cpp b/src/modules/esp32/SerialModule.cpp index 0fadb6d1b..0c8e15853 100644 --- a/src/modules/esp32/SerialModule.cpp +++ b/src/modules/esp32/SerialModule.cpp @@ -61,7 +61,7 @@ SerialModule::SerialModule() : concurrency::OSThread("SerialModule") {} char serialStringChar[Constants_DATA_PAYLOAD_LEN]; -SerialModuleRadio::SerialModuleRadio() : SinglePortPlugin("SerialModuleRadio", PortNum_SERIAL_APP) +SerialModuleRadio::SerialModuleRadio() : SinglePortModule("SerialModuleRadio", PortNum_SERIAL_APP) { // restrict to the admin channel for rx boundChannel = Channels::serialChannel; diff --git a/src/modules/esp32/SerialModule.h b/src/modules/esp32/SerialModule.h index 860f53082..f92b13422 100644 --- a/src/modules/esp32/SerialModule.h +++ b/src/modules/esp32/SerialModule.h @@ -1,6 +1,6 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" #include "concurrency/OSThread.h" #include "configuration.h" #include @@ -23,7 +23,7 @@ extern SerialModule *serialModule; * Radio interface for SerialModule * */ -class SerialModuleRadio : public SinglePortPlugin +class SerialModuleRadio : public SinglePortModule { uint32_t lastRxID = 0; diff --git a/src/modules/esp32/StoreForwardModule.cpp b/src/modules/esp32/StoreForwardModule.cpp index a8c775236..41e7077b7 100644 --- a/src/modules/esp32/StoreForwardModule.cpp +++ b/src/modules/esp32/StoreForwardModule.cpp @@ -378,7 +378,7 @@ ProcessMessage StoreForwardModule::handleReceivedProtobuf(const MeshPacket &mp, } StoreForwardModule::StoreForwardModule() - : SinglePortPlugin("StoreForwardModule", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("StoreForwardModule") + : SinglePortModule("StoreForwardModule", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("StoreForwardModule") { #ifndef NO_ESP32 diff --git a/src/modules/esp32/StoreForwardModule.h b/src/modules/esp32/StoreForwardModule.h index 4d610c667..2c6d6ec6e 100644 --- a/src/modules/esp32/StoreForwardModule.h +++ b/src/modules/esp32/StoreForwardModule.h @@ -1,6 +1,6 @@ #pragma once -#include "SinglePortPlugin.h" +#include "SinglePortModule.h" #include "concurrency/OSThread.h" #include "mesh/generated/storeforward.pb.h" @@ -18,7 +18,7 @@ struct PacketHistoryStruct { pb_size_t payload_size; }; -class StoreForwardModule : public SinglePortPlugin, private concurrency::OSThread +class StoreForwardModule : public SinglePortModule, private concurrency::OSThread { // bool firstTime = 1; bool busy = 0;