Merge remote-tracking branch 'theelims/main'

Author: ewowi

CHANGELOG.md

@@ -25,6 +25,7 @@ All notable changes to this project will be documented in this file.
 - Refactor System Status and Metrics, added PSRAM [#79](https://github.com/theelims/ESP32-sveltekit/pull/79)
 - Add /rest/coreDump endpoint [#87](https://github.com/theelims/ESP32-sveltekit/pull/87)
 - Rate limiting for MQTT publish messages. Can be configured as factory setting or at runtime. `0` will disable the rate limiting.
+- Added [discord](https://discord.gg/MTn9mVUG5n) invite to readme.md and docs.
 - Added build flag `-D TELEPLOT_TASKS` to plot task heap high water mark with teleplot. You can include this in your tasks as well:
 
 ```cpp
@@ -61,6 +62,7 @@ All notable changes to this project will be documented in this file.
 - Fixed bug in WiFiSettingsService preventing discovery of networks other than the first
 - Fixed mixup pull up and pull down when configuring wake up pin in SleepService.cpp
 - Wifi: Multiple edits bug resolved [#79](https://github.com/theelims/ESP32-sveltekit/pull/79)
+- Fixed broken link to Adafruit SSL Cert Store [#93](https://github.com/theelims/ESP32-sveltekit/pull/93)
 
 ### Removed
 

docs/buildprocess.md

@@ -162,7 +162,7 @@ board_build.embed_files = src/certs/x509_crt_bundle.bin
 board_ssl_cert_source = adafruit
 ```
 
-The script will download a public certificate store from Mozilla (`board_ssl_cert_source = mozilla`) or a repository curated by Adafruit (`board_ssl_cert_source = adafruit`), builds a binary containing all certs and embeds this into the firmware. This will add ~65kb to the firmware image. Should you only need a few known certificates you can place their `*.pem` or `*.der` files in the [ssl_certs](https://github.com/theelims/ESP32-sveltekit/blob/main/ssl_certs) folder and change `board_ssl_cert_source = folder`. Then only these certificates will be included in the store. This is especially useful, if you only need to connect to know servers and need to shave some kb off the firmware image:
+The script will download a public certificate store from Mozilla (`board_ssl_cert_source = mozilla`) or a repository curated by Adafruit (`board_ssl_cert_source = adafruit`) or (`board_ssl_cert_source = adafruit-full`), builds a binary containing all certs and embeds this into the firmware. This will add ~65kb to the firmware image. Should you only need a few known certificates you can place their `*.pem` or `*.der` files in the [ssl_certs](https://github.com/theelims/ESP32-sveltekit/blob/main/ssl_certs) folder and change `board_ssl_cert_source = folder`. Then only these certificates will be included in the store. This is especially useful, if you only need to connect to know servers and need to shave some kb off the firmware image:
 
 !!! info
 

docs/develop/development.md

@@ -33,7 +33,7 @@
 * CI automation (Generate daily builds in Github and use by installer)
 * Palettes: more, custom, audio reactive
 
-Contact us in the MoonLight channels on [Discord MoonModules](https://discord.gg/4rSTthvKHe)
+Contact us in the MoonLight channels on [Discord MoonModules](https://discord.gg/TC8NSUSCdV)
 
 ## Pull Requests
 

factory_settings.ini

@@ -37,7 +37,7 @@ build_flags =
 
   ; MQTT settings
   -D FACTORY_MQTT_ENABLED=false
-  -D FACTORY_MQTT_URI=\"mqtts://mqtt.eclipseprojects.io:8883\"
+  -D FACTORY_MQTT_URI=\"mqtts://broker.hivemq.com:8883\"
   -D FACTORY_MQTT_USERNAME=\"\" ; supports placeholders
   -D FACTORY_MQTT_PASSWORD=\"\"
   -D FACTORY_MQTT_CLIENT_ID=\"#{platform}-#{unique_id}\" ; supports placeholders

interface/src/routes/menu.svelte

@@ -30,7 +30,7 @@
 
 	const github = { href: 'https://github.com/' + page.data.github, active: true };
 
-	const discord = { href: '.', active: false };
+	const discord = { href: 'https://discord.gg/TC8NSUSCdV', active: true };
 
 	type menuItem = {
 		title: string;

interface/src/routes/system/coredump/+page.ts

@@ -0,0 +1,5 @@
+import type { PageLoad } from './$types';
+
+export const load = (async () => {
+	return { title: 'Core Dump' };
+}) satisfies PageLoad;

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

@@ -1,6 +1,5 @@
 <script lang="ts">
-	import { onDestroy, onMount } from 'svelte';
-	import { page } from '$app/state';
+	import { onMount } from 'svelte';
 	import SettingsCard from '$lib/components/SettingsCard.svelte';
 	import { slide } from 'svelte/transition';
 	import { cubicOut } from 'svelte/easing';
@@ -13,21 +12,24 @@
 	Chart.register(...registerables);
 
 	// 🌙
-	let lpsChartElement: HTMLCanvasElement = $state();
+	let lpsChartElement: HTMLCanvasElement | undefined = $state();
 	let lpsChart: Chart;
 
-	let heapChartElement: HTMLCanvasElement = $state();
+	let heapChartElement: HTMLCanvasElement | undefined = $state();
 	let heapChart: Chart;
 
-	let psramChartElement: HTMLCanvasElement = $state();
+	let psramChartElement: HTMLCanvasElement | undefined = $state();
 	let psramChart: Chart;
 
-	let filesystemChartElement: HTMLCanvasElement = $state();
+	let filesystemChartElement: HTMLCanvasElement | undefined = $state();
 	let filesystemChart: Chart;
 
-	let temperatureChartElement: HTMLCanvasElement = $state();
+	let temperatureChartElement: HTMLCanvasElement | undefined = $state();
 	let temperatureChart: Chart;
 
+	// Check if PSRAM data is available
+	let hasPsramData = $derived(Math.max(...$analytics.psram_size) > 0);
+
 	onMount(() => {
 		// 🌙
 		lpsChart = new Chart(lpsChartElement, {
@@ -168,7 +170,10 @@
 				}
 			}
 		});
-		psramChart = new Chart(psramChartElement, {
+		
+		// Only create PSRAM chart if PSRAM data is available
+		if (hasPsramData) {
+			psramChart = new Chart(psramChartElement, {
 			type: 'line',
 			data: {
 				labels: $analytics.uptime,
@@ -178,7 +183,7 @@
 						borderColor: daisyColor('--color-primary'),
 						backgroundColor: daisyColor('--color-primary', 50),
 						borderWidth: 2,
-						data: $analytics.free_psram,
+						data: $analytics.used_psram,
 						yAxisID: 'y'
 					}
 				]
@@ -233,6 +238,8 @@
 				}
 			}
 		});
+		}
+		
 		filesystemChart = new Chart(filesystemChartElement, {
 			type: 'line',
 			data: {
@@ -381,7 +388,7 @@
 		heapChart.update('none');
 		heapChart.options.scales.y.max = Math.round(Math.max(...$analytics.total_heap));
 
-		if (Math.max(...$analytics.psram_size)) {
+		if (hasPsramData) {
 			psramChart.data.labels = $analytics.uptime;
 			psramChart.data.datasets[0].data = $analytics.used_psram;
 			psramChart.update('none');
@@ -451,7 +458,7 @@
 			<canvas bind:this={heapChartElement}></canvas>
 		</div>
 	</div>
-	{#if Math.max(...$analytics.psram_size)}
+	{#if hasPsramData}
 		<div class="w-full overflow-x-auto">
 			<div
 				class="flex w-full flex-col space-y-1 h-60"

lib/framework/WiFiSettingsService.h

@@ -106,11 +106,11 @@ class WiFiSettings
             wifiNetwork["static_ip_config"] = wifi.staticIPConfig;
 
             // extended settings
-            JsonUtils::writeIP(root, "local_ip", wifi.localIP);
-            JsonUtils::writeIP(root, "gateway_ip", wifi.gatewayIP);
-            JsonUtils::writeIP(root, "subnet_mask", wifi.subnetMask);
-            JsonUtils::writeIP(root, "dns_ip_1", wifi.dnsIP1);
-            JsonUtils::writeIP(root, "dns_ip_2", wifi.dnsIP2);
+            JsonUtils::writeIP(wifiNetwork, "local_ip", wifi.localIP);
+            JsonUtils::writeIP(wifiNetwork, "gateway_ip", wifi.gatewayIP);
+            JsonUtils::writeIP(wifiNetwork, "subnet_mask", wifi.subnetMask);
+            JsonUtils::writeIP(wifiNetwork, "dns_ip_1", wifi.dnsIP1);
+            JsonUtils::writeIP(wifiNetwork, "dns_ip_2", wifi.dnsIP2);
         }
 
         ESP_LOGV(SVK_TAG, "WiFi Settings read");

scripts/generate_cert_bundle.py

@@ -35,9 +35,8 @@
 
 ca_bundle_bin_file = 'x509_crt_bundle.bin'
 mozilla_cacert_url = 'https://curl.se/ca/cacert.pem'
-# adafruit_cacert_url = 'https://raw.githubusercontent.com/adafruit/certificates/main/data/roots.pem'
-# adafruit_cacert_url = 'https://raw.githubusercontent.com/adafruit/certificates/main/data/roots-full.pem'
-adafruit_cacert_url = 'https://raw.githubusercontent.com/adafruit/certificates/main/data/roots-filtered.pem'
+adafruit_filtered_cacert_url = 'https://raw.githubusercontent.com/adafruit/certificates/main/data/roots-filtered.pem'
+adafruit_full_cacert_url = 'https://raw.githubusercontent.com/adafruit/certificates/main/data/roots-full.pem'
 certs_dir = Path("./ssl_certs")
 binary_dir = Path("./src/certs")
 
@@ -47,7 +46,9 @@ def download_cacert_file(source):
     if source == "mozilla":
         response = requests.get(mozilla_cacert_url)
     elif source == "adafruit":
-        response = requests.get(adafruit_cacert_url)
+        response = requests.get(adafruit_filtered_cacert_url)
+    elif source == "adafruit-full":
+        response = requests.get(adafruit_full_cacert_url)
     else:
         raise InputError('Invalid certificate source')