Change_Filament 0.3.0

New settings:

* Pause Before Park: Send M0 to pause Octoprint before parking. Issue jim-p#6
* Retract Before Park: Perform a small retract before parking. This was performed unconditionally in previous versions. Issue jim-p#6
* Home Before Park: Home X/Y before moving to the X/Y parking position (But after Z Park). Fixes jim-p#3

Also fixed M117 text after load action

Author: jim-p

extras/Change_Filament.md

@@ -40,6 +40,9 @@ Configuration:
 * **Unload Speed**: How fast to unload the filament, in mm/m.
 * **Load Length**: Length of filament to extrude when loading, in mm.
 * **Load Speed**: How fast to extrude when loading filament, in mm/m.
+* **Pause Before Park**: Send M0 to pause Octoprint before parking.
+* **Retract Before Park**: Perform a small retract before parking.
+* **Home Before Park**: Home X/Y before moving to the X/Y parking position.
 * **Y Park**: Position on the Y axis where the head will be moved when loading or unloading.
 * **X Park**: Position on the X axis where the head will be moved when loading or unloading. Depending on the filament path, may be best set to the midpoint of the X axis.
 * **Z Lift Relative**: How high to move the Z axis before unloading, in mm.

octoprint_Change_Filament/__init__.py

@@ -43,6 +43,9 @@ def get_settings_defaults(self):
 			unload_speed=1600,
 			load_length=50,
 			load_speed=60,
+			pause_before_park=False,
+			retract_before_park=False,
+			home_before_park=False,
 			y_park=0,
 			x_park=0,
 			z_lift_relative=30,

octoprint_Change_Filament/static/js/Change_Filament.js

@@ -39,14 +39,33 @@ $(function() {
 		self.getAdditionalControls = function() {
 			var settings = self.settings.settings.plugins.Change_Filament;
 
+			var preparkpause = '';
+			if (settings.pause_before_park() != false) {
+				preparkpause = 'M0';
+			}
+
+			var preparkhome = '';
+			if (settings.home_before_park() != false) {
+				preparkhome = 'G28 X0 Y0';
+			}
+
+			var preparkextrude0 = '';
+			var preparkextrude1 = '';
+			if (settings.retract_before_park() != false) {
+				preparkextrude0 = 'M83';
+				preparkextrude1 = 'G1 E-5 F50';
+			}
+
 			return [{
 				'customClass': '', 'layout': 'horizontal_grid', 'name': 'Change Filament', 'children':[
 					{'width': '2', 'commands': [
 						'M117 Parking nozzle',
-						'M83',
-						'G1 E-5 F50',
+						preparkpause,
+						preparkextrude0,
+						preparkextrude1,
 						'G91',
 						'G0 Z' + settings.z_lift_relative() + ' F' + settings.park_speed(),
+						preparkhome,
 						'G90',
 						'G0 Y' + settings.y_park() + ' X' + settings.x_park() + ' F' + settings.park_speed(),
 						'M117 Nozzle parked'
@@ -64,7 +83,7 @@ $(function() {
 						'M117 Loading filament',
 						'M83',
 						'G1 E' + settings.load_length() + ' F' + settings.load_speed(),
-						'M117 Replace filament, set new temp, click Load'
+						'M117 New Filament Loaded'
 						],
 						'customClass': 'btn', 'additionalClasses': 'nowrap btn-warning fa fa-step-forward', 'name': ' Load'},
 					{'width': '2', 'commands': [

octoprint_Change_Filament/templates/Change_Filament_settings.jinja2

@@ -80,6 +80,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   </div>
 
   <h3>{{ _('Print Head Settings') }}</h3>
+  <div class="control-group">
+    <label class="control-label">{{ _('Pause Before Park') }}:</label>
+    <div class="controls">
+      <div class="input-append">
+        <input type="checkbox" data-bind="checked: settings.plugins.Change_Filament.pause_before_park">
+      </div>
+      <span class="help-block">{{ _('Send M0 to pause Octoprint before parking.') }}</span>
+    </div>
+  </div>
+  <div class="control-group">
+    <label class="control-label">{{ _('Retract Before Park') }}:</label>
+    <div class="controls">
+      <div class="input-append">
+        <input type="checkbox" data-bind="checked: settings.plugins.Change_Filament.retract_before_park">
+      </div>
+      <span class="help-block">{{ _('Perform a small retract before parking.') }}</span>
+    </div>
+  </div>
+  <div class="control-group">
+    <label class="control-label">{{ _('Home Before Park') }}:</label>
+    <div class="controls">
+      <div class="input-append">
+        <input type="checkbox" data-bind="checked: settings.plugins.Change_Filament.home_before_park">
+      </div>
+      <span class="help-block">{{ _('Home X/Y before moving to the X/Y parking position.') }}</span>
+    </div>
+  </div>
   <div class="control-group">
     <label class="control-label">{{ _('Y Park') }}:</label>
     <div class="controls">

setup.py

@@ -1,7 +1,7 @@
 plugin_identifier = "Change_Filament"
 plugin_package = "octoprint_Change_Filament"
 plugin_name = "Change_Filament"
-plugin_version = "0.2.0"
+plugin_version = "0.3.0"
 plugin_description = """Facilitates changing filament (unloads old, loads new)"""
 plugin_author = "Jim Pingle"
 plugin_author_email = "jim@pingle.org"