mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-23 18:27:27 +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.
31 lines
556 B
C++
31 lines
556 B
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
/*
|
|
|
|
Sub-menu for InkHUD::MenuApplet
|
|
Structure of the menu is defined in InkHUD::showPage
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "configuration.h"
|
|
|
|
namespace NicheGraphics::InkHUD
|
|
{
|
|
|
|
// Sub-menu for MenuApplet
|
|
enum MenuPage : uint8_t {
|
|
ROOT, // Initial menu page
|
|
SEND,
|
|
CANNEDMESSAGE_RECIPIENT, // Select destination for a canned message
|
|
OPTIONS,
|
|
APPLETS,
|
|
AUTOSHOW,
|
|
RECENTS, // Select length of "recentlyActiveSeconds"
|
|
EXIT, // Dismiss the menu applet
|
|
};
|
|
|
|
} // namespace NicheGraphics::InkHUD
|
|
|
|
#endif |