patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move display pin assignment to main function

Browse Source
This commit is contained in:
Thomas Basler 2023-01-19 20:12:16 +01:00
parent 592dd73fca
commit bb3e12814d
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/Display_Graphic.h
View File

@ -3,12 +3,19 @@
#include <U8g2lib.h> #include <U8g2lib.h>
enum DisplayType_t {
None,
PCD8544,
SSD1306,
SH1106,
};
class DisplayGraphicClass { class DisplayGraphicClass {
public: public:
DisplayGraphicClass(); DisplayGraphicClass();
~DisplayGraphicClass(); ~DisplayGraphicClass();
void init(uint8_t type); void init(DisplayType_t type, uint8_t data, uint8_t clk, uint8_t cs, uint8_t reset);
void loop(); void loop();
bool dispPowerSafe = true; bool dispPowerSafe = true;
@ -20,8 +27,8 @@ private:
U8G2* _display; U8G2* _display;
DisplayType_t _display_type = DisplayType_t::None;
uint8_t _mExtra; uint8_t _mExtra;
uint8_t _display_type = 0;
uint16_t _dispY = 0; uint16_t _dispY = 0;
uint16_t _period = 1000; uint16_t _period = 1000;
uint16_t _interval = 60000; // interval at which to power save (milliseconds) uint16_t _interval = 60000; // interval at which to power save (milliseconds)

23
src/Display_Graphic.cpp
View File

@ -30,29 +30,26 @@ static uint8_t bmp_arrow[] PROGMEM = {
B00011110, B00001110, B00000110, B00000000, B00000000, B00000000, B00000000 B00011110, B00001110, B00000110, B00000000, B00000000, B00000000, B00000000
}; };
std::map<int, std::function<U8G2*()>> display_types = { std::map<DisplayType_t, std::function<U8G2*(uint8_t, uint8_t, uint8_t, uint8_t)>> display_types = {
{ 0, []() { return new U8G2_PCD8544_84X48_F_4W_HW_SPI(U8G2_R0, /*cs*/ 5, /*dc*/ 4, /*reset*/ 16); } }, { DisplayType_t::PCD8544, [](uint8_t reset, uint8_t clock, uint8_t data, uint8_t cs) { return new U8G2_PCD8544_84X48_F_4W_HW_SPI(U8G2_R0, cs, data, reset); } },
{ 1, []() { return new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, /*reset*/ U8X8_PIN_NONE, /*clock*/ SCL, /*data*/ SDA); } }, { DisplayType_t::SSD1306, [](uint8_t reset, uint8_t clock, uint8_t data, uint8_t cs) { return new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, reset, clock, data); } },
{ 2, []() { return new U8G2_SH1106_128X64_NONAME_F_HW_I2C(U8G2_R0, /*reset*/ U8X8_PIN_NONE, /*clock*/ SCL, /*data*/ SDA); } }, { DisplayType_t::SH1106, [](uint8_t reset, uint8_t clock, uint8_t data, uint8_t cs) { return new U8G2_SH1106_128X64_NONAME_F_HW_I2C(U8G2_R0, reset, clock, data); } },
}; };
DisplayGraphicClass::DisplayGraphicClass() DisplayGraphicClass::DisplayGraphicClass()
{ {}
init(_display_type);
}
DisplayGraphicClass::~DisplayGraphicClass() DisplayGraphicClass::~DisplayGraphicClass()
{ {
delete _display; delete _display;
} }
void DisplayGraphicClass::init(uint8_t type) void DisplayGraphicClass::init(DisplayType_t type, uint8_t data, uint8_t clk, uint8_t cs, uint8_t reset)
{ {
_display_type = type; _display_type = type;
int const_type = type - 1; if (_display_type > DisplayType_t::None) {
if (const_type >= 0) { auto constructor = display_types[_display_type];
auto constructor = display_types[const_type]; _display = constructor(reset, clk, data, cs);
_display = constructor();
_display->begin(); _display->begin();
} }
} }
@ -108,7 +105,7 @@ void DisplayGraphicClass::printText(const char* text, uint8_t line)
void DisplayGraphicClass::loop() void DisplayGraphicClass::loop()
{ {
if (_display_type == 0) { if (_display_type == DisplayType_t::None) {
return; return;
} }

2
src/main.cpp
View File

@ -93,7 +93,7 @@ void setup()
// Initialize Display // Initialize Display
MessageOutput.print(F("Initialize Display... ")); MessageOutput.print(F("Initialize Display... "));
Display.init(3); // 1 Nokia 5110, 2 for SSD1306, 3 for for SH1106 ... Display.init(DisplayType_t::SSD1306, SDA, SCL, 255, 255);
MessageOutput.println(F("done")); MessageOutput.println(F("done"));
// Check for default DTU serial // Check for default DTU serial