Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/core/display.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "display.h"
#include "core/wifi/webInterface.h" // for server
#include "core/wifi/wg.h" //for isConnectedWireguard to print wireguard lock
#include "led_control.h" // for setLedState
#include "mykeyboard.h"
#include "settings.h" //for timeStr
#include "utils.h"
Expand Down Expand Up @@ -104,6 +105,7 @@ void setTftDisplay(int x, int y, uint16_t fc, int size, uint16_t bg) {
void turnOffDisplay() { setBrightness(0, false); }

bool wakeUpScreen() {
setLedState(true);
previousMillis = millis();
if (isScreenOff) {
isScreenOff = false;
Expand Down
11 changes: 11 additions & 0 deletions src/core/led_control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ void ledEffectTask(void *pvParameters) {
}

void beginLed() {
log_i("Begin LED");
#ifdef RGB_LED_CLK
FastLED.addLeds<LED_TYPE, RGB_LED, RGB_LED_CLK, LED_ORDER>(leds, LED_COUNT);
#else
Expand Down Expand Up @@ -687,4 +688,14 @@ void setLedBrightnessConfig() {
loopOptions(options, idx);
setLedBrightness(bruceConfig.ledBright);
}

void setLedState(bool state) {
if (state) {
ledSetup();
} else {
ledEffects(false);
fill_solid(leds, LED_COUNT, CRGB::Black);
FastLED.show();
}
}
#endif
1 change: 1 addition & 0 deletions src/core/led_control.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ void ledEffects(bool enable);
void ledPreviewMode(bool enable);
void setLedBrightness(int value);
void setLedBrightnessConfig();
void setLedState(bool state);

#else
inline void blinkLed(int blinkTime = 50) {};
Expand Down
6 changes: 2 additions & 4 deletions src/core/powerSave.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "powerSave.h"
#include "display.h"
#include "led_control.h"
#include "settings.h"

/* Check if it's time to put the device to sleep */
Expand All @@ -23,6 +24,7 @@ void checkPowerSaveTime() {
if (elapsed >= dimmerSetMs && !dimmer && !isSleeping) {
dimmer = true;
setBrightness(startDimmerBright, false);
setLedState(false);
} else if (elapsed >= (dimmerSetMs + SCREEN_OFF_DELAY) && !isScreenOff && !isSleeping) {
isScreenOff = true;
fadeOutScreen(startDimmerBright);
Expand All @@ -37,10 +39,8 @@ void sleepModeOn() {

fadeOutScreen(startDimmerBright);


panelSleep(true); // power down screen


disableCore0WDT();
disableCore1WDT();
disableLoopWDT();
Expand All @@ -51,10 +51,8 @@ void sleepModeOff() {
isSleeping = false;
setCpuFrequencyMhz(240);


panelSleep(false); // wake the screen back up


getBrightness();
enableCore0WDT();
enableCore1WDT();
Expand Down