Hotfix for accidentally merged code

flux3dp · Oct 5, 2016 · 04a1159 · 04a1159
1 parent 12eddc1
commit 04a1159
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/fluxclient/fcode/fcode_base.py b/fluxclient/fcode/fcode_base.py
@@ -167,6 +167,6 @@ def trim_ends(cls, path):
                         path[layer].pop(layer)
                     else:
                         break
-                else:
+                elif len(path) > 0:
                     path.pop(layer)
         return path
diff --git a/fluxclient/fcode/g_to_f.py b/fluxclient/fcode/g_to_f.py
@@ -244,7 +244,6 @@ def analyze_metadata(self, input_list, comment):
                             self.previous[i - 4] = (input_list[i] - self.current_pos[i - 1]) / tmp_path
 
                     self.filament[i - 4] += input_list[i] - self.current_pos[i - 1]
-                    self.last_pos[i - 1] += input_list[i];
                     self.current_pos[i - 1] = input_list[i]
                 else:
                     if self.has_config and self._config['flux_refill_empty'] == '1' and tmp_path != 0:
@@ -254,7 +253,6 @@ def analyze_metadata(self, input_list, comment):
                             self.previous[i - 4] = input_list[i] / tmp_path
 
                     self.filament[i - 4] += input_list[i]
-                    self.last_pos[i - 1] += input_list[i];
                     self.current_pos[i - 1] += input_list[i]
                 # TODO:clean up this part?, self.extrude_absolute flag