diff --git a/plugins/PostProcessingPlugin/InsertAtLayerChange.py b/plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py similarity index 96% rename from plugins/PostProcessingPlugin/InsertAtLayerChange.py rename to plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py index df045e1490..04c0a3badf 100644 --- a/plugins/PostProcessingPlugin/InsertAtLayerChange.py +++ b/plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py @@ -1,55 +1,55 @@ -# Created by Wayne Porter - -from ..Script import Script - -class InsertAtLayerChange(Script): - def __init__(self): - super().__init__() - - def getSettingDataString(self): - return """{ - "name": "Insert at layer change", - "key": "InsertAtLayerChange", - "metadata": {}, - "version": 2, - "settings": - { - "insert_loc": - { - "label": "When to insert", - "description": "Whether to insert code before or after layer change.", - "type": "enum", - "options": {"before": "Before", "after": "After"}, - "default_value": "before" - }, - "gcode_to_add": - { - "label": "GCODE to insert.", - "description": "GCODE to add before or after layer change.", - "type": "str", - "default_value": "" - } - } - }""" - - def execute(self, data): - in_layer = False - gcode_to_add = self.getSettingValueByKey("gcode_to_add") + "\n" - for layer in data: - # Check that a layer is being printed - lines = layer.split("\n") - if ";LAYER:" in lines[0]: - in_layer = True - else: - in_layer = False - - if in_layer: - index = data.index(layer) - if self.getSettingValueByKey("insert_loc") == "before": - layer = gcode_to_add + layer - else: - layer = layer + gcode_to_add - - data[index] = layer - - return data +# Created by Wayne Porter + +from ..Script import Script + +class InsertAtLayerChange(Script): + def __init__(self): + super().__init__() + + def getSettingDataString(self): + return """{ + "name": "Insert at layer change", + "key": "InsertAtLayerChange", + "metadata": {}, + "version": 2, + "settings": + { + "insert_loc": + { + "label": "When to insert", + "description": "Whether to insert code before or after layer change.", + "type": "enum", + "options": {"before": "Before", "after": "After"}, + "default_value": "before" + }, + "gcode_to_add": + { + "label": "GCODE to insert.", + "description": "GCODE to add before or after layer change.", + "type": "str", + "default_value": "" + } + } + }""" + + def execute(self, data): + in_layer = False + gcode_to_add = self.getSettingValueByKey("gcode_to_add") + "\n" + for layer in data: + # Check that a layer is being printed + lines = layer.split("\n") + if ";LAYER:" in lines[0]: + in_layer = True + else: + in_layer = False + + if in_layer: + index = data.index(layer) + if self.getSettingValueByKey("insert_loc") == "before": + layer = gcode_to_add + layer + else: + layer = layer + gcode_to_add + + data[index] = layer + + return data diff --git a/plugins/PostProcessingPlugin/TimeLapse.py b/plugins/PostProcessingPlugin/scripts/TimeLapse.py similarity index 97% rename from plugins/PostProcessingPlugin/TimeLapse.py rename to plugins/PostProcessingPlugin/scripts/TimeLapse.py index 0a7c893fef..731983088a 100644 --- a/plugins/PostProcessingPlugin/TimeLapse.py +++ b/plugins/PostProcessingPlugin/scripts/TimeLapse.py @@ -1,86 +1,86 @@ -# Created by Wayne Porter - -from ..Script import Script - -class TimeLapse(Script): - def __init__(self): - super().__init__() - - def getSettingDataString(self): - return """{ - "name": "Time Lapse", - "key": "TimeLapse", - "metadata": {}, - "version": 2, - "settings": - { - "trigger_cmd": - { - "label": "Trigger camera command", - "description": "Gcode command used to trigger camera.", - "type": "str", - "default_value": "M240" - }, - "pause_length": - { - "label": "Pause length", - "description": "How long to wait (in ms) after camera was triggered.", - "type": "int", - "default_value": 700, - "minimum_value": 0, - "unit": "ms" - }, - "head_park_x": - { - "label": "Park Print Head X", - "description": "What X location does the head move to for photo.", - "unit": "mm", - "type": "float", - "default_value": 0 - }, - "head_park_y": - { - "label": "Park Print Head Y", - "description": "What Y location does the head move to for photo.", - "unit": "mm", - "type": "float", - "default_value": 190 - }, - "park_feed_rate": - { - "label": "Park Feed Rate", - "description": "How fast does the head move to the park coordinates.", - "unit": "mm/s", - "type": "float", - "default_value": 9000 - } - } - }""" - - def execute(self, data): - in_layer = False - feed_rate = self.getSettingValueByKey("park_feed_rate") - x_park = self.getSettingValueByKey("head_park_x") - y_park = self.getSettingValueByKey("head_park_y") - trigger_cmd = self.getSettingValueByKey("trigger_cmd") - pause_length = self.getSettingValueByKey("pause_length") - - gcode_to_append = self.putValue(G = 90) + ";Absolute positioning\n" - gcode_to_append += self.putValue(G = 1, F = feed_rate, X = x_park, Y = y_park) + ";Move into position\n" - gcode_to_append += trigger_cmd + ";Snap Photo\n" - gcode_to_append += self.putValue(G = 4, P = pause_length) + ";Wait for camera\n" - for layer in data: - # Check that a layer is being printed - lines = layer.split("\n") - if ";LAYER:" in lines[0]: - in_layer = True - else: - in_layer = False - - if in_layer: - index = data.index(layer) - layer += gcode_to_append - - data[index] = layer - - return data +# Created by Wayne Porter + +from ..Script import Script + +class TimeLapse(Script): + def __init__(self): + super().__init__() + + def getSettingDataString(self): + return """{ + "name": "Time Lapse", + "key": "TimeLapse", + "metadata": {}, + "version": 2, + "settings": + { + "trigger_cmd": + { + "label": "Trigger camera command", + "description": "Gcode command used to trigger camera.", + "type": "str", + "default_value": "M240" + }, + "pause_length": + { + "label": "Pause length", + "description": "How long to wait (in ms) after camera was triggered.", + "type": "int", + "default_value": 700, + "minimum_value": 0, + "unit": "ms" + }, + "head_park_x": + { + "label": "Park Print Head X", + "description": "What X location does the head move to for photo.", + "unit": "mm", + "type": "float", + "default_value": 0 + }, + "head_park_y": + { + "label": "Park Print Head Y", + "description": "What Y location does the head move to for photo.", + "unit": "mm", + "type": "float", + "default_value": 190 + }, + "park_feed_rate": + { + "label": "Park Feed Rate", + "description": "How fast does the head move to the park coordinates.", + "unit": "mm/s", + "type": "float", + "default_value": 9000 + } + } + }""" + + def execute(self, data): + in_layer = False + feed_rate = self.getSettingValueByKey("park_feed_rate") + x_park = self.getSettingValueByKey("head_park_x") + y_park = self.getSettingValueByKey("head_park_y") + trigger_cmd = self.getSettingValueByKey("trigger_cmd") + pause_length = self.getSettingValueByKey("pause_length") + + gcode_to_append = self.putValue(G = 90) + ";Absolute positioning\n" + gcode_to_append += self.putValue(G = 1, F = feed_rate, X = x_park, Y = y_park) + ";Move into position\n" + gcode_to_append += trigger_cmd + ";Snap Photo\n" + gcode_to_append += self.putValue(G = 4, P = pause_length) + ";Wait for camera\n" + for layer in data: + # Check that a layer is being printed + lines = layer.split("\n") + if ";LAYER:" in lines[0]: + in_layer = True + else: + in_layer = False + + if in_layer: + index = data.index(layer) + layer += gcode_to_append + + data[index] = layer + + return data