Merge remote-tracking branch 'Masa/master'

redraz · redraz · commit e473256d7447 · 2024-06-25T20:32:03.000+03:00
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
 APP_TITLE	:=	Status Monitor
-APP_VERSION	:=	1.0.3
+APP_VERSION	:=	1.0.4U
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source
@@ -56,7 +56,7 @@ CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__ -DAPP_VERSION="\"$(APP_VERSION)\""
 
-CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=c++20 -Wno-dangling-else
+CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=c++23 -Wno-dangling-else
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
diff --git a/config/status-monitor/config.ini.template b/config/status-monitor/config.ini.template
@@ -1,11 +1,14 @@
 [status-monitor]
-key_combo=L+R+DUP
+ultra=true
 battery_avg_iir_filter=false
 battery_time_left_refreshrate=60
 
 [full]
 refresh_rate=1
 layer_width_align=left
+show_real_freqs=true
+show_deltas=true
+show_target_freqs=true
 
 [mini]
 refresh_rate=1
@@ -15,7 +18,7 @@ handheld_font_size=15
 docked_font_size=15
 real_freqs=true
 real_volts=true
-show=CPU+GPU+RAM+DRAW+TEMP+FAN+FPS
+show=CPU+GPU+RAM+TEMP+FAN+DRAW+FPS
 replace_MB_with_RAM_load=true
 background_color=#1117
 cat_color=#CDEF
@@ -24,16 +27,16 @@ text_color=#FFFF
 [micro]
 refresh_rate=1
 layer_height_align=top
-handheld_font_size=17
-docked_font_size=17
+handheld_font_size=15
+docked_font_size=15
 text_align=left
 real_freqs=true
-real_volts=false
-show=CPUB+GPU+RAM+BRDB+BATB+FPSE
+real_volts=true
+show=CPUB+GPU+RAM+BRDB+FPSE
 replace_GB_with_RAM_load=true
-background_color=#1117
-cat_color=#CCCC
-text_color=#FFFD
+background_color=#1113
+cat_color=#BDFF
+text_color=#FFFF
 
 [fps-counter]
 layer_width_align=left
@@ -53,5 +56,5 @@ fps_counter_color=#4444
 border_color=#F77F
 dashed_line_color=#8888
 main_line_color=#FFFF
-rounded_line_color=#F0FF
-perfect_line_color=#0C0F
+rounded_line_color=#0C0F
+perfect_line_color=#F0FF
diff --git a/docs/config.md b/docs/config.md
@@ -11,7 +11,7 @@ Colors are provided in RGBA4444 format, which means that each character represen
 
 | Key | Explanation | Possible values | Default Value |
 |-----|-------------|-----------------|---------------|
-| `key_combo` | Buttons combination that allows exiting Full, Mini and Micro modes; max 4 buttons, otherwise next buttons will be ignored. Combine different buttons with `+` | `A`, `B`, `X`, `Y`, `L`, `R`, `ZL`, `ZR`, `PLUS`, `MINUS`, `DUP`, `DDOWN`, `DLEFT`, `DRIGHT`, `SL`, `SR`, `LSTICK`, `RSTICK`, `UP`, `DOWN`, `LEFT`, `RIGHT` | `L+DDOWN+RSTICK` |
+| `key_combo` | Buttons combination that allows exiting Full, Mini, Micro, FPS Graph and FPS Counter modes; max 4 buttons, otherwise next buttons will be ignored. Combine different buttons with `+` | `A`, `B`, `X`, `Y`, `L`, `R`, `ZL`, `ZR`, `PLUS`, `MINUS`, `DUP`, `DDOWN`, `DLEFT`, `DRIGHT`, `SL`, `SR`, `LSTICK`, `RSTICK`, `UP`, `DOWN`, `LEFT`, `RIGHT` | `L+DDOWN+RSTICK` |
 | `battery_avg_iir_filter` | Read voltage + current averages directly from fuel gauge, that uses infinite impulse response filter | `true`, `false` | `false` |
 | `battery_time_left_refreshrate` | How many seconds must pass to refresh Battery Remaining Time | from `1` to `60` | `60` |
 
@@ -50,6 +50,7 @@ Colors are provided in RGBA4444 format, which means that each character represen
 | `layer_height_align` | On which side of the screen Y axis you want this mode | `top`, `bottom` | `top` |
 | `handheld_font_size` | How big should be rendered text in handheld mode | From `8` to `18` | `18` |
 | `docked_font_size` | How big should be rendered text in docked mode | From `8` to `18` | `18` |
