Merge remote-tracking branch 'Meha/master'

Author: redraz

Makefile

@@ -38,7 +38,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
 APP_TITLE	:=	Status Monitor
-APP_VERSION	:=	1.1.3U
+APP_VERSION	:=	1.1.3U+
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source

config/status-monitor/config.ini.template

@@ -32,8 +32,9 @@ docked_font_size=15
 text_align=left
 real_freqs=true
 real_volts=true
-show=CPUB+GPU+RAM+BRDB+FPSE
-;all modules: (CPU CPUB) GPU RAM (BRD BRDM BRDB) FAN PWR (BAT BATE) (FPS FPSE)
+show_full_cpu=true
+show=CPU+GPU+RAM+BRDB+FPSE
+;all modules: CPU GPU RAM (SOC BRD BRDB) FAN (PWR BAT BATB BATE) (FPS FPSE)
 replace_GB_with_RAM_load=true
 background_color=#1113
 cat_color=#BDFF

include/sysclk/clock_manager.h

@@ -26,6 +26,7 @@ typedef struct
     uint32_t ramLoad[SysClkRamLoad_EnumMax];
     uint32_t realVolts[4];
     uint32_t perfConfId;
+    uint32_t reserved[8];
 } SysClkContext;
 
 #ifdef __cplusplus

source/Utils.hpp

@@ -164,13 +164,22 @@ resolutionCalls* viewportCalls_shared = 0;
 uint32_t realCPU_Hz = 0;
 uint32_t realGPU_Hz = 0;
 uint32_t realRAM_Hz = 0;
+uint32_t ramLoad[SysClkRamLoad_EnumMax];
 uint32_t realCPU_mV = 0;
 uint32_t realGPU_mV = 0;
 uint32_t realRAM_mV = 0;
 uint32_t realSOC_mV = 0;
-uint32_t ramLoad[SysClkRamLoad_EnumMax];
 uint8_t refreshRate = 0;
 
+//Tweaks to nvInitialize so it will take less RAM
+#define NVDRV_TMEM_SIZE (8 * 0x1000)
+char nvdrv_tmem_data[NVDRV_TMEM_SIZE] alignas(0x1000);
+
+Result __nx_nv_create_tmem(TransferMemory *t, u32 *out_size, Permission perm) {
+    *out_size = NVDRV_TMEM_SIZE;
+    return tmemCreateFromMemory(t, nvdrv_tmem_data, NVDRV_TMEM_SIZE, perm);
+}
+
 int compare (const void* elem1, const void* elem2) {
 	if ((((resolutionCalls*)(elem1)) -> calls) > (((resolutionCalls*)(elem2)) -> calls)) return -1;
 	else return 1;
@@ -432,12 +441,12 @@ void Misc(void*) {
 				realCPU_Hz = sysclkCTX.realFreqs[SysClkModule_CPU];
 				realGPU_Hz = sysclkCTX.realFreqs[SysClkModule_GPU];
 				realRAM_Hz = sysclkCTX.realFreqs[SysClkModule_MEM];
+				ramLoad[SysClkRamLoad_All] = sysclkCTX.ramLoad[SysClkRamLoad_All];
+				ramLoad[SysClkRamLoad_Cpu] = sysclkCTX.ramLoad[SysClkRamLoad_Cpu];
 				realCPU_mV = sysclkCTX.realVolts[0];
 				realGPU_mV = sysclkCTX.realVolts[1];
 				realRAM_mV = sysclkCTX.realVolts[2];
 				realSOC_mV = sysclkCTX.realVolts[3];
-				ramLoad[SysClkRamLoad_All] = sysclkCTX.ramLoad[SysClkRamLoad_All];
-				ramLoad[SysClkRamLoad_Cpu] = sysclkCTX.ramLoad[SysClkRamLoad_Cpu];
 			}
 		}
 
@@ -503,6 +512,7 @@ void Misc(void*) {
 			FPSmin = 254;
 			FPSmax = 0;
 		}
