3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-08-03 16:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'lumapu:development03' into development03

Browse source
This commit is contained in:
rejoe2 2023-03-14 22:26:19 +01:00 • committed by GitHub
commit 49899e74b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/defines.h
View file

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

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

@ -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)