+| `text_align` | How shown text should be aligned | `left`, `center`, `right`| `center` |
 | `real_freqs` | This works only if you have sys-clk 2.0.0_rc4+ installed. It shows real frequencies for CPU, GPU and RAM instead of target frequencies | `true`, `false` | `false` |
 | `show` | Which data should be rendered. Connect different stats with `+` in any order. | `CPU`, `GPU`, `RAM`, `BRD`, `FAN`, `FPS` | `CPU+GPU+RAM+BRD+FAN+FPS` |
 | `replace_GB_with_RAM_load` | This works only if you have sys-clk 2.0.0_rc4+ installed. Instead of RAM total usage it shows RAM load. | `true`, `false` | `true` |
@@ -82,5 +83,5 @@ Colors are provided in RGBA4444 format, which means that each character represen
 | `border_color` | Color of rectangle in RGBA4444 format | From `#0000` to `#FFFF` | `#F77F` |
 | `dashed_line_color` | Color of dashed line at the center of rectangle in RGBA4444 format | From `#0000` to `#FFFF` | `#8888` |
 | `main_line_color` | Color of line representing FPS value on graph in RGBA4444 format | From `#0000` to `#FFFF` | `#FFFF` |
-| `rounded_line_color` | Color of line representing FPS value on graph if it's divisble by 10 in RGBA4444 format | From `#0000` to `#FFFF` | `#0C0F` |
-| `perfect_line_color` | Color of line representing FPS value on graph if it's divisble by 30 in RGBA4444 format | From `#0000` to `#FFFF` | `#F0FF` |
+| `rounded_line_color` | Color of line representing FPS value on graph if it's divisble by 10 in RGBA4444 format | From `#0000` to `#FFFF` | `#F0FF` |
+| `perfect_line_color` | Color of line representing FPS value on graph if it's divisble by 30 in RGBA4444 format | From `#0000` to `#FFFF` | `#0C0F` |
diff --git a/docs/modes.md b/docs/modes.md
@@ -106,7 +106,9 @@ If game is not launched, it will show always 254.0 value and graph will be empty
 If game is not rendering any new frame, graph is not updated.
 
 If line is within rounding error of graph line, it's colored. Average FPS must be between -0.05 and +0.04 of graph line target FPS. So for 30 FPS it's between 29.95 - 30.04 FPS. For 43 FPS it's 42.95 - 43.04 FPS.
-If it's in 30 or 60 FPS rounding error range, it's green. Any other FPS graph target is purple.
+If it's in display refresh rate or half of it rounding error range, it's green. Any other FPS graph target is purple.
+
+Colors can be changed in config file.
 
 Mode available only with SaltyNX installed.
 
diff --git a/include/SaltyNX.h b/include/SaltyNX.h
@@ -141,5 +141,91 @@ Result SaltySD_GetSharedMemoryHandle(Handle *retrieve)
 		}
 	}
 	
+	return ret;
+}
+
+Result SaltySD_GetDisplayRefreshRate(uint8_t* refreshRate)
+{
+	Result ret = 0;
+
+	// Send a command
+	IpcCommand c;
+	ipcInitialize(&c);
+	ipcSendPid(&c);
+
+	struct input {
+		u64 magic;
+		u64 cmd_id;
+		u64 zero;
+		u64 reserved;
+	} *raw;
+
+	raw = (input*)ipcPrepareHeader(&c, sizeof(*raw));
+
+	raw->magic = SFCI_MAGIC;
+	raw->cmd_id = 10;
+	raw->zero = 0;
+
+	ret = ipcDispatch(saltysd_orig);
+
+	if (R_SUCCEEDED(ret)) {
+		IpcParsedCommand r;
+		ipcParse(&r);
+
+		struct output {
+			u64 magic;
+			u64 result;
+			u64 refreshRate;
+			u64 reserved;
+		} *resp = (output*)r.Raw;
+
+		ret = resp->result;
+		
+		if (!ret)
+		{
+			*refreshRate = (uint8_t)(resp->refreshRate);
+		}
+	}
+	
+	return ret;
+}
+
+Result SaltySD_SetDisplayRefreshRate(uint8_t refreshRate)
+{
+	Result ret = 0;
+
+	// Send a command
+	IpcCommand c;
+	ipcInitialize(&c);
+	ipcSendPid(&c);
+
+	struct input {
+		u64 magic;
+		u64 cmd_id;
+		u64 refreshRate;
+		u64 reserved;
+	} *raw;
+
+	raw = (input*)ipcPrepareHeader(&c, sizeof(*raw));
+
+	raw->magic = SFCI_MAGIC;
+	raw->cmd_id = 11;
+	raw->refreshRate = refreshRate;
+
+	ret = ipcDispatch(saltysd_orig);
+
+	if (R_SUCCEEDED(ret)) {
+		IpcParsedCommand r;
+		ipcParse(&r);
+
+		struct output {
+			u64 magic;
+			u64 result;
+			u64 reserved[2];
+		} *resp = (output*)r.Raw;
+
+		ret = resp->result;
+	}
+	
 	return ret;
 }
