Added z coordinate settings

lsellens · Mar 13, 2018 · 7354692 · 7354692
1 parent 235cc43
commit 7354692
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/octoprint_CR10_Leveling/__init__.py b/octoprint_CR10_Leveling/__init__.py
@@ -43,7 +43,8 @@ def get_settings_defaults(self):
                     front_left_x=30, front_left_y=30, front_right_x=270,
                     front_right_y=30, back_left_x=30, back_left_y=270,
                     back_right_x=270, back_right_y=270, center_x=150,
-                    center_y=150, feed_rate=3600, heat_simultaneously=False)
+                    center_y=150, lower_z=0, upper_z=10, feed_rate=3600,
+                    heat_simultaneously=False)
 
     def get_template_configs(self):
         return [dict(type="settings", custom_bindings=False)]

diff --git a/octoprint_CR10_Leveling/static/cr10leveling.js b/octoprint_CR10_Leveling/static/cr10leveling.js
@@ -33,24 +33,29 @@ $(function() {
             ['M190 S' + settings.bed_temp(), 'M109 S' + settings.nozzle_temp()],
           'customClass': 'btn btn-danger', 'name': 'Apply Heat', 'offset': '2'},
           {'width': '2', 'commands':
-            ['G90', 'G0 Z10 F500', 'G0 X' + settings.back_left_x() + 'Y' +
-            settings.back_left_y() + 'F' + settings.feed_rate(), 'G0 Z0 F500'],
+            ['G90', 'G0 Z' + settings.upper_z() + 'F500', 'G0 X' +
+            settings.back_left_x() + 'Y' + settings.back_left_y() + 'F' +
+            settings.feed_rate(), 'G0 Z' + settings.lower_z() + 'F500'],
           'customClass': 'btn', 'name': 'Back \xa0Left\xa0'},
           {'width': '2', 'commands':
-            ['G90', 'G0 Z10 F500', 'G0 X' + settings.back_right_x() + 'Y' +
-            settings.back_right_y() + 'F' + settings.feed_rate(), 'G0 Z0 F500'],
+            ['G90', 'G0 Z' + settings.upper_z() + 'F500', 'G0 X' +
+            settings.back_right_x() + 'Y' + settings.back_right_y() + 'F' +
+            settings.feed_rate(), 'G0 Z' + settings.lower_z() + 'F500'],
           'customClass': 'btn', 'name': 'Back Right', 'offset': '2'},
           {'width': '8', 'commands':
-            ['G90', 'G0 Z10 F500', 'G0 X' + settings.center_x() + 'Y' +
-            settings.center_y() + 'F' + settings.feed_rate(), 'G0 Z0 F500'],
+            ['G90', 'G0 Z' + settings.upper_z() + 'F500', 'G0 X' +
+            settings.center_x() + 'Y' + settings.center_y() + 'F' +
+            settings.feed_rate(), 'G0 Z' + settings.lower_z() + 'F500'],
           'customClass': 'btn', 'name': 'Center', 'offset': '2'},
           {'width': '2', 'commands':
-            ['G90', 'G0 Z10 F500', 'G0 X' + settings.front_left_x() + 'Y' +
-            settings.front_left_y() + 'F' + settings.feed_rate(), 'G0 Z0 F500'],
+            ['G90', 'G0 Z' + settings.upper_z() + 'F500', 'G0 X' +
+            settings.front_left_x() + 'Y' + settings.front_left_y() + 'F' +
+            settings.feed_rate(), 'G0 Z' + settings.lower_z() + 'F500'],
           'customClass': 'btn', 'name': 'Front \xa0Left\xa0'},
           {'width': '2', 'commands':
-            ['G90', 'G0 Z10 F500', 'G0 X' + settings.front_right_x() + 'Y' +
-            settings.front_right_y() + 'F' + settings.feed_rate(), 'G0 Z0 F500'],
+            ['G90', 'G0 Z' + settings.upper_z() + 'F500', 'G0 X' +
+            settings.front_right_x() + 'Y' + settings.front_right_y() + 'F' +
+            settings.feed_rate(), 'G0 Z' + settings.lower_z() + 'F500'],
           'customClass': 'btn', 'name': 'Front Right', 'offset': '2'}]
       }]
 

diff --git a/octoprint_CR10_Leveling/templates/CR10_Leveling_settings.jinja2 b/octoprint_CR10_Leveling/templates/CR10_Leveling_settings.jinja2
@@ -87,6 +87,18 @@ Email: [email protected]
       <input type="number" data-bind="value: settings.plugins.CR10_Leveling.feed_rate">
     </div>
   </div>
+  <div class="control-group">
+    <label class="control-label">Lower Z coordinate</label>
+    <div class="controls">
+      <input type="number" data-bind="value: settings.plugins.CR10_Leveling.lower_z">
+    </div>
+  </div>
+  <div class="control-group">
+    <label class="control-label">Upper Z coordinate</label>
+    <div class="controls">
+      <input type="number" data-bind="value: settings.plugins.CR10_Leveling.upper_z">
+    </div>
+  </div>
 
   <h3>Front Left</h3>
   <div class="control-group">