Fixed loading of external plugins in standalone mode

Duet3D · Sep 24, 2024 · 1bae13b · 1bae13b
1 parent 4ea7850
commit 1bae13b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/src/plugins/imports.ts b/src/plugins/imports.ts
@@ -5,16 +5,6 @@ import { initCollection } from "@duet3d/objectmodel";
 import DwcPlugin from "./DwcPlugin";
 
 export default initCollection(DwcPlugin, [
-	{
-        id: "ClosedLoopTuning",
-        name: "Closed Loop Tuning",
-        author: "Louis Irwin, Juan Rosario",
-        version: "3.6.0-beta.1",
-        loadDwcResources: () => import(
-            /* webpackChunkName: "ClosedLoopTuning" */
-            "./ClosedLoopTuning/index"
-        )
-    },
 	{
         id: "GCodeViewer",
         name: "G-Code Viewer",

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -12,7 +12,6 @@ import { closeNotifications, makeNotification } from "@/utils/notifications";
 import Path from "@/utils/path";
 
 import machine, { defaultMachine, MachineModule, MachineModuleState, MachineState } from "./machine";
-import MachineCallbacks from "./machine/callbacks";
 import observer from "./observer";
 import settings, { SettingsState } from "./settings";
 import uiInjection, { UiInjectionState } from "./uiInjection";
@@ -166,21 +165,7 @@ const store = new Vuex.Store<InternalRootState>({
 				commit("addMachine", { hostname, module });
 				commit("setSelectedMachine", hostname);
 
-				// Load machine settings
-				try {
-					await dispatch("machine/settings/load");
-				} catch (e) {
-					console.warn("Failed to load settings: " + getErrorMessage(e));
-				}
-
-				// Load cache
-				try {
-					await dispatch("machine/cache/load");
-				} catch (e) {
-					console.warn("Failed to load cache: " + getErrorMessage(e));
-				}
-
-				// Set up event callbacks
+				// Set up event callbacks before loading the settings
 				connectorInstance.setCallbacks({
 					onConnectProgress(connector: BaseConnector, progress: number) {
 						commit("setConnectingProgress", progress);
@@ -202,6 +187,20 @@ const store = new Vuex.Store<InternalRootState>({
 					}
 				});
 
+				// Load machine settings
+				try {
+					await dispatch("machine/settings/load");
+				} catch (e) {
+					console.warn("Failed to load settings: " + getErrorMessage(e));
+				}
+
+				// Load cache
+				try {
+					await dispatch("machine/cache/load");
+				} catch (e) {
+					console.warn("Failed to load cache: " + getErrorMessage(e));
+				}
+
 				// Perform post-connect tasks
 				logGlobal(LogType.success, i18n.t("events.connected", [hostname]));