mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 23:07:34 +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.
50 lines
1.0 KiB
C++
50 lines
1.0 KiB
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
/*
|
|
|
|
System Applet for manually aligning the joystick with the screen
|
|
|
|
should be run at startup if the joystick is enabled
|
|
and not aligned to the screen
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "configuration.h"
|
|
|
|
#include "graphics/niche/InkHUD/SystemApplet.h"
|
|
|
|
namespace NicheGraphics::InkHUD
|
|
{
|
|
|
|
class AlignStickApplet : public SystemApplet
|
|
{
|
|
public:
|
|
AlignStickApplet();
|
|
|
|
void onRender() override;
|
|
void onForeground() override;
|
|
void onBackground() override;
|
|
void onButtonLongPress() override;
|
|
void onExitLong() override;
|
|
void onNavUp() override;
|
|
void onNavDown() override;
|
|
void onNavLeft() override;
|
|
void onNavRight() override;
|
|
|
|
protected:
|
|
enum Direction {
|
|
UP,
|
|
DOWN,
|
|
LEFT,
|
|
RIGHT,
|
|
};
|
|
|
|
void drawStick(uint16_t centerX, uint16_t centerY, uint16_t width);
|
|
void drawDirection(uint16_t pointX, uint16_t pointY, Direction direction, uint16_t size, uint16_t chamfer, Color color);
|
|
};
|
|
|
|
} // namespace NicheGraphics::InkHUD
|
|
|
|
#endif |