From 208c2e2c3364000992dd4c9bb9e5dd549caaf19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rik=20Levente?= Date: Wed, 20 Dec 2023 21:45:40 +0100 Subject: [PATCH] Update CPU page graphs --- interface/pages/cpu.svelte | 138 +++++++++++++++++++++++++++---------- 1 file changed, 101 insertions(+), 37 deletions(-) diff --git a/interface/pages/cpu.svelte b/interface/pages/cpu.svelte index 99967d8..c54093d 100644 --- a/interface/pages/cpu.svelte +++ b/interface/pages/cpu.svelte @@ -32,12 +32,35 @@ -
- value.cpu.temperature) - : $hardwareStatistics.seconds.map((value) => value.cpu.temperature)} - time={minutes ? "m" : "s"} +
+ value.cpu.temperature.max) + : $hardwareStatistics.seconds.map((value) => value.cpu.temperature.max), + }, + { + label: "Current Temperature", + color: "current", + data: minutes + ? $hardwareStatistics.minutes.map((value) => value.cpu.temperature.value) + : $hardwareStatistics.seconds.map((value) => value.cpu.temperature.value), + }, + { + label: "Min Temperature", + color: "min", + data: minutes + ? $hardwareStatistics.minutes.map((value) => value.cpu.temperature.min) + : $hardwareStatistics.seconds.map((value) => value.cpu.temperature.min), + }, + ], + time: minutes ? "m" : "s", + unit: " °C", + }} />
@@ -57,13 +80,34 @@
- value.cpu.clock) - : $hardwareStatistics.seconds.map((value) => value.cpu.clock)} - time={minutes ? "m" : "s"} + value.cpu.clock.max) + : $hardwareStatistics.seconds.map((value) => value.cpu.clock.max), + }, + { + label: "Current Clock Speed", + color: "current", + data: minutes + ? $hardwareStatistics.minutes.map((value) => value.cpu.clock.value) + : $hardwareStatistics.seconds.map((value) => value.cpu.clock.value), + }, + { + label: "Min Clock Speed", + color: "min", + data: minutes + ? $hardwareStatistics.minutes.map((value) => value.cpu.clock.min) + : $hardwareStatistics.seconds.map((value) => value.cpu.clock.min), + }, + ], + time: minutes ? "m" : "s", + unit: " Mhz", + }} />
@@ -86,13 +130,19 @@
value.cpu.power) - : $hardwareStatistics.seconds.map((value) => value.cpu.power)} - type={"Power usage"} - unit={" W"} - color={"#ffd60a"} - time={minutes ? "m" : "s"} + props={{ + statistics: [ + { + label: "Power Usage", + color: "yellow", + data: minutes + ? $hardwareStatistics.minutes.map((value) => value.cpu.power) + : $hardwareStatistics.seconds.map((value) => value.cpu.power), + }, + ], + time: minutes ? "m" : "s", + unit: " W", + }} />
@@ -112,13 +162,23 @@
- value.cpu.load) - : $hardwareStatistics.seconds.map((value) => value.cpu.load)} - type={"Load"} - unit={"%"} - time={minutes ? "m" : "s"} + value.cpu.load) + : $hardwareStatistics.seconds.map((value) => value.cpu.load), + }, + ], + time: minutes ? "m" : "s", + unit: "%", + min: 0, + max: 100, + }} />
@@ -139,13 +199,19 @@
value.cpu.voltage) - : $hardwareStatistics.seconds.map((value) => value.cpu.voltage)} - type={"Voltage"} - unit={" V"} - color={"#ffd60a"} - time={minutes ? "m" : "s"} + props={{ + statistics: [ + { + label: "Voltage", + color: "orange", + data: minutes + ? $hardwareStatistics.minutes.map((value) => value.cpu.voltage) + : $hardwareStatistics.seconds.map((value) => value.cpu.voltage), + }, + ], + time: minutes ? "m" : "s", + unit: " V", + }} />
@@ -154,9 +220,7 @@