From d5c45af63d6f17d4dd51a7297f070c5401b9703e Mon Sep 17 00:00:00 2001 From: lumapu Date: Sat, 9 Dec 2023 00:42:36 +0100 Subject: [PATCH] disabled epaper display for fusion with ethernet --- src/defines.h | 2 +- src/plugins/Display/Display.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/defines.h b/src/defines.h index ef559980..80b94687 100644 --- a/src/defines.h +++ b/src/defines.h @@ -94,7 +94,7 @@ enum {MQTT_STATUS_OFFLINE = 0, MQTT_STATUS_PARTIAL, MQTT_STATUS_ONLINE}; #define MQTT_MAX_PACKET_SIZE 384 -//#define PLUGIN_DISPLAY +#define PLUGIN_DISPLAY typedef struct { uint32_t rxFail; diff --git a/src/plugins/Display/Display.h b/src/plugins/Display/Display.h index c6c6f148..8092ad2b 100644 --- a/src/plugins/Display/Display.h +++ b/src/plugins/Display/Display.h @@ -42,7 +42,7 @@ class Display { case 4: mMono = new DisplayMono128X32(); break; // SSD1306_128X32 (0.91") case 5: mMono = new DisplayMono64X48(); break; // SSD1306_64X48 (0.66" - Wemos OLED Shield) case 6: mMono = new DisplayMono128X64(); break; // SSD1309_128X64 (2.42") -#if defined(ESP32) +#if defined(ESP32) && !defined(ETHERNET) case 10: mMono = NULL; // ePaper does not use this mRefreshCycle = 0; @@ -83,7 +83,7 @@ class Display { mNewPayload = false; mLoopCnt = 0; } - #if defined(ESP32) + #if defined(ESP32) && !defined(ETHERNET) mEpaper.tickerSecond(); #endif } @@ -168,7 +168,7 @@ class Display { if (mMono ) { mMono->disp(); } -#if defined(ESP32) +#if defined(ESP32) && !defined(ETHERNET) else if (mCfg->type == 10) { mEpaper.loop((totalPower), totalYieldDay, totalYieldTotal, nrprod); mRefreshCycle++; @@ -228,7 +228,7 @@ class Display { RADIO *mHmsRadio; uint16_t mRefreshCycle; -#if defined(ESP32) +#if defined(ESP32) && !defined(ETHERNET) DisplayEPaper mEpaper; #endif DisplayMono *mMono;