From 0c2f003cc4c7a98cb58064a01ca5be0c065fb638 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Wed, 19 Dec 2018 12:49:41 +0100 Subject: [PATCH] remove gcode file deletion --- CHANGELOG.md | 4 ++++ DuetRRFOutputDevice.py | 18 +----------------- plugin.json | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb9c86f..b6de03c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog of Cura-DuetRRFPlugin +## v1.0.1: 2018-12-19 + * do not try to delete the gcode file before uploading: + RRF safely handles this, https://forum.duet3d.com/topic/8194/cura-duet-reprap-firmware-integration-question + ## v1.0.0: 2018-11-25 * tested with Cura 3.6 * add Duet3D icon - permission granted by Think3dPrint3d diff --git a/DuetRRFOutputDevice.py b/DuetRRFOutputDevice.py index d1246bd..e2fae61 100644 --- a/DuetRRFOutputDevice.py +++ b/DuetRRFOutputDevice.py @@ -163,23 +163,7 @@ def onFilenameAccepted(self): # start Logger.log("d", self._name_id + " | Connecting...") - self._send('connect', [("password", self._duet_password), self._timestamp()], self.onConnected) - - def onConnected(self): - if self._stage != OutputStage.writing: - return - - Logger.log("d", self._name_id + " | Deleting file with the same name...") - - self._send('delete', [("name", "0:/gcodes/" + self._fileName)], self.onBeforeUploadCleanupDone) - - def onBeforeUploadCleanupDone(self): - if self._stage != OutputStage.writing: - return - - Logger.log("d", self._name_id + " | Reading and discarding possible error message...") - - self._send('reply', [], self.onUploadReady) + self._send('connect', [("password", self._duet_password), self._timestamp()], self.onUploadReady) def onUploadReady(self): if self._stage != OutputStage.writing: diff --git a/plugin.json b/plugin.json index 55ba771..d66c776 100644 --- a/plugin.json +++ b/plugin.json @@ -2,7 +2,7 @@ "name": "DuetRRF", "author": "Thomas Kriechbaumer", "description": "Upload and Print to DuetWifi / DuetEthernet / Duet Maestro with RepRapFirmware.", - "version": "1.0.0", + "version": "1.0.1", "minimum_cura_version": "3.5", "maximum_cura_version": "3.6", "api": 5