Skip to content
This repository was archived by the owner on Jan 16, 2022. It is now read-only.

Commit c12cfc7

Browse files
committed
Version 3.3.0
Updated version to 3.3.0 Added extra check for dwc-plugins.json (standalone mode) Bug fix: Layers chart was only cleared when the layer variable was set Bug fix: Plugin upgrades were not working in standalone mode
1 parent 95c286c commit c12cfc7

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "duetwebcontrol",
3-
"version": "3.3.0-rc3",
4-
"pkgVersion": "3.3-rc3",
3+
"version": "3.3.0",
4+
"pkgVersion": "3.3.0",
55
"repository": "github:chrishamm/DuetWebControl",
66
"homepage": "https://forum.duet3d.com/category/27/duet-web-control",
77
"license": "GPL-3.0",

src/components/lists/JobFileList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ export default {
287287
},
288288
lastJobFile(to) {
289289
if (Path.equals(this.directory, Path.extractDirectory(to))) {
290-
// Refresh the filelist after a short moment so DSF can update the simulation time first
290+
// Refresh the filelist after a short moment so DSF and RRF can update the simulation time first
291291
setTimeout(this.$refs.filelist.refresh.bind(this), 2000);
292292
}
293293
}

src/store/machine/connector/PollConnector.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,15 @@ export default class PollConnector extends BaseConnector {
219219
async loadPlugins() {
220220
try {
221221
const plugins = await this.download({ filename: Path.dwcPluginsFile });
222-
if (!(plugins instanceof Array)) {
222+
if ((plugins instanceof Object) && !(plugins instanceof Array)) {
223+
for (let id in plugins) {
224+
if (!plugins[id].dwcFiles) {
225+
plugins[id].dwcFiles = [];
226+
}
227+
if (!plugins[id].sdFiles) {
228+
plugins[id].sdFiles = [];
229+
}
230+
}
223231
this.plugins = plugins;
224232
await this.dispatch('update', { plugins });
225233
}
@@ -959,7 +967,7 @@ export default class PollConnector extends BaseConnector {
959967

960968
updateLayersModel(jobKey, axes, extruders, analogSensors) {
961969
// Are we printing?
962-
if (jobKey.duration === null || jobKey.layer === null) {
970+
if (jobKey.duration === null) {
963971
if (this.lastLayer !== -1) {
964972
this.lastLayer = -1;
965973
this.lastDuration = this.lastFilePosition = this.lastHeight = 0;
@@ -1257,7 +1265,7 @@ export default class PollConnector extends BaseConnector {
12571265

12581266
// Uninstall the previous version if required
12591267
if (this.plugins[plugin.id]) {
1260-
await this.uninstallPlugin(plugin.id, true);
1268+
await this.uninstallPlugin(plugin, true);
12611269
}
12621270

12631271
// Clear potential files
@@ -1317,7 +1325,7 @@ export default class PollConnector extends BaseConnector {
13171325
if (!forUpgrade) {
13181326
// Make sure uninstalling this plugin does not break any dependencies
13191327
for (let id in this.plugins) {
1320-
if (id !== plugin && this.plugins[id].dwcDependencies.indexOf(plugin) !== -1) {
1328+
if (id !== plugin.id && this.plugins[id].dwcDependencies.indexOf(plugin.id) !== -1) {
13211329
throw new Error(`Cannot uninstall plugin because plugin ${id} depends on it`);
13221330
}
13231331
}

0 commit comments

Comments
 (0)