From 78e7aa2d21c6e53848b3202cdad52da075266be6 Mon Sep 17 00:00:00 2001 From: baddogg1231 Date: Sat, 9 Nov 2019 21:33:04 -0500 Subject: [PATCH 1/6] Added Ender 3 Prime Line to Start G-code Added the popular prime line for the Ender 3 as the default starting g-code and added a modification that works around the Cura 4.3.0 update that moves the print head to Z0 before starting the print, which moves the printhead down into the filament. --- resources/definitions/creality_ender3.def.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 645be52bc8..bbb2e03e86 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -26,7 +26,21 @@ [32, 34] ] }, + "machine_start_gcode": + { + "default_value": "; Ender 3 Custom Start G-code + G92 E0 ; Reset Extruder + G28 ; Home all axes + G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed + G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position + G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line + G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little + G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line + G92 E0 ; Reset Extruder + G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed + G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + }, "gantry_height": { "value": 25 } } -} \ No newline at end of file +} From f3e597d6847ae40e33e083f21b0e9a88e34855e1 Mon Sep 17 00:00:00 2001 From: baddogg1231 Date: Sat, 9 Nov 2019 21:36:13 -0500 Subject: [PATCH 2/6] Update creality_ender3.def.json --- resources/definitions/creality_ender3.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index bbb2e03e86..c15abb6f29 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -28,7 +28,8 @@ }, "machine_start_gcode": { - "default_value": "; Ender 3 Custom Start G-code + "default_value": " + ; Ender 3 Custom Start G-code G92 E0 ; Reset Extruder G28 ; Home all axes G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed From 23d7dca1fc03189384c6b508a8b2b67ed5f86872 Mon Sep 17 00:00:00 2001 From: TheOgre Date: Tue, 12 Nov 2019 06:22:06 -0500 Subject: [PATCH 3/6] Added missing bracket, tidied up code Added a missing { before "default_value". Moved items around to match the layout of the current file. --- resources/definitions/creality_ender3.def.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index c15abb6f29..37d508d058 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -26,9 +26,7 @@ [32, 34] ] }, - "machine_start_gcode": - { - "default_value": " + "machine_start_gcode": { "default_value": " ; Ender 3 Custom Start G-code G92 E0 ; Reset Extruder G28 ; Home all axes From ba2c9cb21e184b174cf2f4b0fa1588aef3b7760d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 10 Dec 2019 16:02:45 +0100 Subject: [PATCH 4/6] Fix JSON formatting of start g-code No newlines allowed. --- resources/definitions/creality_ender3.def.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index d668b5c26d..ab828c727b 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -31,18 +31,8 @@ [32, 34] ] }, - "machine_start_gcode": { "default_value": " - ; Ender 3 Custom Start G-code - G92 E0 ; Reset Extruder - G28 ; Home all axes - G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed - G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position - G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line - G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little - G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line - G92 E0 ; Reset Extruder - G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed - G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + "machine_start_gcode": { + "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "gantry_height": { "value": 25 } From 8aae5f7563bf4a3693997a58f974a589133b6075 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 10 Dec 2019 16:33:47 +0100 Subject: [PATCH 5/6] Fix: extra ConfigParsaer arg added to wrong call CURA-6522 --- .../VersionUpgrade44to45/VersionUpgrade44to45.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py index 6af08e7d66..1d278764f0 100644 --- a/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/VersionUpgrade44to45.py @@ -10,7 +10,7 @@ from UM.VersionUpgrade import VersionUpgrade class VersionUpgrade44to45(VersionUpgrade): def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) @@ -35,7 +35,7 @@ class VersionUpgrade44to45(VersionUpgrade): # # This renames the renamed settings in the containers. def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - parser = configparser.ConfigParser(interpolation = None) + parser = configparser.ConfigParser(interpolation = None, comment_prefixes=()) parser.read_string(serialized) # Update version number. From 537424c058fc7074e9c793c27b2c5a39c0f4db36 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Dec 2019 16:41:46 +0100 Subject: [PATCH 6/6] Add GitHub Actions --- .github/workflows/cicd.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/cicd.yml diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml new file mode 100644 index 0000000000..3a0b57d714 --- /dev/null +++ b/.github/workflows/cicd.yml @@ -0,0 +1,13 @@ +--- +name: CI/CD +on: [push, pull_request] +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + container: ultimaker/cura-build-environment + steps: + - name: Checkout master + uses: actions/checkout@v1.2.0 + - name: Build and test + run: docker/build.sh