change changeTo to swapTo

Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_common.hpp

@@ -48,6 +48,35 @@ namespace ams::ldr::hoc::pcv {
         u64 dvco_calibration_max;
     };
 
+    /*
+    struct CvbCpuDfllData {
+        u32 tune0_low;
+        u32 tune0_high;
+        u32 tune1_low;
+        u32 tune1_high;
+        u64 padding;
+        u64 dvco_calibration_max;
+    };
+
+    struct CpuCvbTable {
+        u64 socType;
+        CvbCpuDfllData dfllData;
+        u64 padding[3];
+        u64 unk;
+        u32 tune_high_min_millivolts;
+        u32 tune_high_margin_millivolts;
+        u32 vmin;
+        u32 padding_1[3];
+        u32 pll_min_millivolts;
+        u32 vmax;
+        u32 unkScale;
+        u32 speedoScale;
+        u32 voltageScale;
+        u32 zero;
+        cvb_entry_t cvb_entry[32];
+    };
+    */
+
     struct __attribute__((packed)) div_nmp {
         u8 divn_shift;
         u8 divn_width;

Source/hoc-clk/overlay/src/ui/gui/about_gui.cpp

@@ -233,6 +233,10 @@ void AboutGui::update()
     BaseMenuGui::update();
 }
 
+std::string AboutGui::getJumpToItemName() {
+    return "About";
+}
+
 void AboutGui::refresh()
 {
     BaseMenuGui::refresh();
@@ -321,6 +325,11 @@ class CreditsSubMenu : public AboutGui {
     public:
         CreditsSubMenu() { }
 
+        bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                          HidAnalogStickState rightJoyStick) override {
+            return false;
+        }
+
     protected:
         ImageElement* CatImage = NULL;
         HideableCategoryHeader* CatHeader = NULL;

Source/hoc-clk/overlay/src/ui/gui/about_gui.h

@@ -27,6 +27,7 @@ class AboutGui : public BaseMenuGui
 {
 protected:
     char strings[32][32];
+    std::string getJumpToItemName() override;
 
 public:
     AboutGui();

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

@@ -290,6 +290,11 @@ public:
     GovernorProfileSubMenuGui(uint64_t appId, HocClkTitleProfileList* pList, HocClkProfile prof)
         : applicationId(appId), profileList(pList), profile(prof) {}
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     void listUI() override {
         BaseMenuGui::refresh(); // get latest context
         if(!this->context)
@@ -445,8 +450,14 @@ void AppProfileGui::listUI()
     this->addProfileUI(HocClkProfile_HandheldChargingUSB);
 }
 
+std::string jumpItemString = "Edit App Profile";
+
 void AppProfileGui::changeTo(std::uint64_t applicationId)
 {
+    if (applicationId == HOCCLK_GLOBAL_PROFILE_TID) {
+        jumpItemString = "Edit Global Profile";
+    }
+
     HocClkTitleProfileList* profileList = new HocClkTitleProfileList;
     Result rc = hocclkIpcGetProfiles(applicationId, profileList);
     if(R_FAILED(rc))
@@ -456,7 +467,7 @@ void AppProfileGui::changeTo(std::uint64_t applicationId)
         return;
     }
 
-    tsl::changeTo<AppProfileGui>(applicationId, profileList);
+    tsl::swapTo<AppProfileGui>(applicationId, profileList);
 }
 
 void AppProfileGui::update()
@@ -474,3 +485,7 @@ void AppProfileGui::update()
         );
     }
 }
+
+std::string AppProfileGui::getJumpToItemName() {
+    return jumpItemString;
+}

Source/hoc-clk/overlay/src/ui/gui/app_profile_gui.h

@@ -32,6 +32,7 @@ class AppProfileGui : public BaseMenuGui {
     protected:
     std::uint64_t applicationId;
     HocClkTitleProfileList *profileList;
+    std::string getJumpToItemName() override;
     void openFreqChoiceGui(tsl::elm::ListItem *listItem, HocClkProfile profile, HocClkModule module);
     void addModuleListItem(HocClkProfile profile, HocClkModule module);
     void addModuleListItemToggle(HocClkProfile profile, HocClkModule module);

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

@@ -27,7 +27,7 @@
 #include "../format.h"
 #include "base_menu_gui.h"
 #include "fatal_gui.h"
-
+#include "main_gui.h"
 
 #define TOP_Y_OFFSET 15
 
@@ -362,3 +362,18 @@ tsl::elm::Element *BaseMenuGui::baseUI() {
 
     return list;
 }
+
+std::string BaseMenuGui::getJumpToItemName() {
+    return "";
+}
+
+bool BaseMenuGui::handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                               HidAnalogStickState rightJoyStick) {
+    if (keysDown & KEY_B) {
+        triggerExitFeedback();
+        lastItemName = this->getJumpToItemName();
+        tsl::swapTo<MainGui>();
+        return true;
+    }
+    return false;
+}

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