diff --git a/source/Utils.hpp b/source/Utils.hpp
@@ -158,6 +158,21 @@ uint32_t realGPU_mV = 0;
 uint32_t realRAM_mV = 0;
 uint32_t realSOC_mV = 0;
 uint32_t ramLoad[SysClkRamLoad_EnumMax];
+uint8_t refreshRate = 0;
+
+void LoadSharedMemoryAndRefreshRate() {
+	if (SaltySD_Connect())
+		return;
+
+	SaltySD_GetSharedMemoryHandle(&remoteSharedMemory);
+	SaltySD_GetDisplayRefreshRate(&refreshRate);
+	SaltySD_Term();
+
+	shmemLoadRemote(&_sharedmemory, remoteSharedMemory, 0x1000, Perm_Rw);
+	if (!shmemMap(&_sharedmemory))
+		SharedMemoryUsed = true;
+	else FPS = 1234;
+}
 
 void LoadSharedMemory() {
 	if (SaltySD_Connect())
@@ -463,7 +478,7 @@ void Misc(void*) {
 		}
 		// Interval
 		mutexUnlock(&mutex_Misc);
-		svcSleepThread(100'000'000);
+		svcSleepThread(TeslaFPS < 10 ? (1'000'000'000 / TeslaFPS) : 100'000'000);
 	}
 }
 
@@ -647,7 +662,9 @@ void formatButtonCombination(std::string& line) {
 		{"PLUS", "\uE0EF"},
 		{"MINUS", "\uE0F0"},
 		{"LSTICK", "\uE104"},
-		{"RSTICK", "\uE105"}
+		{"RSTICK", "\uE105"},
+		{"RS", "\uE105"},
+		{"LS", "\uE104"}
 	};
 	// Remove all spaces from the line
 	line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
@@ -708,10 +725,12 @@ uint64_t MapButtons(const std::string& buttonCombo) {
 		{"SR", HidNpadButton_AnySR},
 		{"LSTICK", HidNpadButton_StickL},
 		{"RSTICK", HidNpadButton_StickR},
-		{"UP", HidNpadButton_Up},
-		{"DOWN", HidNpadButton_Down},
-		{"LEFT", HidNpadButton_Left},
-		{"RIGHT", HidNpadButton_Right}
+		{"LS", HidNpadButton_StickL},
+		{"RS", HidNpadButton_StickR},
+		{"UP", HidNpadButton_AnyUp},
+		{"DOWN", HidNpadButton_AnyDown},
+		{"LEFT", HidNpadButton_AnyLeft},
+		{"RIGHT", HidNpadButton_AnyRight}
 	};
 
 	uint64_t comboBitmask = 0;
@@ -947,7 +966,7 @@ void GetConfigSettings(MiniSettings* settings) {
 	convertStrToRGBA4444("#1117", &(settings -> backgroundColor));
 	convertStrToRGBA4444("#FFFF", &(settings -> catColor));
 	convertStrToRGBA4444("#FFFF", &(settings -> textColor));
-	settings -> show = "CPU+GPU+RAM+DRAW+TEMP+FAN+FPS";
+	settings -> show = "CPU+GPU+RAM+TEMP+DRAW+FAN+FPS";
 	settings -> showRAMLoad = true;
 	settings -> refreshRate = 1;
 
@@ -991,7 +1010,7 @@ void GetConfigSettings(MiniSettings* settings) {
 		settings -> realVolts = !(key.compare("TRUE")); 
 	}
 
-	long maxFontSize = 32;
+	long maxFontSize = 22;
 	long minFontSize = 8;
 	if (parsedData["mini"].find("handheld_font_size") != parsedData["mini"].end()) {
 		key = parsedData["mini"]["handheld_font_size"];
@@ -1127,7 +1146,7 @@ void GetConfigSettings(MicroSettings* settings) {
 			settings -> alignTo = 2;
 		}
 	}
-	long maxFontSize = 28;
+	long maxFontSize = 18;
 	long minFontSize = 8;
 	if (parsedData["micro"].find("handheld_font_size") != parsedData["micro"].end()) {
 		key = parsedData["micro"]["handheld_font_size"];
diff --git a/source/main.cpp b/source/main.cpp
@@ -1,6 +1,7 @@
 #define TESLA_INIT_IMPL
 #include <tesla.hpp>
 #include "Utils.hpp"
+#include <cstdlib>
 
 static tsl::elm::OverlayFrame* rootFrame = nullptr;
 static bool skipMain = false;
@@ -229,7 +230,7 @@ class MonitorOverlay : public tsl::Overlay {
 			SaltySD = CheckPort();
 
 			if (SaltySD) {
-				LoadSharedMemory();
+				LoadSharedMemoryAndRefreshRate();
 			}
 			if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
 				uint32_t sysClkApiVer = 0;
diff --git a/source/modes/FPS_Graph.hpp b/source/modes/FPS_Graph.hpp
diff --git a/source/modes/Micro.hpp b/source/modes/Micro.hpp
