Skip to content

Commit a2414e7

Browse files
authored
Making System Metric's PSRAM chart creation conditional (#95)
* Fixed PSRAM chart creation * Fixed PSRAM metric
1 parent b5ea1da commit a2414e7

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

interface/src/routes/system/metrics/SystemMetrics.svelte

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
2-
import { onDestroy, onMount } from 'svelte';
3-
import { page } from '$app/state';
2+
import { onMount } from 'svelte';
43
import SettingsCard from '$lib/components/SettingsCard.svelte';
54
import { slide } from 'svelte/transition';
65
import { cubicOut } from 'svelte/easing';
@@ -11,18 +10,21 @@
1110
1211
Chart.register(...registerables);
1312
14-
let heapChartElement: HTMLCanvasElement = $state();
13+
let heapChartElement: HTMLCanvasElement | undefined = $state();
1514
let heapChart: Chart;
1615
17-
let psramChartElement: HTMLCanvasElement = $state();
16+
let psramChartElement: HTMLCanvasElement | undefined = $state();
1817
let psramChart: Chart;
1918
20-
let filesystemChartElement: HTMLCanvasElement = $state();
19+
let filesystemChartElement: HTMLCanvasElement | undefined = $state();
2120
let filesystemChart: Chart;
2221
23-
let temperatureChartElement: HTMLCanvasElement = $state();
22+
let temperatureChartElement: HTMLCanvasElement | undefined = $state();
2423
let temperatureChart: Chart;
2524
25+
// Check if PSRAM data is available
26+
let hasPsramData = $derived(Math.max(...$analytics.psram_size) > 0);
27+
2628
onMount(() => {
2729
heapChart = new Chart(heapChartElement, {
2830
type: 'line',
@@ -97,7 +99,10 @@
9799
}
98100
}
99101
});
100-
psramChart = new Chart(psramChartElement, {
102+
103+
// Only create PSRAM chart if PSRAM data is available
104+
if (hasPsramData) {
105+
psramChart = new Chart(psramChartElement, {
101106
type: 'line',
102107
data: {
103108
labels: $analytics.uptime,
@@ -107,7 +112,7 @@
107112
borderColor: daisyColor('--color-primary'),
108113
backgroundColor: daisyColor('--color-primary', 50),
109114
borderWidth: 2,
110-
data: $analytics.free_psram,
115+
data: $analytics.used_psram,
111116
yAxisID: 'y'
112117
}
113118
]
@@ -162,6 +167,8 @@
162167
}
163168
}
164169
});
170+
}
171+
165172
filesystemChart = new Chart(filesystemChartElement, {
166173
type: 'line',
167174
data: {
@@ -304,7 +311,7 @@
304311
heapChart.update('none');
305312
heapChart.options.scales.y.max = Math.round(Math.max(...$analytics.total_heap));
306313
307-
if (Math.max(...$analytics.psram_size)) {
314+
if (hasPsramData) {
308315
psramChart.data.labels = $analytics.uptime;
309316
psramChart.data.datasets[0].data = $analytics.used_psram;
310317
psramChart.update('none');
@@ -365,7 +372,7 @@
365372
<canvas bind:this={heapChartElement}></canvas>
366373
</div>
367374
</div>
368-
{#if Math.max(...$analytics.psram_size)}
375+
{#if hasPsramData}
369376
<div class="w-full overflow-x-auto">
370377
<div
371378
class="flex w-full flex-col space-y-1 h-60"

0 commit comments

Comments
 (0)