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.
42 lines
1.0 KiB
C++
42 lines
1.0 KiB
C++
/*
|
|
|
|
E-Ink display driver
|
|
- DEPG0290BNS800
|
|
- Manufacturer: DKE
|
|
- Size: 2.9 inch
|
|
- Resolution: 128px x 296px
|
|
- Flex connector marking (not a unique identifier): FPC-7519 rev.b
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
|
|
|
|
#include "configuration.h"
|
|
|
|
#include "./SSD16XX.h"
|
|
|
|
namespace NicheGraphics::Drivers
|
|
{
|
|
class DEPG0290BNS800 : public SSD16XX
|
|
{
|
|
// Display properties
|
|
private:
|
|
static constexpr uint32_t width = 128;
|
|
static constexpr uint32_t height = 296;
|
|
static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
|
|
|
|
public:
|
|
DEPG0290BNS800() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte
|
|
|
|
protected:
|
|
void configVoltages() override;
|
|
void configWaveform() override;
|
|
void configUpdateSequence() override;
|
|
void detachFromUpdate() override;
|
|
void finalizeUpdate() override; // Only overriden for a slight optimization
|
|
};
|
|
|
|
} // namespace NicheGraphics::Drivers
|
|
#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
|