Jorropo
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.
42 lines
952 B
C++
42 lines
952 B
C++
/*
|
|
|
|
E-Ink display driver
|
|
- ZJY122250_0213BAAMFGN
|
|
- Manufacturer: Zhongjingyuan
|
|
- Size: 2.13 inch
|
|
- Resolution: 250px x 122px
|
|
- Flex connector marking (not a unique identifier): FPC-A002
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
|
|
|
|
#include "configuration.h"
|
|
|
|
#include "./SSD16XX.h"
|
|
|
|
namespace NicheGraphics::Drivers
|
|
{
|
|
class ZJY122250_0213BAAMFGN : public SSD16XX
|
|
{
|
|
// Display properties
|
|
private:
|
|
static constexpr uint32_t width = 122;
|
|
static constexpr uint32_t height = 250;
|
|
static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
|
|
|
|
public:
|
|
ZJY122250_0213BAAMFGN() : SSD16XX(width, height, supported) {}
|
|
|
|
protected:
|
|
virtual void configScanning() override;
|
|
virtual void configWaveform() override;
|
|
virtual void configUpdateSequence() override;
|
|
void detachFromUpdate() override;
|
|
};
|
|
|
|
} // namespace NicheGraphics::Drivers
|
|
|
|
#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
|