pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-03 03:09:59 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1256 from mc-hamster/router

Browse Source 
Rename Plugin to Module in ui related areas.
This commit is contained in:
Jm Casler 2022-02-27 02:26:41 -08:00 committed by GitHub
commit 3f2baeb56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/Screen.cpp
View File

@ -176,7 +176,7 @@ static void drawSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int
} }
#endif #endif
static void drawPluginFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) static void drawModuleFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
uint8_t module_frame; uint8_t module_frame;
// there's a little but in the UI transition code // there's a little but in the UI transition code
@ -976,7 +976,7 @@ void Screen::setFrames()
DEBUG_MSG("showing standard frames\n"); DEBUG_MSG("showing standard frames\n");
showingNormalScreen = true; showingNormalScreen = true;
moduleFrames = MeshPlugin::GetMeshPluginsWithUIFrames(); moduleFrames = MeshPlugin::GetMeshModulesWithUIFrames();
DEBUG_MSG("Showing %d module frames\n", moduleFrames.size()); DEBUG_MSG("Showing %d module frames\n", moduleFrames.size());
int totalFrameCount = MAX_NUM_NODES + NUM_EXTRA_FRAMES + moduleFrames.size(); int totalFrameCount = MAX_NUM_NODES + NUM_EXTRA_FRAMES + moduleFrames.size();
DEBUG_MSG("Total frame count: %d\n", totalFrameCount); DEBUG_MSG("Total frame count: %d\n", totalFrameCount);
@ -995,7 +995,7 @@ void Screen::setFrames()
// is the same offset into the moduleFrames vector // is the same offset into the moduleFrames vector
// so that we can invoke the module's callback // so that we can invoke the module's callback
for (auto i = moduleFrames.begin(); i != moduleFrames.end(); ++i) { for (auto i = moduleFrames.begin(); i != moduleFrames.end(); ++i) {
normalFrames[numframes++] = drawPluginFrame; normalFrames[numframes++] = drawModuleFrame;
} }
DEBUG_MSG("Added modules. numframes: %d\n", numframes); DEBUG_MSG("Added modules. numframes: %d\n", numframes);

2
src/mesh/MeshPlugin.cpp
View File

@ -222,7 +222,7 @@ void setReplyTo(MeshPacket *p, const MeshPacket &to)
p->decoded.request_id = to.id; p->decoded.request_id = to.id;
} }
std::vector<MeshPlugin *> MeshPlugin::GetMeshPluginsWithUIFrames() std::vector<MeshPlugin *> MeshPlugin::GetMeshModulesWithUIFrames()
{ {
std::vector<MeshPlugin *> modulesWithUIFrames; std::vector<MeshPlugin *> modulesWithUIFrames;

2
src/mesh/MeshPlugin.h
View File

@ -68,7 +68,7 @@ class MeshPlugin
*/ */
static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO); static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO);
static std::vector<MeshPlugin *> GetMeshPluginsWithUIFrames(); static std::vector<MeshPlugin *> GetMeshModulesWithUIFrames();
static void observeUIEvents(Observer<const UIFrameEvent *> *observer); static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
static AdminMessageHandleResult handleAdminMessageForAllPlugins( static AdminMessageHandleResult handleAdminMessageForAllPlugins(
const MeshPacket &mp, AdminMessage *request, AdminMessage *response); const MeshPacket &mp, AdminMessage *request, AdminMessage *response);