mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-13 21:37:20 +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.
67 lines
2.7 KiB
C++
67 lines
2.7 KiB
C++
#pragma once
|
|
|
|
#include <OLEDDisplay.h>
|
|
#include <string>
|
|
|
|
namespace graphics
|
|
{
|
|
|
|
// =======================
|
|
// Shared UI Helpers
|
|
// =======================
|
|
|
|
#define textZeroLine 0
|
|
// Consistent Line Spacing - this is standard for all display and the fall-back spacing
|
|
#define textFirstLine (FONT_HEIGHT_SMALL - 1)
|
|
#define textSecondLine (textFirstLine + (FONT_HEIGHT_SMALL - 5))
|
|
#define textThirdLine (textSecondLine + (FONT_HEIGHT_SMALL - 5))
|
|
#define textFourthLine (textThirdLine + (FONT_HEIGHT_SMALL - 5))
|
|
#define textFifthLine (textFourthLine + (FONT_HEIGHT_SMALL - 5))
|
|
#define textSixthLine (textFifthLine + (FONT_HEIGHT_SMALL - 5))
|
|
|
|
// Consistent Line Spacing for devices like T114 and TEcho/ThinkNode M1 of devices
|
|
#define textFirstLine_medium (FONT_HEIGHT_SMALL + 1)
|
|
#define textSecondLine_medium (textFirstLine_medium + FONT_HEIGHT_SMALL)
|
|
#define textThirdLine_medium (textSecondLine_medium + FONT_HEIGHT_SMALL)
|
|
#define textFourthLine_medium (textThirdLine_medium + FONT_HEIGHT_SMALL)
|
|
#define textFifthLine_medium (textFourthLine_medium + FONT_HEIGHT_SMALL)
|
|
#define textSixthLine_medium (textFifthLine_medium + FONT_HEIGHT_SMALL)
|
|
|
|
// Consistent Line Spacing for devices like VisionMaster T190
|
|
#define textFirstLine_large (FONT_HEIGHT_SMALL + 1)
|
|
#define textSecondLine_large (textFirstLine_large + (FONT_HEIGHT_SMALL + 5))
|
|
#define textThirdLine_large (textSecondLine_large + (FONT_HEIGHT_SMALL + 5))
|
|
#define textFourthLine_large (textThirdLine_large + (FONT_HEIGHT_SMALL + 5))
|
|
#define textFifthLine_large (textFourthLine_large + (FONT_HEIGHT_SMALL + 5))
|
|
#define textSixthLine_large (textFifthLine_large + (FONT_HEIGHT_SMALL + 5))
|
|
|
|
// Quick screen access
|
|
#define SCREEN_WIDTH display->getWidth()
|
|
#define SCREEN_HEIGHT display->getHeight()
|
|
|
|
// Shared state (declare inside namespace)
|
|
extern bool hasUnreadMessage;
|
|
enum class ScreenResolution : uint8_t { UltraLow = 0, Low = 1, High = 2 };
|
|
extern ScreenResolution currentResolution;
|
|
ScreenResolution determineScreenResolution(int16_t screenheight, int16_t screenwidth);
|
|
|
|
void decomposeTime(uint32_t rtc_sec, int &hour, int &minute, int &second);
|
|
|
|
// Rounded highlight (used for inverted headers)
|
|
void drawRoundedHighlight(OLEDDisplay *display, int16_t x, int16_t y, int16_t w, int16_t h, int16_t r);
|
|
|
|
// Shared battery/time/mail header
|
|
void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *titleStr = "", bool force_no_invert = false,
|
|
bool show_date = false);
|
|
|
|
// Shared battery/time/mail header
|
|
void drawCommonFooter(OLEDDisplay *display, int16_t x, int16_t y);
|
|
|
|
const int *getTextPositions(OLEDDisplay *display);
|
|
|
|
bool isAllowedPunctuation(char c);
|
|
|
|
std::string sanitizeString(const std::string &input);
|
|
|
|
} // namespace graphics
|