Browse Source
Merge branch 'lumapu:development03' into development03
pull/776/head
rejoe2
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/defines.h
-
src/plugins/Display/Display.h
|
|
|
@ -13,7 +13,7 @@ |
|
|
|
//-------------------------------------
|
|
|
|
#define VERSION_MAJOR 0 |
|
|
|
#define VERSION_MINOR 5 |
|
|
|
#define VERSION_PATCH 100 |
|
|
|
#define VERSION_PATCH 101 |
|
|
|
|
|
|
|
//-------------------------------------
|
|
|
|
typedef struct { |
|
|
|
|
|
|
|
@ -25,7 +25,7 @@ class Display { |
|
|
|
if (mCfg->type == 0) |
|
|
|
return; |
|
|
|
|
|
|
|
if ((1 < mCfg->type) && (mCfg->type < 10)) { |
|
|
|
if ((0 < mCfg->type) && (mCfg->type < 10)) { |
|
|
|
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); |
|
|
|
} else if (mCfg->type >= 10) { |
|
|
|
@ -79,7 +79,7 @@ class Display { |
|
|
|
totalYieldTotal += iv->getChannelFieldValue(CH0, FLD_YT, rec); |
|
|
|
} |
|
|
|
|
|
|
|
if ((1 < mCfg->type) && (mCfg->type < 10)) { |
|
|
|
if ((0 < mCfg->type) && (mCfg->type < 10)) { |
|
|
|
mMono.disp(totalPower, totalYieldDay, totalYieldTotal, isprod); |
|
|
|
} else if (mCfg->type >= 10) { |
|
|
|
#if defined(ESP32) |
|
|
|
|