@@ -31,6 +31,7 @@
 
 class BaseMenuGui : public BaseGui {
     protected:
+        virtual std::string getJumpToItemName();
     public:
     // u8 dockedHighestAllowedRefreshRate = 60;
     HocClkContext *context;
@@ -79,6 +80,8 @@ class BaseMenuGui : public BaseGui {
     tsl::elm::Element *baseUI() override;
     void refresh() override;
     virtual void listUI() = 0;
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override;
     u16 headerHeight() const override {
         return HOC_BOX_BOTTOM + 9;
     }

Source/hoc-clk/overlay/src/ui/gui/freq_choice_gui.h

@@ -55,4 +55,8 @@ class FreqChoiceGui : public BaseMenuGui {
     ~FreqChoiceGui();
 
     void listUI() override;
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
 };

Source/hoc-clk/overlay/src/ui/gui/global_override_gui.cpp

@@ -301,6 +301,11 @@ class GovernorOverrideSubMenuGui : public BaseMenuGui {
 public:
     GovernorOverrideSubMenuGui(u32 initialPacked) : packed(initialPacked) {}
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     void listUI() override {
         BaseMenuGui::refresh(); // get latest context
         if(!this->context)
@@ -423,3 +428,7 @@ void GlobalOverrideGui::refresh()
         }
     }
 }
+
+std::string GlobalOverrideGui::getJumpToItemName() {
+    return "Temporary Overrides";
+}

Source/hoc-clk/overlay/src/ui/gui/global_override_gui.h

@@ -33,6 +33,7 @@
 #include "value_choice_gui.h"
 class GlobalOverrideGui : public BaseMenuGui {
     protected:
+    std::string getJumpToItemName() override;
     std::map<HocClkModule, std::tuple<std::string, std::uint32_t, int>> customFormatModules;
     tsl::elm::ListItem *listItems[HocClkModule_EnumMax];
     std::uint32_t listHz[HocClkModule_EnumMax];

Source/hoc-clk/overlay/src/ui/gui/info_gui.h

@@ -26,6 +26,10 @@ class InfoGui : public BaseMenuGui {
     InfoGui(std::string title, std::vector<std::string> strings);
     ~InfoGui() = default;
     void listUI() override;
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
 
     private:
     std::string m_title;

Source/hoc-clk/overlay/src/ui/gui/main_gui.cpp

@@ -24,6 +24,7 @@
  * --------------------------------------------------------------------------
  */
 
+#include <string>
 #include "about_gui.h"
 #include "app_profile_gui.h"
 #include "fatal_gui.h"
@@ -40,6 +41,8 @@ tsl::elm::Element *MainGui::baseUI() {
     return list;
 }
 
+std::string lastItemName;
+
 void MainGui::listUI() {
     // this->enabledToggle = new tsl::elm::ToggleListItem("Enable", false);
     // enabledToggle->setStateChangedListener([this](bool state) {
@@ -79,7 +82,7 @@ void MainGui::listUI() {
     tsl::elm::ListItem *globalOverrideItem = new tsl::elm::ListItem("Temporary Overrides");
     globalOverrideItem->setClickListener([this](u64 keys) {
         if ((keys & HidNpadButton_A) == HidNpadButton_A && this->context) {
-            tsl::changeTo<GlobalOverrideGui>();
+            tsl::swapTo<GlobalOverrideGui>();
             return true;
         }
 
@@ -92,7 +95,7 @@ void MainGui::listUI() {
     tsl::elm::ListItem *miscItem = new tsl::elm::ListItem("Settings");
     miscItem->setClickListener([this](u64 keys) {
         if ((keys & HidNpadButton_A) == HidNpadButton_A && this->context) {
-            tsl::changeTo<MiscGui>();
+            tsl::swapTo<MiscGui>();
             return true;
         }
 
@@ -103,7 +106,7 @@ void MainGui::listUI() {
     tsl::elm::ListItem *aboutItem = new tsl::elm::ListItem("About");
     aboutItem->setClickListener([this](u64 keys) {
         if ((keys & HidNpadButton_A) == HidNpadButton_A && this->context) {
-            tsl::changeTo<AboutGui>();
+            tsl::swapTo<AboutGui>();
             return true;
         }
 
@@ -114,7 +117,7 @@ void MainGui::listUI() {
     tsl::elm::ListItem *updateItem = new tsl::elm::ListItem("Updates");
     updateItem->setClickListener([this](u64 keys) {
         if ((keys & HidNpadButton_A) == HidNpadButton_A && this->context) {
-            tsl::changeTo<UpdateGui>();
+            tsl::swapTo<UpdateGui>();
             return true;
         }
 
@@ -122,6 +125,11 @@ void MainGui::listUI() {
     });
     this->listElement->addItem(updateItem);
 
+    if (!lastItemName.empty()) {
+        this->listElement->jumpToItem(lastItemName);
+    }
+
+    lastItemName = "";
 }
 
 void MainGui::refresh() {
@@ -131,3 +139,4 @@ void MainGui::refresh() {
     //     this->enabledToggle->setState(this->context->enabled);
     // }
 }
+

Source/hoc-clk/overlay/src/ui/gui/main_gui.h

@@ -28,6 +28,8 @@
 
 #include "base_menu_gui.h"
 
+extern std::string lastItemName;
+
 class MainGui : public BaseMenuGui {
     public:
     MainGui() {
@@ -40,4 +42,9 @@ class MainGui : public BaseMenuGui {
     u16 headerHeight() const override {
         return HOC_HEADER_HEIGHT - 25;
     }
+
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
 };

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

@@ -26,7 +26,7 @@
 #include "labels.h"
 #include "misc_gui.h"
 #include "ult_ext.h"
-
+#include "main_gui.h"
 
 // This workaround *may* not be nessasary, but it seems to help with reducing stutter
 static void kipDataThreadFunc(void *) {
@@ -742,6 +742,11 @@ class GeneralSettingsSubMenuGui : public MiscGui {
     GeneralSettingsSubMenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -792,6 +797,11 @@ class ExperimentalSettingsSubMenuGui : public MiscGui {
     ExperimentalSettingsSubMenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -906,6 +916,11 @@ class GovernorSettingsSubMenuGui : public MiscGui {
     GovernorSettingsSubMenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -931,6 +946,11 @@ class DisplaySubMenuGui : public MiscGui {
     DisplaySubMenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -980,6 +1000,11 @@ class SafetySubMenuGui : public MiscGui {
     SafetySubMenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -1004,6 +1029,11 @@ class RamSubmenuGui : public MiscGui {
     RamSubmenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         BaseMenuGui::refresh();
@@ -1239,6 +1269,11 @@ class RamTimingsSubmenuGui : public MiscGui {
     RamTimingsSubmenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -1486,6 +1521,11 @@ class RamLatenciesSubmenuGui : public MiscGui {
     RamLatenciesSubmenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     tsl::elm::Element *baseUI() override {
         auto *list = new TopAnchoredList();
         this->listElement = list;
@@ -1987,6 +2027,11 @@ class CpuSubmenuGui : public MiscGui {
     CpuSubmenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);  // populate config list early otherwise wont work
@@ -2145,6 +2190,11 @@ class GpuSubmenuGui : public MiscGui {
     GpuSubmenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
         Result rc = hocclkIpcGetConfigValues(this->configList);
@@ -2290,6 +2340,11 @@ class GpuCustomTableSubmenuGui : public MiscGui {
     GpuCustomTableSubmenuGui() {
     }
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
 
@@ -2525,6 +2580,11 @@ class SocCustomTableSubmenuGui : public MiscGui {
     public:
     SocCustomTableSubmenuGui() {}
 
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
+
     protected:
     void listUI() override {
 
@@ -2672,3 +2732,7 @@ void MiscGui::refresh() {
         }
     }
 }
+
+std::string MiscGui::getJumpToItemName() {
+    return "Settings";
+}

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

@@ -67,4 +67,5 @@ class MiscGui : public BaseMenuGui {
     tsl::elm::ToggleListItem *enabledToggle;
     u8 frameCounter = 60;
     bool shouldSaveKip = false;
+    std::string getJumpToItemName() override;
 };

Source/hoc-clk/overlay/src/ui/gui/update_gui.cpp

@@ -267,5 +267,10 @@ bool UpdateGui::handleInput(u64 keysDown, u64 keysHeld,
         requestCancel();
         return true;
     }
-    return false;
+
+    return BaseMenuGui::handleInput(keysDown, keysHeld, touchPos, leftJoy, rightJoy);
+}
+
+std::string UpdateGui::getJumpToItemName() {
+    return "Updates";
 }

Source/hoc-clk/overlay/src/ui/gui/update_gui.h

@@ -77,4 +77,7 @@ private:
 
     tsl::elm::ListItem *m_items[2] = {nullptr, nullptr};
     UpdateStatusPanel *m_status = nullptr;
+
+protected:
+    std::string getJumpToItemName() override;
 };

Source/hoc-clk/overlay/src/ui/gui/value_choice_gui.h

@@ -101,4 +101,9 @@ class ValueChoiceGui : public BaseMenuGui {
     }
 
     void listUI() override;
+
+    bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick,
+                      HidAnalogStickState rightJoyStick) override {
+        return false;
+    }
 };