OmniNX/Horizon-OC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hocclk: fixes and other stuff

Browse Source
This commit is contained in:
souldbminersmwc
2026-05-08 15:53:53 -04:00
parent 848a788c5f
commit 598136c64b
18 changed files with 291 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp
View File

@@ -20,6 +20,7 @@
#pragma once
// Ensure to set KIP_VERSION and CUST_REV in sysmodule Makefile when updating these
#define CUST_REV 2
#define HOC_VERSION 220

1
Source/hoc-clk/common/include/hocclk/board.h
View File

@@ -197,6 +197,7 @@ typedef enum AulaColorMode {
AulaDisplayColorMode_Night2 = 0x35,
AulaDisplayColorMode_Night3 = 0x75,
} AulaColorMode;
// typedef enum {
// PANEL_JDI_XXX062M = 0x10,
// PANEL_JDI_LAM062M109A = 0x0910, // SI.

4
Source/hoc-clk/common/include/hocclk/clock_manager.h
View File

@@ -47,7 +47,7 @@ typedef struct {
u32 realFreqs[HocClkModuleStable_EnumMax];
u32 overrideFreqs[HocClkModuleStable_EnumMax];
s32 temps[HocClkThermalSensorStable_EnumMax];
u32 power[HocClkPowerSensorStable_EnumMax];
s32 power[HocClkPowerSensorStable_EnumMax];
u32 partLoad[HocClkPartLoadStable_EnumMax];
u32 voltages[HocClkVoltageStable_EnumMax];
} stable;
@@ -57,7 +57,7 @@ typedef struct {
uint32_t freqs[HocClkModule_EnumMax];
uint32_t realFreqs[HocClkModule_EnumMax];
uint32_t overrideFreqs[HocClkModule_EnumMax];
uint32_t temps[HocClkThermalSensor_EnumMax];
int32_t temps[HocClkThermalSensor_EnumMax];
int32_t power[HocClkPowerSensor_EnumMax];
uint32_t partLoad[HocClkPartLoad_EnumMax];
uint32_t voltages[HocClkVoltage_EnumMax];

2
Source/hoc-clk/overlay/Makefile
View File

@@ -39,7 +39,7 @@ include ${TOPDIR}/lib/libultrahand/ultrahand.mk
# version control constants
#---------------------------------------------------------------------------------
#TARGET_VERSION := $(shell git describe --dirty --always --tags)
APP_VERSION := 2.2.0
APP_VERSION := 2.2.0 # ensure to set KIP_VERSION and CUST_REV in sysmodule Makefile when updating this
TARGET_VERSION := $(APP_VERSION)
#---------------------------------------------------------------------------------

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

@@ -138,7 +138,7 @@ void AboutGui::listUI()
// custRevItem = new tsl::elm::ListItem("CUST revision:");
// this->listElement->addItem(custRevItem);
kipVersionItem = new tsl::elm::ListItem("Kip version:");
kipVersionItem = new tsl::elm::ListItem("KIP version:");
this->listElement->addItem(kipVersionItem);
if(!IsHoag()) {
@@ -386,11 +386,13 @@ void AboutGui::refresh()
eristaPLLXItem->setValue(strings[3]);
}
u32 millis = context->temps[HocClkThermalSensor_AO];
s32 millis = context->temps[HocClkThermalSensor_AO];
if(millis > 0) {
sprintf(strings[11], "%u.%u °C", millis / 1000U, (millis % 1000U) / 100U);
} else {
sprintf(strings[11], "N/A");
} else if (millis == -125) {
sprintf(strings[11], "Not Valid");
} else if (millis == -126) {
sprintf(strings[11], "Not Patched");
}
aotagTempItem->setValue(strings[11]);

5
Source/hoc-clk/sysmodule/Makefile
View File

@@ -27,6 +27,9 @@ DATA := data
INCLUDES := ../common/include
EXEFS_SRC := exefs_src
LIBNAMES := minIni nxExt
# major minor patch
KIP_VERSION := 220
CUST_REV := 2
#---------------------------------------------------------------------------------
# version control constants
@@ -36,7 +39,7 @@ TARGET_VERSION := $(shell git describe --dirty --always --tags)
#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
DEFINES := -DDISABLE_IPC -DTARGET="\"$(TARGET)\"" -DTARGET_VERSION="\"$(TARGET_VERSION)\"" -DCONFIG_DIR="\"$(CONFIG_DIR)\""
DEFINES := -DDISABLE_IPC -DKIP_VERSION=$(KIP_VERSION) -DCUST_REV=$(CUST_REV) -DTARGET="\"$(TARGET)\"" -DTARGET_VERSION="\"$(TARGET_VERSION)\"" -DCONFIG_DIR="\"$(CONFIG_DIR)\""
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE

4
Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
View File

@@ -33,7 +33,7 @@
#include "board.hpp"
#include "../tsensor/soctherm.hpp"
#include "../tsensor/aotag.hpp"
#include "bq24193.hpp"
#include "../tsensor/bq24193.hpp"
#include "../config.hpp"
namespace board {
@@ -81,7 +81,7 @@ namespace board {
}
case HocClkThermalSensor_MEM: {
if (board::GetSocType() == HocClkSocType_Mariko && tsensor::IsInitialized() && tsensor::ReadAotag() > 0) {
millis = (temps.gpu * 0.45f) + (temps.pllx * 0.30f) + (temps.cpu * 0.15f) + (tsensor::ReadAotag() * 0.10f) + 3000;
millis = (temps.pllx * 0.10f) + (tsensor::ReadAotag() * 0.90f);
} else {
millis = board::GetSocType() == HocClkSocType_Mariko ? temps.pllx : temps.mem;
}

3
Source/hoc-clk/sysmodule/src/kip.cpp
View File

@@ -20,9 +20,6 @@
#include "file_utils.hpp"
#include "clock_manager.hpp"
#define CUST_REV 2
#define KIP_VERSION 220
namespace kip {
bool kipAvailable = false;

2
Source/hoc-clk/sysmodule/src/tsensor/aotag.cpp
View File

@@ -211,7 +211,7 @@ namespace tsensor {
s32 ReadAotag() {
if (!wasInit) {
return -125;
return -126;
}
u32 regval = 0, abs = 0, fraction = 0, valid = 0, sign = 0;

0
Source/hoc-clk/sysmodule/src/board/bq24193.cpp → Source/hoc-clk/sysmodule/src/tsensor/bq24193.cpp
View File

2
Source/hoc-clk/sysmodule/src/board/bq24193.hpp → Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp
View File

@@ -17,7 +17,7 @@
*
*/
#include "board.hpp"
#include "../board/board.hpp"
#include <i2c.h>
namespace bq24193 {