mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-29 05:01:54 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
43 lines
1.1 KiB
C++
43 lines
1.1 KiB
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
/*
|
|
|
|
An applet with nonstandard behavior, which will require special handling
|
|
|
|
For features like the menu, and the battery icon.
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "configuration.h"
|
|
|
|
#include "./Applet.h"
|
|
|
|
namespace NicheGraphics::InkHUD
|
|
{
|
|
|
|
class SystemApplet : public Applet
|
|
{
|
|
public:
|
|
// System applets have the right to:
|
|
|
|
bool handleInput = false; // - respond to input from the user button
|
|
bool lockRendering = false; // - prevent other applets from being rendered during an update
|
|
bool lockRequests = false; // - prevent other applets from triggering display updates
|
|
|
|
virtual void onReboot() { onShutdown(); } // - handle reboot specially
|
|
|
|
// Other system applets may take precedence over our own system applet though
|
|
// The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank)
|
|
|
|
private:
|
|
// System applets are always running (active), but may not be visible (foreground)
|
|
|
|
void onActivate() override {}
|
|
void onDeactivate() override {}
|
|
};
|
|
|
|
}; // namespace NicheGraphics::InkHUD
|
|
|
|
#endif |