JorropoandGitHub
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.
40 lines
928 B
C++
40 lines
928 B
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
/*
|
|
|
|
A notification which might be displayed by the NotificationApplet
|
|
|
|
An instance of this class is offered to Applets via Applet::approveNotification, in case they want to veto the notification.
|
|
An Applet should veto a notification if it is already displaying the same info which the notification would convey.
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "configuration.h"
|
|
|
|
namespace NicheGraphics::InkHUD
|
|
{
|
|
|
|
class Notification
|
|
{
|
|
public:
|
|
enum Type : uint8_t { NOTIFICATION_MESSAGE_BROADCAST, NOTIFICATION_MESSAGE_DIRECT, NOTIFICATION_BATTERY } type;
|
|
|
|
uint32_t timestamp;
|
|
|
|
uint8_t getChannel() { return channel; }
|
|
uint32_t getSender() { return sender; }
|
|
uint8_t getBatteryPercentage() { return batteryPercentage; }
|
|
|
|
friend class NotificationApplet;
|
|
|
|
protected:
|
|
uint8_t channel;
|
|
uint32_t sender;
|
|
uint8_t batteryPercentage;
|
|
};
|
|
|
|
} // namespace NicheGraphics::InkHUD
|
|
|
|
#endif |