Skip to content

Commit 93d4908

Browse files
committed
updated Mini Overlay
added "=" to voltages for better visual separation of lines, also added battery percentage, and tweaked lines a bit
1 parent a2907d7 commit 93d4908

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

source/modes/Mini.hpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ class MiniOverlay : public tsl::Gui {
6363
rectangleWidth = 0;
6464
for (std::string key : tsl::hlp::split(settings.show, '+')) {
6565
if (!key.compare("CPU")) {
66-
dimensions = renderer->drawString("[100%,100%,100%,100%]@4444.4", false, 0, 0, fontsize, renderer->a(0x0000));
66+
dimensions = renderer->drawString("100%,100%,100%,100%@1444.4", false, 0, 0, fontsize, renderer->a(0x0000));
6767
if (rectangleWidth < dimensions.first)
6868
rectangleWidth = dimensions.first;
6969
}
7070
else if (!key.compare("GPU") || (!key.compare("RAM") && settings.showRAMLoad && R_SUCCEEDED(sysclkCheck))) {
71-
dimensions = renderer->drawString("100.0%@4444.4", false, 0, fontsize, fontsize, renderer->a(0x0000));
71+
dimensions = renderer->drawString("100.0%@1444.4", false, 0, fontsize, fontsize, renderer->a(0x0000));
7272
if (rectangleWidth < dimensions.first)
7373
rectangleWidth = dimensions.first;
7474
}
@@ -83,7 +83,7 @@ class MiniOverlay : public tsl::Gui {
8383
rectangleWidth = dimensions.first;
8484
}
8585
else if (!key.compare("DRAW")) {
86-
dimensions = renderer->drawString("-44.44W[44:44]", false, 0, fontsize, fontsize, renderer->a(0x0000));
86+
dimensions = renderer->drawString("99.9%(-15.5W)[9:99]", false, 0, fontsize, fontsize, renderer->a(0x0000));
8787
if (rectangleWidth < dimensions.first)
8888
rectangleWidth = dimensions.first;
8989
}
@@ -141,7 +141,7 @@ class MiniOverlay : public tsl::Gui {
141141
else if (!key.compare("TEMP") && !(flags & 1 << 3)) {
142142
if (print_text[0])
143143
strcat(print_text, "\n");
144-
strcat(print_text, "TEMP");
144+
strcat(print_text, "BRD");
145145
entry_count++;
146146
if (settings.realVolts) {
147147
strcat(print_text, "\n");
@@ -152,7 +152,7 @@ class MiniOverlay : public tsl::Gui {
152152
else if (!key.compare("DRAW") && !(flags & 1 << 4)) {
153153
if (print_text[0])
154154
strcat(print_text, "\n");
155-
strcat(print_text, "DRAW");
155+
strcat(print_text, "PWR");
156156
entry_count++;
157157
flags |= (1 << 4);
158158
}
@@ -253,25 +253,25 @@ class MiniOverlay : public tsl::Gui {
253253
mutexLock(&mutex_Misc);
254254

255255
char MINI_CPU_compressed_c[42] = "";
256-
char MINI_CPU_volt_c[7] = "";
256+
char MINI_CPU_volt_c[10] = "";
257257
if (settings.realFrequencies && realCPU_Hz) {
258258
snprintf(MINI_CPU_compressed_c, sizeof(MINI_CPU_compressed_c),
259-
"[%s,%s,%s,%s]@%hu.%hhu",
259+
"%s,%s,%s,%s@%hu.%hhu",
260260
MINI_CPU_Usage0, MINI_CPU_Usage1, MINI_CPU_Usage2, MINI_CPU_Usage3,
261261
realCPU_Hz / 1000000, (realCPU_Hz / 100000) % 10);
262262
}
263263
else {
264264
snprintf(MINI_CPU_compressed_c, sizeof(MINI_CPU_compressed_c),
265-
"[%s,%s,%s,%s]@%hu.%hhu",
265+
"%s,%s,%s,%s@%hu.%hhu",
266266
MINI_CPU_Usage0, MINI_CPU_Usage1, MINI_CPU_Usage2, MINI_CPU_Usage3,
267267
CPU_Hz / 1000000, (CPU_Hz / 100000) % 10);
268268
}
269269
if (settings.realVolts) {
270-
snprintf(MINI_CPU_volt_c, sizeof(MINI_CPU_volt_c), "%umV", realCPU_mV);
270+
snprintf(MINI_CPU_volt_c, sizeof(MINI_CPU_volt_c), "=%umV", realCPU_mV);
271271
}
272272

273273
char MINI_GPU_Load_c[14];
274-
char MINI_GPU_volt_c[7] = "";
274+
char MINI_GPU_volt_c[10] = "";
275275
if (settings.realFrequencies && realGPU_Hz) {
276276
snprintf(MINI_GPU_Load_c, sizeof(MINI_GPU_Load_c),
277277
"%hu.%hhu%%@%hu.%hhu",
@@ -285,12 +285,12 @@ class MiniOverlay : public tsl::Gui {
285285
GPU_Hz / 1000000, (GPU_Hz / 100000) % 10);
286286
}
287287
if (settings.realVolts) {
288-
snprintf(MINI_GPU_volt_c, sizeof(MINI_GPU_volt_c), "%umV", realGPU_mV);
288+
snprintf(MINI_GPU_volt_c, sizeof(MINI_GPU_volt_c), "=%umV", realGPU_mV);
289289
}
290290

291291
///RAM
292292
char MINI_RAM_var_compressed_c[19] = "";
293-
char MINI_RAM_volt_c[12] = "";
293+
char MINI_RAM_volt_c[15] = "";
294294
if (R_FAILED(sysclkCheck) || !settings.showRAMLoad) {
295295
float RAM_Total_application_f = (float)RAM_Total_application_u / 1024 / 1024;
296296
float RAM_Total_applet_f = (float)RAM_Total_applet_u / 1024 / 1024;
@@ -330,7 +330,7 @@ class MiniOverlay : public tsl::Gui {
330330
}
331331
}
332332
if (settings.realVolts) {
333-
snprintf(MINI_RAM_volt_c, sizeof(MINI_RAM_volt_c), "%u/%umV", realRAM_mV/10000, realRAM_mV%10000);
333+
snprintf(MINI_RAM_volt_c, sizeof(MINI_RAM_volt_c), "=%u/%umV", realRAM_mV/10000, realRAM_mV%10000);
334334
}
335335

336336
///Thermal
@@ -347,10 +347,10 @@ class MiniOverlay : public tsl::Gui {
347347
PCB_temperatureC / 1000, (PCB_temperatureC / 100) % 10,
348348
skin_temperaturemiliC / 1000, (skin_temperaturemiliC / 100) % 10);
349349
}
350-
char MINI_SOC_volt_c[7] = "";
350+
char MINI_SOC_volt_c[10] = "";
351351
snprintf(Rotation_SpeedLevel_c, sizeof Rotation_SpeedLevel_c, "%2.1f%%", Rotation_SpeedLevel_f * 100);
352352
if (settings.realVolts) {
353-
snprintf(MINI_SOC_volt_c, sizeof(MINI_SOC_volt_c), "%umV", realSOC_mV);
353+
snprintf(MINI_SOC_volt_c, sizeof(MINI_SOC_volt_c), "=%umV", realSOC_mV);
354354
}
355355

356356
///FPS
@@ -438,7 +438,7 @@ class MiniOverlay : public tsl::Gui {
438438
}
439439
else snprintf(remainingBatteryLife, sizeof remainingBatteryLife, "--:--");
440440

441-
snprintf(SoCPCB_temperature_c, sizeof SoCPCB_temperature_c, "%0.2fW[%s]", PowerConsumption, remainingBatteryLife);
441+
snprintf(SoCPCB_temperature_c, sizeof SoCPCB_temperature_c, "%.1f%s(%+.1fW)[%s]", (float)_batteryChargeInfoFields.RawBatteryCharge / 1000, "%", PowerConsumption, remainingBatteryLife);
442442
mutexUnlock(&mutex_BatteryChecker);
443443

444444
}

0 commit comments

Comments
 (0)