Browse Source

disabled epaper display for fusion with ethernet

pull/1262/head
lumapu 1 year ago
parent
commit
d5c45af63d
  1. 2
      src/defines.h
  2. 8
      src/plugins/Display/Display.h

2
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 MQTT_MAX_PACKET_SIZE 384
//#define PLUGIN_DISPLAY #define PLUGIN_DISPLAY
typedef struct { typedef struct {
uint32_t rxFail; uint32_t rxFail;

8
src/plugins/Display/Display.h

@ -42,7 +42,7 @@ class Display {
case 4: mMono = new DisplayMono128X32(); break; // SSD1306_128X32 (0.91") case 4: mMono = new DisplayMono128X32(); break; // SSD1306_128X32 (0.91")
case 5: mMono = new DisplayMono64X48(); break; // SSD1306_64X48 (0.66" - Wemos OLED Shield) case 5: mMono = new DisplayMono64X48(); break; // SSD1306_64X48 (0.66" - Wemos OLED Shield)
case 6: mMono = new DisplayMono128X64(); break; // SSD1309_128X64 (2.42") case 6: mMono = new DisplayMono128X64(); break; // SSD1309_128X64 (2.42")
#if defined(ESP32) #if defined(ESP32) && !defined(ETHERNET)
case 10: case 10:
mMono = NULL; // ePaper does not use this mMono = NULL; // ePaper does not use this
mRefreshCycle = 0; mRefreshCycle = 0;
@ -83,7 +83,7 @@ class Display {
mNewPayload = false; mNewPayload = false;
mLoopCnt = 0; mLoopCnt = 0;
} }
#if defined(ESP32) #if defined(ESP32) && !defined(ETHERNET)
mEpaper.tickerSecond(); mEpaper.tickerSecond();
#endif #endif
} }
@ -168,7 +168,7 @@ class Display {
if (mMono ) { if (mMono ) {
mMono->disp(); mMono->disp();
} }
#if defined(ESP32) #if defined(ESP32) && !defined(ETHERNET)
else if (mCfg->type == 10) { else if (mCfg->type == 10) {
mEpaper.loop((totalPower), totalYieldDay, totalYieldTotal, nrprod); mEpaper.loop((totalPower), totalYieldDay, totalYieldTotal, nrprod);
mRefreshCycle++; mRefreshCycle++;
@ -228,7 +228,7 @@ class Display {
RADIO *mHmsRadio; RADIO *mHmsRadio;
uint16_t mRefreshCycle; uint16_t mRefreshCycle;
#if defined(ESP32) #if defined(ESP32) && !defined(ETHERNET)
DisplayEPaper mEpaper; DisplayEPaper mEpaper;
#endif #endif
DisplayMono *mMono; DisplayMono *mMono;

Loading…
Cancel
Save