3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-04-30 18:56:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.138

Browse source 
* fix ePaper not functional #1722
This commit is contained in:
Lukas Pusch 2024-08-15 14:53:52 +02:00
parent 8f12bfed8e
commit 01285f0cb7
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGES.md
View file

@ -1,5 +1,8 @@
# Development Changes # Development Changes
## 0.8.138 - 2024-08-15
* fix ePaper not functional #1722
## 0.8.137 - 2024-08-13 ## 0.8.137 - 2024-08-13
* fix storage of timezone and region #1723 * fix storage of timezone and region #1723

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 137 #define VERSION_PATCH 138
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {
uint8_t ch; uint8_t ch;

3
src/network/AhoyEthernet.h
View file

@ -22,6 +22,9 @@ class AhoyEthernet : public AhoyWifi {
}; };
public: public:
AhoyEthernet()
: mMode (Mode::WIRELESS) {}
virtual void begin() override { virtual void begin() override {
mMode = Mode::WIRELESS; mMode = Mode::WIRELESS;
mAp.enable(); mAp.enable();

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

@ -45,7 +45,7 @@ class Display {
case DISP_TYPE_T4_SSD1306_128X32: mMono = new DisplayMono128X32(); break; // SSD1306_128X32 (0.91") case DISP_TYPE_T4_SSD1306_128X32: mMono = new DisplayMono128X32(); break; // SSD1306_128X32 (0.91")
case DISP_TYPE_T5_SSD1306_64X48: mMono = new DisplayMono64X48(); break; // SSD1306_64X48 (0.66" - Wemos OLED Shield) case DISP_TYPE_T5_SSD1306_64X48: mMono = new DisplayMono64X48(); break; // SSD1306_64X48 (0.66" - Wemos OLED Shield)
case DISP_TYPE_T6_SSD1309_128X64: mMono = new DisplayMono128X64(); break; // SSD1309_128X64 (2.42") case DISP_TYPE_T6_SSD1309_128X64: mMono = new DisplayMono128X64(); break; // SSD1309_128X64 (2.42")
#if defined(ESP32) && !defined(ETHERNET) #if defined(ESP32)
case DISP_TYPE_T10_EPAPER: case DISP_TYPE_T10_EPAPER:
mMono = NULL; // ePaper does not use this mMono = NULL; // ePaper does not use this
mRefreshCycle = 0; mRefreshCycle = 0;
@ -73,7 +73,7 @@ class Display {
} }
void loop() { void loop() {
#if defined(ESP32) && !defined(ETHERNET) #if defined(ESP32)
if ((nullptr != mCfg) && (DISP_TYPE_T10_EPAPER == mCfg->type)) { if ((nullptr != mCfg) && (DISP_TYPE_T10_EPAPER == mCfg->type)) {
mEpaper.refreshLoop(); mEpaper.refreshLoop();
} }
@ -96,7 +96,7 @@ class Display {
mLoopCnt = 0; mLoopCnt = 0;
} }
} }
#if defined(ESP32) && !defined(ETHERNET) #if defined(ESP32)
else if (DISP_TYPE_T10_EPAPER == mCfg->type) { else if (DISP_TYPE_T10_EPAPER == mCfg->type) {
// maintain ePaper at least every 15 seconds // maintain ePaper at least every 15 seconds
if (mNewPayload || (((++mLoopCnt) % 15) == 0)) { if (mNewPayload || (((++mLoopCnt) % 15) == 0)) {
@ -193,7 +193,7 @@ class Display {
if (mMono ) { if (mMono ) {
mMono->disp(); mMono->disp();
} }
#if defined(ESP32) && !defined(ETHERNET) #if defined(ESP32)
else if (DISP_TYPE_T10_EPAPER == mCfg->type) { else if (DISP_TYPE_T10_EPAPER == mCfg->type) {
mEpaper.loop((totalPower), totalYieldDay, totalYieldTotal, nrprod); mEpaper.loop((totalPower), totalYieldDay, totalYieldTotal, nrprod);
mRefreshCycle++; mRefreshCycle++;
@ -254,7 +254,7 @@ class Display {
RADIO *mHmsRadio = nullptr; RADIO *mHmsRadio = nullptr;
uint16_t mRefreshCycle = 0; uint16_t mRefreshCycle = 0;
#if defined(ESP32) && !defined(ETHERNET) #if defined(ESP32)
DisplayEPaper mEpaper; DisplayEPaper mEpaper;
#endif #endif
DisplayMono *mMono = nullptr; DisplayMono *mMono = nullptr;