sysclk: make display change togglable and increase battery life in sleep mode

Source/sys-clk/common/include/sysclk/clock_manager.h

@@ -43,9 +43,8 @@ typedef struct
     uint32_t PartLoad[SysClkPartLoad_EnumMax];
     uint32_t voltages[HocClkVoltage_EnumMax];
     uint32_t perfConfId;
+    u8 maxDisplayFreq;
     u8 fps;
-    u8 lcdFreq;
-    u8 fanLevel;
 } SysClkContext;
 
 typedef struct

Source/sys-clk/common/include/sysclk/config.h

@@ -62,6 +62,8 @@ typedef enum {
 
     HorizonOCConfigValue_BatteryChargeCurrent,
 
+    HorizonOCConfigValue_OverwriteRefreshRate,
+
     KipConfigValue_custRev,
     KipConfigValue_mtcConf,
     KipConfigValue_hpMode,
@@ -230,6 +232,9 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
         case HorizonOCConfigValue_BatteryChargeCurrent:
             return pretty ? "Battery Charge Current" : "bat_charge_current";
 
+        case HorizonOCConfigValue_OverwriteRefreshRate:
+            return pretty ? "Display Refresh Rate Changing" : "drr_changing";
+
         // KIP config values
         case KipConfigValue_custRev:
             return pretty ? "Custom Revision" : "kip_cust_rev";
@@ -425,6 +430,7 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
         case HocClkConfigValue_LiteTDPLimit:
             return 6400ULL;
         case HorizonOCConfigValue_BatteryChargeCurrent:
+        case HorizonOCConfigValue_OverwriteRefreshRate:
             return 0ULL;
         default:
             return 0ULL;
@@ -458,6 +464,7 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
         case HocClkConfigValue_EnforceBoardLimit:
         case HocClkConfigValue_KipEditing:
         case HocClkConfigValue_KipFileName:
+        case HorizonOCConfigValue_OverwriteRefreshRate:
             return (input & 0x1) == input;
         
         case KipConfigValue_custRev:

Source/sys-clk/overlay/src/ui/gui/app_profile_gui.cpp

@@ -29,7 +29,6 @@
 
 #include "../format.h"
 #include "fatal_gui.h"
-
 AppProfileGui::AppProfileGui(std::uint64_t applicationId, SysClkTitleProfileList* profileList)
 {
     this->applicationId = applicationId;
@@ -272,7 +271,10 @@ void AppProfileGui::addProfileUI(SysClkProfile profile)
     this->addModuleListItem(profile, SysClkModule_CPU);
     this->addModuleListItem(profile, SysClkModule_GPU);
     this->addModuleListItem(profile, SysClkModule_MEM);
-    this->addModuleListItemValue(profile, HorizonOCModule_Display, "Display", 40, 72, 5, " Hz", 1, 0);
+    if(profile != SysClkProfile_Docked)
+        this->addModuleListItemValue(profile, HorizonOCModule_Display, "Display", 40, 72, 1, " Hz", 1, 0);
+    else
+        this->addModuleListItemValue(profile, HorizonOCModule_Display, "Display", 50, 120, 5, " Hz", 1, 0);
     this->addModuleListItemToggle(profile, HorizonOCModule_Governor);
 }
 

Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp

@@ -154,6 +154,10 @@ void BaseMenuGui::preDraw(tsl::gfx::Renderer* renderer) {
     renderer->drawString(displayStrings[20], false, dataPositions[0], y, SMALL_TEXT_SIZE, tempColors[HorizonOCThermalSensor_Battery]);  // Battery
     renderer->drawString(displayStrings[22], false, dataPositions[1], y, SMALL_TEXT_SIZE, tempColors[HorizonOCThermalSensor_PMIC]);  // PMIC
 
+    renderer->drawString(labels[13], false, positions[7], y, SMALL_TEXT_SIZE, tsl::sectionTextColor); // disp label
+
+    renderer->drawString(displayStrings[25], false, dataPositions[2], y, SMALL_TEXT_SIZE, tsl::infoTextColor);   // disp freq
+
     y+=20;
 
     renderer->drawString(displayStrings[21], false, dataPositions[0], y, SMALL_TEXT_SIZE, tsl::infoTextColor);   // Bat voltage
@@ -163,9 +167,8 @@ void BaseMenuGui::preDraw(tsl::gfx::Renderer* renderer) {
 
     renderer->drawString(displayStrings[24], false, dataPositions[1], y, SMALL_TEXT_SIZE, tsl::infoTextColor);   // fan speed
 
-    renderer->drawString(labels[13], false, positions[7], y, SMALL_TEXT_SIZE, tsl::sectionTextColor); // fan label
+    renderer->drawString(displayStrings[26], false, dataPositions[2], y, SMALL_TEXT_SIZE, tsl::infoTextColor);   // disp volt
 
-    renderer->drawString(displayStrings[25], false, dataPositions[2], y, SMALL_TEXT_SIZE, tsl::infoTextColor);   // fan speed
 
 }
 
@@ -186,11 +189,13 @@ void BaseMenuGui::refresh()
     }
 
     // === SYSCLK CONTEXT UPDATE ===
-    const Result rc = sysclkIpcGetCurrentContext(this->context);
+    Result rc = sysclkIpcGetCurrentContext(this->context);
     if (R_FAILED(rc)) [[unlikely]] {
         FatalGui::openWithResultCode("sysclkIpcGetCurrentContext", rc);
         return;
     }
+    sysclkIpcGetConfigValues(this->configList);
+    // dockedHighestAllowedRefreshRate = this->context->maxDisplayFreq;
 
     // === FORMAT ALL DISPLAY STRINGS (once per second) ===
     // App ID (hex conversion)
@@ -274,6 +279,8 @@ void BaseMenuGui::refresh()
 
     sprintf(displayStrings[25], "%u Hz", context->realFreqs[HorizonOCModule_Display]);
 
+    sprintf(displayStrings[26], "%u.%u mV", context->voltages[HocClkVoltage_Display] / 1000U, context->voltages[HocClkVoltage_Display] % 1000U);
+
 }
 
 tsl::elm::Element* BaseMenuGui::baseUI()