+
 		// Interval
 		mutexUnlock(&mutex_Misc);
 		svcSleepThread(TeslaFPS < 10 ? (1'000'000'000 / TeslaFPS) : 100'000'000);
@@ -530,6 +540,60 @@ void Misc2(void*) {
 	}
 }
 
+void Misc3(void*) {
+	while (!threadexit) {
+		mutexLock(&mutex_Misc);
+
+		if (R_SUCCEEDED(sysclkCheck)) {
+			SysClkContext sysclkCTX;
+			if (R_SUCCEEDED(sysclkIpcGetCurrentContext(&sysclkCTX))) {
+				ramLoad[SysClkRamLoad_All] = sysclkCTX.ramLoad[SysClkRamLoad_All];
+				ramLoad[SysClkRamLoad_Cpu] = sysclkCTX.ramLoad[SysClkRamLoad_Cpu];
+			}
+		}
+		
+		//Temperatures
+		if (R_SUCCEEDED(tsCheck)) {
+			if (hosversionAtLeast(10,0,0)) {
+				TsSession ts_session;
+				Result rc = tsOpenSession(&ts_session, TsDeviceCode_LocationExternal);
+				if (R_SUCCEEDED(rc)) {
+					tsSessionGetTemperature(&ts_session, &SOC_temperatureF);
+					tsSessionClose(&ts_session);
+				}
+				rc = tsOpenSession(&ts_session, TsDeviceCode_LocationInternal);
+				if (R_SUCCEEDED(rc)) {
+					tsSessionGetTemperature(&ts_session, &PCB_temperatureF);
+					tsSessionClose(&ts_session);
+				}
+			}
+			else {
+				tsGetTemperatureMilliC(TsLocation_External, &SOC_temperatureC);
+				tsGetTemperatureMilliC(TsLocation_Internal, &PCB_temperatureC);
+			}
+		}
+		if (R_SUCCEEDED(tcCheck)) tcGetSkinTemperatureMilliC(&skin_temperaturemiliC);
+		
+		//Fan
+		if (R_SUCCEEDED(pwmCheck)) {
+			double temp = 0;
+			if (R_SUCCEEDED(pwmChannelSessionGetDutyCycle(&g_ICon, &temp))) {
+				temp *= 10;
+				temp = trunc(temp);
+				temp /= 10;
+				Rotation_Duty = 100.0 - temp;
+			}
+		}
+		
+		//GPU Load
+		if (R_SUCCEEDED(nvCheck)) nvIoctl(fd, NVGPU_GPU_IOCTL_PMU_GET_GPU_LOAD, &GPU_Load_u);
+		
+		// Interval
+		mutexUnlock(&mutex_Misc);
+		svcSleepThread(1'000'000'000);
+	}
+}
+
 //Check each core for idled ticks in intervals, they cannot read info about other core than they are assigned
 //In case of getting more than systemtickfrequency in idle, make it equal to systemtickfrequency to get 0% as output and nothing less
 //This is because making each loop also takes time, which is not considered because this will take also additional time
@@ -656,6 +720,36 @@ void EndFPSCounterThread() {
 	threadexit2 = false;
 }
 
+void StartInfoThread() {
+	threadCreate(&t1, CheckCore0, NULL, NULL, 0x1000, 0x10, 0);
+	threadCreate(&t2, CheckCore1, NULL, NULL, 0x1000, 0x10, 1);
+	threadCreate(&t3, CheckCore2, NULL, NULL, 0x1000, 0x10, 2);
+	threadCreate(&t4, CheckCore3, NULL, NULL, 0x1000, 0x10, 3);
+	threadCreate(&t7, Misc3, NULL, NULL, 0x1000, 0x3F, -2);
+	threadStart(&t1);
+	threadStart(&t2);
+	threadStart(&t3);
+	threadStart(&t4);
+	threadStart(&t7);
+}
+
+void EndInfoThread() {
+	threadexit = true;
+	threadexit2 = true;
+	threadWaitForExit(&t1);
+	threadWaitForExit(&t2);
+	threadWaitForExit(&t3);
+	threadWaitForExit(&t4);
+	threadWaitForExit(&t7);
+	threadClose(&t1);
+	threadClose(&t2);
+	threadClose(&t3);
+	threadClose(&t4);
+	threadClose(&t7);
+	threadexit = false;
+	threadexit2 = false;
+}
+
 
 // String formatting functions
 void removeSpaces(std::string& str) {
@@ -953,6 +1047,7 @@ struct MicroSettings {
 	uint8_t refreshRate;
 	bool realFrequencies;
 	bool realVolts;
+	bool showFullCPU;
 	size_t handheldFontSize;
 	size_t dockedFontSize;
 	uint8_t alignTo;
@@ -974,6 +1069,7 @@ struct FpsCounterSettings {
 };
 
 struct FpsGraphSettings {
+	bool showInfo;
 	uint8_t refreshRate;
 	uint16_t backgroundColor;
 	uint16_t fpsColor;
@@ -1048,7 +1144,7 @@ void GetConfigSettings(MiniSettings* settings) {
 		settings -> realVolts = !(key.compare("TRUE")); 
 	}
 
-	long maxFontSize = 22;
+	long maxFontSize = 32;
 	long minFontSize = 8;
 	if (parsedData["mini"].find("handheld_font_size") != parsedData["mini"].end()) {
 		key = parsedData["mini"]["handheld_font_size"];
@@ -1120,14 +1216,15 @@ void GetConfigSettings(MiniSettings* settings) {
 
 void GetConfigSettings(MicroSettings* settings) {
 	settings -> realFrequencies = true;
-	settings -> realVolts = true; 
-	settings -> handheldFontSize = 15;
-	settings -> dockedFontSize = 15;
+	settings -> realVolts = true;
+	settings -> showFullCPU = true;
+	settings -> handheldFontSize = 12;
+	settings -> dockedFontSize = 12;
 	settings -> alignTo = 0;
 	convertStrToRGBA4444("#1113", &(settings -> backgroundColor));
 	convertStrToRGBA4444("#BDFF", &(settings -> catColor));
 	convertStrToRGBA4444("#FFFF", &(settings -> textColor));
-	settings -> show = "CPUB+GPU+RAM+BRDB+FPSE";
+	settings -> show = "CPU+GPU+RAM+BRDB+FPS+BATE";
 	settings -> showRAMLoad = true;
 	settings -> setPosBottom = false;
 	settings -> refreshRate = 1;
@@ -1170,6 +1267,11 @@ void GetConfigSettings(MicroSettings* settings) {
 		key = parsedData["micro"]["real_volts"]; 
 		convertToUpper(key); 
 		settings -> realVolts = !(key.compare("TRUE")); 
+	}  
+	if (parsedData["micro"].find("show_full_cpu") != parsedData["micro"].end()) { 
+		key = parsedData["micro"]["show_full_cpu"]; 
+		convertToUpper(key); 
+		settings -> showFullCPU = key.compare("FALSE"); 
 	} 
 	if (parsedData["micro"].find("text_align") != parsedData["micro"].end()) {
 		key = parsedData["micro"]["text_align"];
@@ -1184,7 +1286,7 @@ void GetConfigSettings(MicroSettings* settings) {
 			settings -> alignTo = 2;
 		}
 	}
-	long maxFontSize = 18;
+	long maxFontSize = 32;
 	long minFontSize = 8;
 	if (parsedData["micro"].find("handheld_font_size") != parsedData["micro"].end()) {
 		key = parsedData["micro"]["handheld_font_size"];
@@ -1318,6 +1420,7 @@ void GetConfigSettings(FpsCounterSettings* settings) {
 }
 
 void GetConfigSettings(FpsGraphSettings* settings) {
+	settings -> showInfo = false;
 	settings -> setPos = 0;
 	convertStrToRGBA4444("#1117", &(settings -> backgroundColor));
 	convertStrToRGBA4444("#4444", &(settings -> fpsColor));
@@ -1420,6 +1523,11 @@ void GetConfigSettings(FpsGraphSettings* settings) {
 		if (convertStrToRGBA4444(key, &temp))
 			settings -> perfectLineColor = temp;
 	}
+	if (parsedData["fps-graph"].find("show_info") != parsedData["fps-graph"].end()) {
+		key = parsedData["fps-graph"]["show_info"];
+		convertToUpper(key);
+		settings -> showInfo = !(key.compare("TRUE"));
+	}
 }
 
 void GetConfigSettings(FullSettings* settings) {

source/modes/Battery.hpp

@@ -54,6 +54,10 @@ class BatteryOverlay : public tsl::Gui {
 				"Battery Current Flow (%ss AVG): %+.0f mA\n"
 				"Battery Power Flow%s: %+.3f W\n"
 				"Battery Remaining Time: %s\n"
+				"Input Current Limt: %d mA\n"
+				"VBUS Current Limit: %d mA\n" 
+				"Charge Voltage Limit: %d mV\n"
+				"Charge Current Limit: %d mA\n"
 				"Charger Type: %u\n"
 				"Charger Max Voltage: %u mV\n"
 				"Charger Max Current: %u mA",
@@ -66,6 +70,10 @@ class BatteryOverlay : public tsl::Gui {
 				batteryFiltered ? "11.25" : "5", batCurrentAvg,
 				batteryFiltered ? "" : " (5s AVG)", PowerConsumption, 
 				tempBatTimeEstimate,
+				_batteryChargeInfoFields.InputCurrentLimit,
+				_batteryChargeInfoFields.VBUSCurrentLimit,
+				_batteryChargeInfoFields.ChargeVoltageLimit,
+				_batteryChargeInfoFields.ChargeCurrentLimit,
 				ChargerConnected,
 				ChargerVoltageLimit,
 				ChargerCurrentLimit

source/modes/FPS_Graph.hpp

@@ -6,6 +6,12 @@ class com_FPSGraph : public tsl::Gui {
 	FpsGraphSettings settings;
 	ApmPerformanceMode performanceMode = ApmPerformanceMode_Invalid;
 	bool isDocked = false;
+	uint64_t systemtickfrequency_impl = systemtickfrequency;
+	uint32_t cnt = 0;
+	char CPU_Load_c[12] = "";
+	char GPU_Load_c[12] = "";
+	char RAM_Load_c[12] = "";
+	char TEMP_c[32] = "";
 public:
 	bool isStarted = false;
     com_FPSGraph() { 
@@ -37,7 +43,10 @@ class com_FPSGraph : public tsl::Gui {
 		tsl::hlp::requestForeground(false);
 		FullMode = false;
 		TeslaFPS = settings.refreshRate;
+		systemtickfrequency_impl /= settings.refreshRate;
 		deactivateOriginalFooter = true;
+		mutexInit(&mutex_Misc);
+		StartInfoThread();
 	}
 
 	~com_FPSGraph() {
@@ -48,6 +57,7 @@ class com_FPSGraph : public tsl::Gui {
 		tsl::hlp::requestForeground(true);
 		alphabackground = 0xD;
 		deactivateOriginalFooter = false;
+		EndInfoThread();
 	}
 
 	struct stats {
@@ -166,6 +176,17 @@ class com_FPSGraph : public tsl::Gui {
 				last_element--;
 			}
 
+			if (settings.showInfo) {
+				s16 info_x = base_x+rectangle_width+rectangle_x + 6;
+				s16 info_y = base_y + 3;
+				renderer->drawRect(info_x, 0, rectangle_width /2 - 4, rectangle_height + 12, a(settings.backgroundColor));
+				renderer->drawString("CPU\nGPU\nRAM\nSOC\nPCB\nSKN", false, info_x, info_y+11, 11, renderer->a(settings.borderColor));
+
+				renderer->drawString(CPU_Load_c, false, info_x + 40, info_y+11, 11, renderer->a(settings.minFPSTextColor));
+				renderer->drawString(GPU_Load_c, false, info_x + 40, info_y+22, 11, renderer->a(settings.minFPSTextColor));
+				renderer->drawString(RAM_Load_c, false, info_x + 40, info_y+33, 11, renderer->a(settings.minFPSTextColor));
+				renderer->drawString(TEMP_c, false, info_x + 40, info_y+44, 11, renderer->a(settings.minFPSTextColor));
+			}
 		});
 
 		rootFrame->setContent(Status);
@@ -174,6 +195,10 @@ class com_FPSGraph : public tsl::Gui {
 	}
 
 	virtual void update() override {
+		cnt++;
+		if (cnt >= TeslaFPS)
+			cnt = 0;
+
 		///FPS
 		static float FPSavg_old = 0;
 		stats temp = {0, false};
@@ -196,7 +221,8 @@ class com_FPSGraph : public tsl::Gui {
 			}			
 		}
 		if (FPSavg_old == FPSavg)
-			return;
+			//return;
+			goto read_value;
 		FPSavg_old = FPSavg;
 		snprintf(FPSavg_c, sizeof FPSavg_c, "%2.1f",  FPSavg);
 		if (FPSavg < 254) {
@@ -230,7 +256,44 @@ class com_FPSGraph : public tsl::Gui {
 				isStarted = false;
 			}
 		}
+
+		read_value:
+
+		if (cnt)
+			return;
+
+		mutexLock(&mutex_Misc);
+		if (hosversionAtLeast(10,0,0)) {
+			snprintf(TEMP_c, sizeof TEMP_c, 
+				"%2.1f\u00B0C\n%2.1f\u00B0C\n%2d.%d\u00B0C", 
+				SOC_temperatureF, PCB_temperatureF, skin_temperaturemiliC / 1000, (skin_temperaturemiliC / 100) % 10);
+		}
+		else {
+			snprintf(TEMP_c, sizeof TEMP_c, 
+				"%2d.%d\u00B0C\n%2d.%d\u00B0C\n%2d.%d\u00B0C", 
+				SOC_temperatureC / 1000, (SOC_temperatureC / 100) % 10, 
+				PCB_temperatureC / 1000, (PCB_temperatureC % 100) % 10,
+				skin_temperaturemiliC / 1000, (skin_temperaturemiliC / 100) % 10);
+		}
+
+		if (idletick0 > systemtickfrequency_impl) idletick0 = systemtickfrequency_impl;
+		if (idletick1 > systemtickfrequency_impl) idletick1 = systemtickfrequency_impl;
+		if (idletick2 > systemtickfrequency_impl) idletick2 = systemtickfrequency_impl;
+		if (idletick3 > systemtickfrequency_impl) idletick3 = systemtickfrequency_impl;
+		double cpu_usage0 = (1.d - ((double)idletick0 / systemtickfrequency_impl)) * 100;
+		double cpu_usage1 = (1.d - ((double)idletick1 / systemtickfrequency_impl)) * 100;
+		double cpu_usage2 = (1.d - ((double)idletick2 / systemtickfrequency_impl)) * 100;
+		double cpu_usage3 = (1.d - ((double)idletick3 / systemtickfrequency_impl)) * 100;
+		double cpu_usageM = 0;
+		if (cpu_usage0 > cpu_usageM)	cpu_usageM = cpu_usage0;
+		if (cpu_usage1 > cpu_usageM)	cpu_usageM = cpu_usage1;
+		if (cpu_usage2 > cpu_usageM)	cpu_usageM = cpu_usage2;
+		if (cpu_usage3 > cpu_usageM)	cpu_usageM = cpu_usage3;
+		snprintf(CPU_Load_c, sizeof CPU_Load_c, "%.1f%%", cpu_usageM);
+		snprintf(GPU_Load_c, sizeof GPU_Load_c, "%d.%d%%", GPU_Load_u / 10, GPU_Load_u % 10);
+		snprintf(RAM_Load_c, sizeof RAM_Load_c, "%hu.%hhu%%", ramLoad[SysClkRamLoad_All] / 10, ramLoad[SysClkRamLoad_All] % 10);
 
+		mutexUnlock(&mutex_Misc);
 	}
 	virtual bool handleInput(uint64_t keysDown, uint64_t keysHeld, touchPosition touchInput, JoystickPosition leftJoyStick, JoystickPosition rightJoyStick) override {
 		if (isKeyComboPressed(keysHeld, keysDown, mappedButtons)) {