From dfa778024b2d1dd03692810ea76aa16d88bfde9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20K=C3=BChne?= Date: Wed, 12 Feb 2025 21:38:05 +0100 Subject: [PATCH] Integrate OLED display in Power management --- src/display/Display.cpp | 3 +++ src/display/Display.h | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/display/Display.cpp b/src/display/Display.cpp index 9e687d5..1e67541 100644 --- a/src/display/Display.cpp +++ b/src/display/Display.cpp @@ -14,6 +14,9 @@ void Display::begin(void){ + Power::waitForCurrentAllowance( + PowerParameters::PowerConsumers::DISPLAY_OLED, PowerParameters::CurrentConsumptions::CURRENT_DISPLAY + ,DISPLAY_MAX_EXECUTION_DELAY_MS, NULL); //set Mux Ratio sendDisplayCMD(muxRatio); sendDisplayCMD(0x3f); diff --git a/src/display/Display.h b/src/display/Display.h index 15774a4..c4bc1d7 100644 --- a/src/display/Display.h +++ b/src/display/Display.h @@ -11,9 +11,13 @@ #ifndef Display_h #define Display_h -#include -#include +#include "../power/Power.h" #include "DisplayCMDs.h" +#include +#include + +// This execution delay is basically only used for initial activation, so it can be set to a higher value +#define DISPLAY_MAX_EXECUTION_DELAY_MS 100 class Display{ protected: