3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-08-06 09:58:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.7.13

Browse source 
* merged display PR #1027
This commit is contained in:
lumapu 2023-07-19 22:35:36 +02:00
parent d2eb1ef162
commit 48594c565a
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CHANGES.md
View file

@ -1,5 +1,7 @@
# Development Changes # Development Changes
## 0.7.13 - 2023-07-19
* merged display PR #1027
## 0.7.12 - 2023-07-09 ## 0.7.12 - 2023-07-09
* added inverter status - state-machine #1016 * added inverter status - state-machine #1016

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 7 #define VERSION_MINOR 7
#define VERSION_PATCH 12 #define VERSION_PATCH 13
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

9
src/plugins/Display/Display.h
View file

@ -16,7 +16,9 @@
template <class HMSYSTEM> template <class HMSYSTEM>
class Display { class Display {
public: public:
Display() {} Display() {
mMono = NULL;
}
void setup(display_t *cfg, HMSYSTEM *sys, uint32_t *utcTs, const char *version) { void setup(display_t *cfg, HMSYSTEM *sys, uint32_t *utcTs, const char *version) {
mCfg = cfg; mCfg = cfg;
@ -45,8 +47,7 @@ class Display {
default: mMono = NULL; break; default: mMono = NULL; break;
} }
if(mMono) if(mMono) {
{
mMono->config(mCfg->pwrSaveAtIvOffline, mCfg->pxShift, mCfg->contrast); 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); 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) #if defined(ESP32)
DisplayEPaper mEpaper; DisplayEPaper mEpaper;
#endif #endif
DisplayMono *mMono = NULL; //default !!! DisplayMono *mMono;
}; };
#endif /*__DISPLAY__*/ #endif /*__DISPLAY__*/