From 48594c565aa93b9946207ed8eda9456a88b2d0a6 Mon Sep 17 00:00:00 2001 From: lumapu Date: Wed, 19 Jul 2023 22:35:36 +0200 Subject: [PATCH] 0.7.13 * merged display PR #1027 --- src/CHANGES.md | 2 ++ src/defines.h | 2 +- src/plugins/Display/Display.h | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/CHANGES.md b/src/CHANGES.md index ca05d60e..affdc71e 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,7 @@ # Development Changes +## 0.7.13 - 2023-07-19 +* merged display PR #1027 ## 0.7.12 - 2023-07-09 * added inverter status - state-machine #1016 diff --git a/src/defines.h b/src/defines.h index 60fd78b2..4f4601cc 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 7 -#define VERSION_PATCH 12 +#define VERSION_PATCH 13 //------------------------------------- typedef struct { diff --git a/src/plugins/Display/Display.h b/src/plugins/Display/Display.h index 9849f03e..2340fd42 100644 --- a/src/plugins/Display/Display.h +++ b/src/plugins/Display/Display.h @@ -16,7 +16,9 @@ template class Display { public: - Display() {} + Display() { + mMono = NULL; + } void setup(display_t *cfg, HMSYSTEM *sys, uint32_t *utcTs, const char *version) { mCfg = cfg; @@ -45,8 +47,7 @@ class Display { default: mMono = NULL; break; } - if(mMono) - { + if(mMono) { mMono->config(mCfg->pwrSaveAtIvOffline, mCfg->pxShift, mCfg->contrast); mMono->init(mCfg->type, mCfg->rot, mCfg->disp_cs, mCfg->disp_dc, 0xff, mCfg->disp_clk, mCfg->disp_data, mUtcTs, mVersion); } @@ -127,7 +128,7 @@ class Display { #if defined(ESP32) DisplayEPaper mEpaper; #endif - DisplayMono *mMono = NULL; //default !!! + DisplayMono *mMono; }; #endif /*__DISPLAY__*/