Added moving z lower, and multiple travel command support.

This update modifies the z lower move to include some horizontal movement. It also adds logic which scans for multiple travel moves in a row, in order to properly raise the z height through them all.

config.ini

@@ -12,4 +12,7 @@ max_zhop_distance_threshold = 80
 
 #The speed of the move after the zhop, which lowers the nozzle back down to the print. 
 z_lower_feedrate = 3000
-#The zhop move itself uses the feedrate from your gcode/your slicer.
+#The zhop move itself uses the feedrate from your gcode/your slicer.
+
+#the horizontal length of the final travel move, compared to the length of the full travel move, as a percentage.
+second_move_percent = 10

executable/config.ini

@@ -13,3 +13,6 @@ max_zhop_distance_threshold = 80
 #The speed of the move after the zhop, which lowers the nozzle back down to the print. 
 z_lower_feedrate = 3000
 #The zhop move itself uses the feedrate from your gcode/your slicer.
+
+#the horizontal length of the final travel move, compared to the length of the full travel move, as a percentage.
+second_move_percent = 10

slingshot_z_hop.py

@@ -5,6 +5,7 @@
 import configparser
 import os
 
+#VERSION 1.1
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~static variables~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -35,6 +36,12 @@
 #the zhop itself takes the feedrate from your gcode
 z_lower_feedrate = int(config.get('Settings', 'z_lower_feedrate'))
 
+#horizontal distance of the final travel/drop move. converted from percentage to decimal.
+second_distance_factor = int(config.get('Settings', 'second_move_percent')) * 0.01
+
+#this is used for easier reading.
+first_distance_factor = 1.0 - second_distance_factor
+
 
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -86,6 +93,14 @@ def linear_interpolation(value, minimum, maximum, start_value, end_value):
 prev_x = 0
 prev_y = 0
 
+#how many travel moves are chained in a row after the current travel move. 
+#this is useful so we can treat many short moves as a single travel move.
+num_travel_moves = 0
+#how many in the current set we have done so far
+num_travel_moves_done = 0
+
+target_zhop_height = 0
+
 #iterate over every line in gcode
 #we use an index so that we can easily look ahead (or back) in the code. 
 for index in range(0,len(gcode_lines)):
@@ -125,26 +140,70 @@ def linear_interpolation(value, minimum, maximum, start_value, end_value):
     #modified_gcode.append('; X: ' + str(target_x) + ' Y: ' + str(target_y) + ' Z: ' + str(current_z_height) + ' F: ' + str(current_feedrate) + '\n')
     #modified_gcode.append(current_line)
 
-
-
-
-
     #find travel moves
     #if we move without extruding, we assume it's a travel move
     #But only if we are moving x or y. This could probably use RE, but this is easier to read for me.
     if ('G1' in current_line) and ('E' not in current_line) and ('X' in current_line or 'Y' in current_line):
 
+        #check how many travel moves exist in a row after this one
+        if num_travel_moves == 0:
+            num_travel_moves = 1
+            for i in range(index + 1, len(gcode_lines)):
+                future_line = gcode_lines[i]
+                #if the next line is a travel move too, count it. When we find another non-travel move, stop counting. 
+                if ('G1' in future_line) and ('E' not in future_line) and ('X' in future_line or 'Y' in future_line):
+                    num_travel_moves += 1
+                else:
+                    break
+
+
+
+
+
         distance = calculate_distance(prev_x,prev_y,target_x,target_y)
-        zhop_height = current_z_height + linear_interpolation(distance, 0, max_zhop_distance_threshold, min_zhop, max_zhop)
+
+        if num_travel_moves_done == 0:
+            target_zhop_height = current_z_height + linear_interpolation(distance, 0, max_zhop_distance_threshold, min_zhop, max_zhop)
+
+        #set our z hop height, or if we are in the middle of a multi-move travel, calculate what the current height should be
+        zhop_height = 0
+        if num_travel_moves > 1:
+            #when we have multiple travel moves in a row
+            zhop_height = linear_interpolation(num_travel_moves_done, 0, num_travel_moves, current_z_height, target_zhop_height)
+        else: #only one travel move
+            zhop_height = target_zhop_height
+
+        #the travel moves should z hop to a peak partway through the total travel. Calculate the location of that peak.
+        delta_x = target_x - prev_x
+        peak_x = prev_x + (delta_x * first_distance_factor)
+        delta_y = target_y - prev_y
+        peak_y = prev_y + (delta_y * first_distance_factor)
 
         #zhop
-        modified_gcode.append('G1 X' + str(target_x) + ' Y' + str(target_y) + ' Z' + str(round(zhop_height, 5)) + ' F' + str(current_feedrate) + ' ; custom zhop\n')
-        #lower to z height
-        modified_gcode.append('G1 Z' + str(current_z_height) + ' F' + str(z_lower_feedrate) + ' ; custom zhop lower \n')
+        modified_gcode.append('G1 X' + str(round(peak_x, 5)) + ' Y' + str(round(peak_y, 5)) + ' Z' + str(round(zhop_height, 5)) + ' F' + str(current_feedrate) + ' ; custom zhop\n')
+
+        #increment to keep track of how many travel moves we have completed in this set
+        num_travel_moves_done += 1
+
+        if num_travel_moves_done == num_travel_moves: #if we completed all the moves in this set
+            #lower to z height
+            modified_gcode.append('G1 X' + str(target_x) + ' Y' + str(target_y) + ' Z' + str(current_z_height) + ' F' + str(z_lower_feedrate) + ' ; custom zhop lower \n')
+            #old# modified_gcode.append('G1 Z' + str(current_z_height) + ' F' + str(z_lower_feedrate) + ' ; custom zhop lower \n')
+
+            #reset these counters for reuse
+            num_travel_moves = 0
+            num_travel_moves_done = 0
+
+
+
     else:
         #place unmodified code back into the file
         modified_gcode.append(current_line)
 
+        #im paranoid so I'll just make sure these are correct
+        num_travel_moves_done = 0
+        num_travel_moves = 0
+