mirror of
https://github.com/meshtastic/firmware.git
synced 2026-02-06 17:11:52 +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.
20 lines
540 B
C++
20 lines
540 B
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
#include "./BasicExampleApplet.h"
|
|
|
|
using namespace NicheGraphics;
|
|
|
|
// All drawing happens here
|
|
// Our basic example doesn't do anything useful. It just passively prints some text.
|
|
void InkHUD::BasicExampleApplet::onRender()
|
|
{
|
|
printAt(0, 0, "Hello, World!");
|
|
|
|
// If text might contain "special characters", is needs parsing first
|
|
// This applies to data such as text-messages and and node names
|
|
|
|
// std::string greeting = parse("Grüezi mitenand!");
|
|
// printAt(0, 0, greeting);
|
|
}
|
|
|
|
#endif |