Merge remote-tracking branch 'DuetWebControl/v3.3-dev'

Author: Sindarius

WHATS_NEW.md

@@ -1,15 +1,26 @@
 Summary of important changes in recent versions
 ===============================================
 
-Version 3.3-rc3
-===========
+Version 3.3.0
+=============
 
 Upgrade notes since version 3.2:
 - Saved G-codes from the inputs are no longer saved on the Duet to avoid excessive SD card wear
 - This will be the last DWC version that remains compatible with old-style status responses
 
 Compatible versions:
-- DuetSoftwareFramework 3.3
+- DuetSoftwareFramework 3.3.0
+- RepRapFirmware 2 or newer (1.2x may work but untested)
+
+Bug fixes:
+- Layers chart was only cleared when the layer variable was set
+- Plugin upgrades were not working in standalone mode
+
+Version 3.3-rc3
+===============
+
+Compatible versions:
+- DuetSoftwareFramework 3.3-rc3
 - RepRapFirmware 2 or newer (1.2x may work but untested)
 
 Changed behaviour:
@@ -25,7 +36,7 @@ Bug fixes:
 - Cache for simulated files was not properly cleared
 
 Version 3.3-rc2
-==============
+===============
 
 Compatible versions:
 - DuetSoftwareFramework 3.3-rc2
@@ -39,7 +50,7 @@ Bug fixes:
 - Added new `Disconnected` state to indicate when DWC is not connected to RRF
 
 Version 3.3-rc1
-==============
+===============
 
 Compatible versions:
 - DuetSoftwareFramework 3.3-rc1

package.json

@@ -1,7 +1,7 @@
 {
   "name": "duetwebcontrol",
-  "version": "3.3.0-RC3-CNC04",
-  "pkgVersion": "3.3-rc3",
+  "version": "3.3.0-CNC05",
+  "pkgVersion": "3.3.0",
   "repository": "github:chrishamm/DuetWebControl",
   "homepage": "https://forum.duet3d.com/category/27/duet-web-control",
   "license": "GPL-3.0",

src/components/lists/JobFileList.vue

@@ -287,7 +287,7 @@ export default {
 		},
 		lastJobFile(to) {
 			if (Path.equals(this.directory, Path.extractDirectory(to))) {
-				// Refresh the filelist after a short moment so DSF can update the simulation time first
+				// Refresh the filelist after a short moment so DSF and RRF can update the simulation time first
 				setTimeout(this.$refs.filelist.refresh.bind(this), 2000);
 			}
 		}

src/store/machine/connector/PollConnector.js

@@ -219,7 +219,15 @@ export default class PollConnector extends BaseConnector {
 	async loadPlugins() {
 		try {
 			const plugins = await this.download({ filename: Path.dwcPluginsFile });
-			if (!(plugins instanceof Array)) {
+			if ((plugins instanceof Object) && !(plugins instanceof Array)) {
+				for (let id in plugins) {
+					if (!plugins[id].dwcFiles) {
+						plugins[id].dwcFiles = [];
+					}
+					if (!plugins[id].sdFiles) {
+						plugins[id].sdFiles = [];
+					}
+				}
 				this.plugins = plugins;
 				await this.dispatch('update', { plugins });
 			}
@@ -959,7 +967,7 @@ export default class PollConnector extends BaseConnector {
 
 	updateLayersModel(jobKey, axes, extruders, analogSensors) {
 		// Are we printing?
-		if (jobKey.duration === null || jobKey.layer === null) {
+		if (jobKey.duration === null) {
 			if (this.lastLayer !== -1) {
 				this.lastLayer = -1;
 				this.lastDuration = this.lastFilePosition = this.lastHeight = 0;
@@ -1257,7 +1265,7 @@ export default class PollConnector extends BaseConnector {
 
 		// Uninstall the previous version if required
 		if (this.plugins[plugin.id]) {
-			await this.uninstallPlugin(plugin.id, true);
+			await this.uninstallPlugin(plugin, true);
 		}
 
 		// Clear potential files
@@ -1317,7 +1325,7 @@ export default class PollConnector extends BaseConnector {
 		if (!forUpgrade) {
 			// Make sure uninstalling this plugin does not break any dependencies
 			for (let id in this.plugins) {
-				if (id !== plugin && this.plugins[id].dwcDependencies.indexOf(plugin) !== -1) {
+				if (id !== plugin.id && this.plugins[id].dwcDependencies.indexOf(plugin.id) !== -1) {
 					throw new Error(`Cannot uninstall plugin because plugin ${id} depends on it`);
 				}
 			}