mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-15 14:27:19 +00:00
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
704 B
C++
43 lines
704 B
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
/*
|
|
|
|
Set of end-point actions for the Menu Applet
|
|
|
|
Added as menu entries in MenuApplet::showPage
|
|
Behaviors assigned in MenuApplet::execute
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "configuration.h"
|
|
|
|
namespace NicheGraphics::InkHUD
|
|
{
|
|
|
|
enum MenuAction {
|
|
NO_ACTION,
|
|
SEND_PING,
|
|
STORE_CANNEDMESSAGE_SELECTION,
|
|
SEND_CANNEDMESSAGE,
|
|
SHUTDOWN,
|
|
NEXT_TILE,
|
|
TOGGLE_BACKLIGHT,
|
|
TOGGLE_GPS,
|
|
ENABLE_BLUETOOTH,
|
|
TOGGLE_APPLET,
|
|
TOGGLE_AUTOSHOW_APPLET,
|
|
SET_RECENTS,
|
|
ROTATE,
|
|
ALIGN_JOYSTICK,
|
|
LAYOUT,
|
|
TOGGLE_BATTERY_ICON,
|
|
TOGGLE_NOTIFICATIONS,
|
|
TOGGLE_INVERT_COLOR,
|
|
TOGGLE_12H_CLOCK,
|
|
};
|
|
|
|
} // namespace NicheGraphics::InkHUD
|
|
|
|
#endif |