Browse Source

Merge ab58e2c4f8 into 78cbd7749d

pull/1745/merge
DanielR92 6 months ago
committed by GitHub
parent
commit
912eda8bfd
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      src/config/settings.h
  2. 4
      src/plugins/Display/Display_Mono.h
  3. 1
      src/web/RestApi.h

1
src/config/settings.h

@ -197,6 +197,7 @@ typedef struct {
typedef struct {
uint8_t type;
bool pwrSaveAtIvOffline;
bool motion;
uint8_t screenSaver;
uint8_t graph_ratio;
uint8_t graph_size;

4
src/plugins/Display/Display_Mono.h

@ -38,7 +38,7 @@ class DisplayMono {
if (mDisplayActive) {
if (!dispConditions) {
if (mDisplayTime.isTimeout()) { // switch display off after timeout
mDisplayActive = false;
mCfg->motion = mDisplayActive = false;
mDisplay->setPowerSave(true);
}
}
@ -47,7 +47,7 @@ class DisplayMono {
}
else {
if (dispConditions) {
mDisplayActive = true;
mCfg->motion = mDisplayActive = true;
mDisplayTime.reStartTimeMonitor(); // switch display on
mDisplay->setPowerSave(false);
}

1
src/web/RestApi.h

@ -924,6 +924,7 @@ class RestApi {
void getDisplay(JsonObject obj) {
obj[F("disp_typ")] = (uint8_t)mConfig->plugin.display.type;
obj[F("disp_motion")] = (boolean)mConfig->plugin.display.motion;
obj[F("disp_pwr")] = (bool)mConfig->plugin.display.pwrSaveAtIvOffline;
obj[F("disp_screensaver")] = (uint8_t)mConfig->plugin.display.screenSaver;
obj[F("disp_rot")] = (uint8_t)mConfig->plugin.display.rot;

Loading…
Cancel
Save