remove retro remake dispay support and more ui cohesion
This commit is contained in:
1 parent
e5765e70ab
commit
7e67859c84
12 files changed
+19
-42
No files matched your search
@@ -70,7 +70,6 @@ typedef struct {
|
|||||||
GpuSchedulingMode gpuSchedulingMode;
|
GpuSchedulingMode gpuSchedulingMode;
|
||||||
bool isSysDockInstalled;
|
bool isSysDockInstalled;
|
||||||
bool isSaltyNXInstalled;
|
bool isSaltyNXInstalled;
|
||||||
bool isUsingRetroSuper;
|
|
||||||
u8 maxDisplayFreq;
|
u8 maxDisplayFreq;
|
||||||
u8 dramID;
|
u8 dramID;
|
||||||
bool isDram8GB;
|
bool isDram8GB;
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ tsl::elm::ListItem* IddqItem = NULL;
|
|||||||
tsl::elm::ListItem* DramModule = NULL;
|
tsl::elm::ListItem* DramModule = NULL;
|
||||||
tsl::elm::ListItem* sysdockStatusItem = NULL;
|
tsl::elm::ListItem* sysdockStatusItem = NULL;
|
||||||
tsl::elm::ListItem* saltyNXStatusItem = NULL;
|
tsl::elm::ListItem* saltyNXStatusItem = NULL;
|
||||||
tsl::elm::ListItem* RETROStatusItem = NULL;
|
|
||||||
tsl::elm::ListItem* waferCordsItem = NULL;
|
tsl::elm::ListItem* waferCordsItem = NULL;
|
||||||
tsl::elm::ListItem* ramVoltItem = NULL;
|
tsl::elm::ListItem* ramVoltItem = NULL;
|
||||||
tsl::elm::ListItem* eristaPLLXItem = NULL;
|
tsl::elm::ListItem* eristaPLLXItem = NULL;
|
||||||
@@ -141,12 +140,6 @@ void AboutGui::listUI()
|
|||||||
new tsl::elm::ListItem("Wafer Position:");
|
new tsl::elm::ListItem("Wafer Position:");
|
||||||
this->listElement->addItem(waferCordsItem);
|
this->listElement->addItem(waferCordsItem);
|
||||||
|
|
||||||
if(IsHoag()) {
|
|
||||||
RETROStatusItem =
|
|
||||||
new tsl::elm::ListItem("RR Display status:");
|
|
||||||
this->listElement->addItem(RETROStatusItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
this->listElement->addItem(
|
this->listElement->addItem(
|
||||||
new tsl::elm::CategoryHeader("Software Info")
|
new tsl::elm::CategoryHeader("Software Info")
|
||||||
);
|
);
|
||||||
@@ -224,9 +217,6 @@ void AboutGui::refresh()
|
|||||||
|
|
||||||
saltyNXStatusItem->setValue(this->context->isSaltyNXInstalled ? "Installed" : "Not Installed");
|
saltyNXStatusItem->setValue(this->context->isSaltyNXInstalled ? "Installed" : "Not Installed");
|
||||||
|
|
||||||
if(IsHoag())
|
|
||||||
RETROStatusItem->setValue(this->context->isUsingRetroSuper ? "Installed" : "Not Installed");
|
|
||||||
|
|
||||||
sprintf(strings[2], "X: %d Y: %d", this->context->waferX, this->context->waferY);
|
sprintf(strings[2], "X: %d Y: %d", this->context->waferX, this->context->waferY);
|
||||||
waferCordsItem->setValue(strings[2]);
|
waferCordsItem->setValue(strings[2]);
|
||||||
|
|
||||||
|
|||||||
@@ -309,7 +309,7 @@ public:
|
|||||||
static constexpr struct { const char* label; int shift; } kAll[] = {
|
static constexpr struct { const char* label; int shift; } kAll[] = {
|
||||||
{"CPU", 0}, {"GPU", 8}, {"VRR", 16}
|
{"CPU", 0}, {"GPU", 8}, {"VRR", 16}
|
||||||
};
|
};
|
||||||
int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] || this->context->isUsingRetroSuper || this->context->profile == HocClkProfile_Docked ? 3 : 2;
|
int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] && profile != HocClkProfile_Docked ? 3 : 2;
|
||||||
|
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
u8 cur = (this->profileList->mhzMap[this->profile][HocClkModule_Governor] >> kAll[i].shift) & 0xFF;
|
u8 cur = (this->profileList->mhzMap[this->profile][HocClkModule_Governor] >> kAll[i].shift) & 0xFF;
|
||||||
@@ -367,7 +367,7 @@ void AppProfileGui::addProfileUI(HocClkProfile profile)
|
|||||||
|
|
||||||
if(configList.values[HocClkConfigValue_OverwriteRefreshRate]) {
|
if(configList.values[HocClkConfigValue_OverwriteRefreshRate]) {
|
||||||
if(profile != HocClkProfile_Docked) {
|
if(profile != HocClkProfile_Docked) {
|
||||||
this->addModuleListItemValue(profile, HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], this->context->isUsingRetroSuper ? 5 : 1, " Hz", 1, 0, lcdThresholds);
|
this->addModuleListItemValue(profile, HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], 1, " Hz", 1, 0, lcdThresholds);
|
||||||
} else {
|
} else {
|
||||||
if(IsAula() && this->context->isSysDockInstalled) {
|
if(IsAula() && this->context->isSysDockInstalled) {
|
||||||
std::vector<NamedValue> dockedFreqs = {
|
std::vector<NamedValue> dockedFreqs = {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ void BaseMenuGui::preDraw(tsl::gfx::Renderer *renderer) {
|
|||||||
|
|
||||||
// All constants pre-calculated and cached
|
// All constants pre-calculated and cached
|
||||||
const char *labels[] = { "App ID", "Profile", "CPU", "GPU", "MEM", "SoC", "Board",
|
const char *labels[] = { "App ID", "Profile", "CPU", "GPU", "MEM", "SoC", "Board",
|
||||||
"Skin", "Now", "Avg", "BAT", "PMIC", "Fan", IsAula() || this->context->isUsingRetroSuper ? "OLED" : "LCD",
|
"Skin", "Now", "Avg", "BAT", "PMIC", "Fan", IsAula() ? "OLED" : "LCD",
|
||||||
"FPS", "RES" };
|
"FPS", "RES" };
|
||||||
|
|
||||||
static constexpr u32 dataPositions[6] = { 63 - 3 + 3, 200 - 1, 344 - 1 - 3, 200 - 1, 342 - 1, 321 - 1 };
|
static constexpr u32 dataPositions[6] = { 63 - 3 + 3, 200 - 1, 344 - 1 - 3, 200 - 1, 342 - 1, 321 - 1 };
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ std::vector<std::string> ConfigInfoStrings(HocClkConfigValue val, bool isMariko,
|
|||||||
"Options:",
|
"Options:",
|
||||||
"- VDD2 - Display VDD2 voltage",
|
"- VDD2 - Display VDD2 voltage",
|
||||||
"- VDDQ - Display VDDQ voltage",
|
"- VDDQ - Display VDDQ voltage",
|
||||||
|
"- VDD2/VDDQ - Display both voltages, but without decimal place",
|
||||||
"Default: VDD2"
|
"Default: VDD2"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ public:
|
|||||||
static constexpr struct { const char* label; int shift; } kAll[] = {
|
static constexpr struct { const char* label; int shift; } kAll[] = {
|
||||||
{"CPU", 0}, {"GPU", 8}, {"VRR", 16}
|
{"CPU", 0}, {"GPU", 8}, {"VRR", 16}
|
||||||
};
|
};
|
||||||
int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] || this->context->isUsingRetroSuper ? 3 : 2;
|
int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] && this->context->profile != HocClkProfile_Docked ? 3 : 2;
|
||||||
|
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
u8 cur = (this->packed >> kAll[i].shift) & 0xFF;
|
u8 cur = (this->packed >> kAll[i].shift) & 0xFF;
|
||||||
@@ -375,7 +375,7 @@ void GlobalOverrideGui::listUI()
|
|||||||
#if IS_MINIMAL == 0
|
#if IS_MINIMAL == 0
|
||||||
ValueThresholds lcdThresholds(60, 65);
|
ValueThresholds lcdThresholds(60, 65);
|
||||||
if(configList.values[HocClkConfigValue_OverwriteRefreshRate])
|
if(configList.values[HocClkConfigValue_OverwriteRefreshRate])
|
||||||
this->addModuleListItemValue(HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], this->context->isUsingRetroSuper ? 5 : 1, " Hz", 1, 0, lcdThresholds);
|
this->addModuleListItemValue(HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], 1, " Hz", 1, 0, lcdThresholds);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
this->addGovernorSection();
|
this->addGovernorSection();
|
||||||
|
|||||||
@@ -1048,20 +1048,18 @@ class DisplaySubMenuGui : public MiscGui {
|
|||||||
|
|
||||||
this->listElement->addItem(new CompactCategoryHeader("Display Settings"));
|
this->listElement->addItem(new CompactCategoryHeader("Display Settings"));
|
||||||
addConfigToggle(HocClkConfigValue_OverwriteRefreshRate, nullptr);
|
addConfigToggle(HocClkConfigValue_OverwriteRefreshRate, nullptr);
|
||||||
if (!this->context->isUsingRetroSuper) {
|
tsl::elm::CustomDrawer *warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
|
||||||
tsl::elm::CustomDrawer *warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
|
renderer->drawString("\uE150 Usage of unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
|
||||||
renderer->drawString("\uE150 Usage of unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
|
renderer->drawString("refresh rates may cause stress", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
|
||||||
renderer->drawString("refresh rates may cause stress", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
|
renderer->drawString("or damage to your display! ", false, x + 20, y + 70, 18, tsl::style::color::ColorText);
|
||||||
renderer->drawString("or damage to your display! ", false, x + 20, y + 70, 18, tsl::style::color::ColorText);
|
renderer->drawString("Proceed at your own risk!", false, x + 20, y + 90, 18, tsl::style::color::ColorText);
|
||||||
renderer->drawString("Proceed at your own risk!", false, x + 20, y + 90, 18, tsl::style::color::ColorText);
|
});
|
||||||
});
|
|
||||||
|
|
||||||
warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
|
warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
|
||||||
this->listElement->addItem(warningText);
|
this->listElement->addItem(warningText);
|
||||||
ValueThresholds displayThresholds(60, 65);
|
ValueThresholds displayThresholds(60, 65);
|
||||||
addConfigButton(HocClkConfigValue_MaxDisplayClockH, "Max Handheld Display Hz", ValueRange(60, IsAula() ? 65 : 75, 1, " Hz", 1),
|
addConfigButton(HocClkConfigValue_MaxDisplayClockH, "Max Handheld Display Hz", ValueRange(60, IsAula() ? 65 : 75, 1, " Hz", 1),
|
||||||
"Display Clock", &displayThresholds, {}, {}, false);
|
"Display Clock", &displayThresholds, {}, {}, false);
|
||||||
}
|
|
||||||
if (!IsAula()) {
|
if (!IsAula()) {
|
||||||
tsl::elm::CustomDrawer *warningTextDV = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
|
tsl::elm::CustomDrawer *warningTextDV = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
|
||||||
renderer->drawString("\uE150 Adjust the display voltage", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
|
renderer->drawString("\uE150 Adjust the display voltage", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ namespace board {
|
|||||||
display::DisplayRefreshConfig cfg = { .clkVirtAddr = clkVirtAddr,
|
display::DisplayRefreshConfig cfg = { .clkVirtAddr = clkVirtAddr,
|
||||||
.dsiVirtAddr = dsiVirtAddr,
|
.dsiVirtAddr = dsiVirtAddr,
|
||||||
.isLite = (GetConsoleType() == HocClkConsoleType_Hoag),
|
.isLite = (GetConsoleType() == HocClkConsoleType_Hoag),
|
||||||
.isRetroSUPER = integrations::GetRETROSuperStatus() };
|
.isRetroSUPER = false };
|
||||||
display::Initialize(&cfg);
|
display::Initialize(&cfg);
|
||||||
|
|
||||||
CacheDfllData();
|
CacheDfllData();
|
||||||
@@ -270,8 +270,4 @@ namespace board {
|
|||||||
return speedoBracket;
|
return speedoBracket;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsUsingRetroSuperDisplay() {
|
|
||||||
return false; /* stub for now. */
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace board
|
} // namespace board
|
||||||
@@ -58,6 +58,5 @@ namespace board {
|
|||||||
bool IsDram8GB();
|
bool IsDram8GB();
|
||||||
void SetDisplayRefreshDockedState(bool docked);
|
void SetDisplayRefreshDockedState(bool docked);
|
||||||
FuseData *GetFuseData();
|
FuseData *GetFuseData();
|
||||||
bool IsUsingRetroSuperDisplay();
|
|
||||||
|
|
||||||
} // namespace board
|
} // namespace board
|
||||||
@@ -88,11 +88,6 @@ namespace integrations {
|
|||||||
return stat("sdmc:/atmosphere/contents/0000000000534C56/flags/boot2.flag", &st) == 0;
|
return stat("sdmc:/atmosphere/contents/0000000000534C56/flags/boot2.flag", &st) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GetRETROSuperStatus() {
|
|
||||||
struct stat st = { 0 };
|
|
||||||
return stat("sdmc:/config/horizon-oc/retro.flag", &st) == 0; // TODO: unhardcode this
|
|
||||||
}
|
|
||||||
|
|
||||||
void LoadSaltyNX() {
|
void LoadSaltyNX() {
|
||||||
if (!CheckSaltyNXPort())
|
if (!CheckSaltyNXPort())
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ namespace integrations {
|
|||||||
|
|
||||||
bool GetSysDockState();
|
bool GetSysDockState();
|
||||||
bool GetSaltyNXState();
|
bool GetSaltyNXState();
|
||||||
bool GetRETROSuperStatus();
|
|
||||||
void LoadSaltyNX();
|
void LoadSaltyNX();
|
||||||
u8 GetSaltyNXFPS();
|
u8 GetSaltyNXFPS();
|
||||||
u16 GetSaltyNXResolutionHeight();
|
u16 GetSaltyNXResolutionHeight();
|
||||||
|
|||||||
@@ -830,7 +830,6 @@ namespace clockManager {
|
|||||||
integrations::LoadSaltyNX();
|
integrations::LoadSaltyNX();
|
||||||
}
|
}
|
||||||
|
|
||||||
gContext.isUsingRetroSuper = integrations::GetRETROSuperStatus();
|
|
||||||
governor::startThreads();
|
governor::startThreads();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user