Source/sys-clk/overlay/src/ui/gui/base_menu_gui.h

@@ -33,10 +33,12 @@
 class BaseMenuGui : public BaseGui
 {
     protected:
-        SysClkContext* context;
-        std::uint64_t lastContextUpdate;
 
     public:
+        // u8 dockedHighestAllowedRefreshRate = 60;
+        SysClkContext* context;
+        std::uint64_t lastContextUpdate;
+        SysClkConfigValueList* configList;
         bool g_hardwareModelCached = false;
         bool g_isMariko = false;
 

Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp

@@ -398,6 +398,8 @@ void MiscGui::listUI()
         chargerCurrents,
         false
     );
+    addConfigToggle(HorizonOCConfigValue_OverwriteRefreshRate, nullptr);
+
 }
 
 
@@ -1076,7 +1078,7 @@ void MiscGui::refresh() {
     if (this->context && ++frameCounter >= 60) {
         frameCounter = 0;
 
-        sysclkIpcGetConfigValues(this->configList);
+        // sysclkIpcGetConfigValues(this->configList);
 
         updateConfigToggles();
 

Source/sys-clk/overlay/src/ui/gui/misc_gui.h

@@ -19,7 +19,6 @@ protected:
     std::map<SysClkConfigValue, tsl::elm::ListItem*> configButtons;
     std::map<SysClkConfigValue, ValueRange> configRanges;
     std::map<SysClkConfigValue, std::vector<NamedValue>> configNamedValues;
-    SysClkConfigValueList* configList;
     std::map<SysClkConfigValue, tsl::elm::ToggleListItem*> configToggles;
     std::map<SysClkConfigValue, std::tuple<tsl::elm::TrackBar*, tsl::elm::ListItem*, std::vector<uint64_t>>> configTrackbars;
     

Source/sys-clk/sysmodule/src/board.cpp

@@ -572,6 +572,10 @@ void Board::ResetToStockDisplay() {
     DisplayRefresh_SetRate(60);
 }
 
+u8 Board::GetHighestDockedDisplayRate() {
+    return DisplayRefresh_GetDockedHighestAllowed();
+}
+
 std::uint32_t Board::GetTemperatureMilli(SysClkThermalSensor sensor)
 {
     std::int32_t millis = 0;

Source/sys-clk/sysmodule/src/board.h

@@ -44,7 +44,7 @@ class Board
     static void ResetToStockMem();
     static void ResetToStockGpu();
     static void ResetToStockDisplay();
-
+    static u8 GetHighestDockedDisplayRate();
     static SysClkProfile GetProfile();
     static void SetHz(SysClkModule module, std::uint32_t hz);
     static std::uint32_t GetHz(SysClkModule module);

Source/sys-clk/sysmodule/src/clock_manager.cpp

@@ -440,7 +440,7 @@ void ClockManager::Tick()
                 isGovernorEnabled = newGovernorState;
             }
 
-            if(module == HorizonOCModule_Display) {
+            if(module == HorizonOCModule_Display && this->config->GetConfigValue(HorizonOCConfigValue_OverwriteRefreshRate)) {
                 if(targetHz)
                     Board::SetHz(HorizonOCModule_Display, targetHz);
                 else
@@ -487,7 +487,10 @@ void ClockManager::ResetToStockClocks() {
 
 void ClockManager::WaitForNextTick()
 {
-    svcSleepThread(this->GetConfig()->GetConfigValue(SysClkConfigValue_PollingIntervalMs) * 1000000ULL);
+    if(!(Board::GetHz(SysClkModule_MEM) < 665000000))
+        svcSleepThread(this->GetConfig()->GetConfigValue(SysClkConfigValue_PollingIntervalMs) * 1000000ULL);
+    else 
+        svcSleepThread(5000 * 1000000ULL); // 5 seconds in sleep mode
 }
 
 bool ClockManager::RefreshContext()
@@ -623,6 +626,11 @@ bool ClockManager::RefreshContext()
         FileUtils::WriteContextToCsv(this->context);
     }
 
+    if(this->context->profile == SysClkProfile_Docked)
+        this->context->maxDisplayFreq = Board::GetHighestDockedDisplayRate();
+    else
+        this->context->maxDisplayFreq = 60;
+
     return hasChanged;
 }