diff --git a/src/CHANGES.md b/src/CHANGES.md index f142a012..6c59822e 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -10,6 +10,8 @@ * 2.42" display (SSD1309) integration PR #1139 * update user manual PR #1121 * add / rename alarm codes PR #1118 +* revert default pin ESP32 for NRF23-CE #1132 +* luminance of display can be changed during runtime #1106 ## 0.7.45 - 2023-08-29 * change ePaper text to symbols PR #1131 diff --git a/src/config/config.h b/src/config/config.h index 397ad15a..54686ab8 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -68,7 +68,7 @@ #define DEF_NRF_CS_PIN 5 #endif #ifndef DEF_NRF_CE_PIN - #define DEF_NRF_CE_PIN 17 + #define DEF_NRF_CE_PIN 4 #endif #ifndef DEF_NRF_IRQ_PIN #define DEF_NRF_IRQ_PIN 16 diff --git a/src/plugins/Display/Display.h b/src/plugins/Display/Display.h index 915a7475..36a7df46 100644 --- a/src/plugins/Display/Display.h +++ b/src/plugins/Display/Display.h @@ -59,7 +59,7 @@ class Display { void tickerSecond() { if (mMono != NULL) - mMono->loop(); + mMono->loop(mCfg->contrast); if (mNewPayload || (((++mLoopCnt) % 30) == 0)) { mNewPayload = false; diff --git a/src/plugins/Display/Display_Mono_128X32.h b/src/plugins/Display/Display_Mono_128X32.h index e9e09d28..5a6d6c7e 100644 --- a/src/plugins/Display/Display_Mono_128X32.h +++ b/src/plugins/Display/Display_Mono_128X32.h @@ -46,11 +46,16 @@ class DisplayMono128X32 : public DisplayMono { mLuminance = lum; } - void loop(void) { + void loop(uint8_t lum) { if (mEnPowerSafe) { if (mTimeout != 0) mTimeout--; } + + if(mLuminance != lum) { + mLuminance = lum; + mDisplay->setContrast(mLuminance); + } } void disp(float totalPower, float totalYieldDay, float totalYieldTotal, uint8_t isprod) { diff --git a/src/plugins/Display/Display_Mono_128X64.h b/src/plugins/Display/Display_Mono_128X64.h index b7d52868..438cb79e 100644 --- a/src/plugins/Display/Display_Mono_128X64.h +++ b/src/plugins/Display/Display_Mono_128X64.h @@ -54,11 +54,16 @@ class DisplayMono128X64 : public DisplayMono { mLuminance = lum; } - void loop(void) { + void loop(uint8_t lum) { if (mEnPowerSafe) { if (mTimeout != 0) mTimeout--; } + + if(mLuminance != lum) { + mLuminance = lum; + mDisplay->setContrast(mLuminance); + } } void disp(float totalPower, float totalYieldDay, float totalYieldTotal, uint8_t isprod) { diff --git a/src/plugins/Display/Display_Mono_64X48.h b/src/plugins/Display/Display_Mono_64X48.h index 67b38e44..ae074c33 100644 --- a/src/plugins/Display/Display_Mono_64X48.h +++ b/src/plugins/Display/Display_Mono_64X48.h @@ -47,11 +47,16 @@ class DisplayMono64X48 : public DisplayMono { mLuminance = lum; } - void loop(void) { + void loop(uint8_t lum) { if (mEnPowerSafe) { if (mTimeout != 0) mTimeout--; } + + if(mLuminance != lum) { + mLuminance = lum; + mDisplay->setContrast(mLuminance); + } } void disp(float totalPower, float totalYieldDay, float totalYieldTotal, uint8_t isprod) { diff --git a/src/plugins/Display/Display_Mono_84X48.h b/src/plugins/Display/Display_Mono_84X48.h index 9f7761dc..fff983bc 100644 --- a/src/plugins/Display/Display_Mono_84X48.h +++ b/src/plugins/Display/Display_Mono_84X48.h @@ -47,11 +47,16 @@ class DisplayMono84X48 : public DisplayMono { mLuminance = lum; } - void loop(void) { + void loop(uint8_t lum) { if (mEnPowerSafe) { if (mTimeout != 0) mTimeout--; } + + if(mLuminance != lum) { + mLuminance = lum; + mDisplay->setContrast(mLuminance); + } } void disp(float totalPower, float totalYieldDay, float totalYieldTotal, uint8_t isprod) {