Skip to content

Commit b7ce5cc

Browse files
HellAholicHellAholic
authored
Merge branch 'main' into CURA-11978_retract-and-unretract-in-a-travel
2 parents d0947c5 + ae60c7f commit b7ce5cc

File tree

56 files changed

+797
-44
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+797
-44
lines changed

‎cura/CuraApplication.py‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,36 +1895,39 @@ def _openUrl(self, url: QUrl) -> None:
18951895
query = QUrlQuery(url.query())
18961896
model_url = QUrl(query.queryItemValue("file", options=QUrl.ComponentFormattingOption.FullyDecoded))
18971897

1898-
def on_finish(response):
1899-
content_disposition_header_key = QByteArray("content-disposition".encode())
1900-
1901-
filename = model_url.path().split("/")[-1] + ".stl"
1902-
1903-
if response.hasRawHeader(content_disposition_header_key):
1904-
# content_disposition is in the format
1905-
# ```
1906-
# content_disposition attachment; filename="[FILENAME]"
1907-
# ```
1908-
# Use a regex to extract the filename
1909-
content_disposition = str(response.rawHeader(content_disposition_header_key).data(),
1910-
encoding='utf-8')
1911-
content_disposition_match = re.match(r'attachment; filename=(?P<filename>.*)',
1912-
content_disposition)
1913-
if content_disposition_match is not None:
1914-
filename = content_disposition_match.group("filename").strip("\"")
1915-
1916-
tmp = tempfile.NamedTemporaryFile(suffix=filename, delete=False)
1917-
with open(tmp.name, "wb") as f:
1918-
f.write(response.readAll())
1919-
1920-
self.readLocalFile(QUrl.fromLocalFile(tmp.name), add_to_recent_files=False)
1921-
19221898
def on_error(*args, **kwargs):
1923-
Logger.log("w", "Could not download file from {0}".format(model_url.url()))
1924-
Message("Could not download file: " + str(model_url.url()),
1899+
Logger.warning(f"Could not download file from {model_url.url()}")
1900+
Message(f"Could not download file: {str(model_url.url())}",
19251901
title= "Loading Model failed",
19261902
message_type=Message.MessageType.ERROR).show()
1927-
return
1903+
1904+
def on_finish(response):
1905+
try:
1906+
content_disposition_header_key = QByteArray("content-disposition".encode())
1907+
1908+
filename = model_url.path().split("/")[-1] + ".stl"
1909+
1910+
if response.hasRawHeader(content_disposition_header_key):
1911+
# content_disposition is in the format
1912+
# ```
1913+
# content_disposition attachment; filename="[FILENAME]"
1914+
# ```
1915+
# Use a regex to extract the filename
1916+
content_disposition = str(response.rawHeader(content_disposition_header_key).data(),
1917+
encoding='utf-8')
1918+
content_disposition_match = re.match(r'attachment; filename=(?P<filename>.*)',
1919+
content_disposition)
1920+
if content_disposition_match is not None:
1921+
filename = content_disposition_match.group("filename").strip("\"")
1922+
1923+
tmp = tempfile.NamedTemporaryFile(suffix=filename, delete=False)
1924+
with open(tmp.name, "wb") as f:
1925+
f.write(response.readAll())
1926+
1927+
self.readLocalFile(QUrl.fromLocalFile(tmp.name), add_to_recent_files=False)
1928+
except Exception as ex:
1929+
Logger.warning(f"Exception {str(ex)}")
1930+
on_error()
19281931

19291932
self.getHttpRequestManager().get(
19301933
model_url.url(),

‎plugins/PostProcessingPlugin/scripts/FilamentChange.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def getSettingDataString(self):
9292
"type": "float",
9393
"default_value": 0,
9494
"minimum_value": 0,
95-
"enabled": "enabled"
95+
"enabled": "enabled and not firmware_config"
9696
},
9797
"retract_method":
9898
{

‎resources/definitions/biqu_b2.def.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"version": 2,
3+
"name": "Biqu B2",
4+
"inherits": "biqu_b1",
5+
"metadata":
6+
{
7+
"visible": true,
8+
"author": "Boris Juraga",
9+
"has_textured_buildplate": true,
10+
"machine_extruder_trains":
11+
{
12+
"0": "biqu_b2_extruder_0",
13+
"1": "biqu_b2_extruder_1"
14+
},
15+
"quality_definition": "biqu_b2"
16+
},
17+
"overrides":
18+
{
19+
"gantry_height": { "value": 27.5 },
20+
"machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y{machine_depth}\n;END OF CUSTOM END GCODE" },
21+
"machine_extruder_count": { "default_value": 2 },
22+
"machine_extruders_share_heater": { "default_value": true },
23+
"machine_extruders_share_nozzle": { "default_value": true },
24+
"machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 },
25+
"machine_head_with_fans_polygon":
26+
{
27+
"default_value": [
28+
[-33, 35],
29+
[-33, -23],
30+
[33, -23],
31+
[33, 35]
32+
]
33+
},
34+
"machine_name": { "default_value": "BIQU B2" },
35+
"machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\nT{initial_extruder_nr} ; RESET EXTRUDER TO INITIAL\n; start print\n;END OF CUSTOM START GCODE" },
36+
"prime_tower_enable": { "default_value": true },
37+
"prime_tower_mode": { "default_value": "interleaved" }
38+
}
39+
}

‎resources/definitions/geeetech_M1.def.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"version": 2,
3+
"name": "Geeetech M1",
4+
"inherits": "Geeetech_Base_Single_Extruder",
5+
"metadata":
6+
{
7+
"visible": true,
8+
"machine_extruder_trains": { "0": "Geeetech_Single_Extruder" }
9+
},
10+
"overrides":
11+
{
12+
"adhesion_type": { "value": "'brim'" },
13+
"brim_width": { "value": 2 },
14+
"gantry_height": { "value": 35 },
15+
"machine_depth": { "default_value": 105 },
16+
"machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" },
17+
"machine_head_with_fans_polygon":
18+
{
19+
"default_value": [
20+
[-31, 31],
21+
[34, 31],
22+
[34, -40],
23+
[-31, -40]
24+
]
25+
},
26+
"machine_height": { "default_value": 95 },
27+
"machine_name": { "default_value": "Geeetech M1" },
28+
"machine_start_gcode": { "default_value": ";Official wiki URL for Geeetech M1:https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" },
29+
"machine_width": { "default_value": 105 },
30+
"material_bed_temperature": { "maximum_value": 60 },
31+
"material_print_temperature": { "maximum_value": 230 },
32+
"retraction_amount": { "value": 2 },
33+
"speed_print":
34+
{
35+
"maximum_value_warning": "200",
36+
"value": 120
37+
},
38+
"speed_topbottom":
39+
{
40+
"maximum_value_warning": "200",
41+
"value": 60
42+
},
43+
"speed_wall":
44+
{
45+
"maximum_value_warning": "200",
46+
"value": 80
47+
},
48+
"speed_wall_0":
49+
{
50+
"maximum_value_warning": "200",
51+
"value": 50
52+
},
53+
"speed_wall_x":
54+
{
55+
"maximum_value_warning": "200",
56+
"value": 80
57+
}
58+
}
59+
}

‎resources/definitions/geeetech_M1S.def.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"version": 2,
3+
"name": "Geeetech M1S",
4+
"inherits": "Geeetech_Base_Single_Extruder",
5+
"metadata":
6+
{
7+
"visible": true,
8+
"machine_extruder_trains": { "0": "Geeetech_Single_Extruder" }
9+
},
10+
"overrides":
11+
{
12+
"adhesion_type": { "value": "'brim'" },
13+
"brim_width": { "value": 2 },
14+
"gantry_height": { "value": 35 },
15+
"machine_depth": { "default_value": 105 },
16+
"machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" },
17+
"machine_head_with_fans_polygon":
18+
{
19+
"default_value": [
20+
[-31, 31],
21+
[34, 31],
22+
[34, -40],
23+
[-31, -40]
24+
]
25+
},
26+
"machine_height": { "default_value": 95 },
27+
"machine_name": { "default_value": "Geeetech M1S" },
28+
"machine_start_gcode": { "default_value": ";Official wiki URL for Geeetech M1S:https://www.geeetech.com/wiki/index.php/Geeetech_M1S_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" },
29+
"machine_width": { "default_value": 105 },
30+
"material_bed_temperature": { "maximum_value": 85 },
31+
"material_print_temperature": { "maximum_value": 250 },
32+
"retraction_amount": { "value": 2 },
33+
"speed_print":
34+
{
35+
"maximum_value_warning": "200",
36+
"value": 120
37+
},
38+
"speed_topbottom":
39+
{
40+
"maximum_value_warning": "200",
41+
"value": 60
42+
},
43+
"speed_wall":
44+
{
45+
"maximum_value_warning": "200",
46+
"value": 80
47+
},
48+
"speed_wall_0":
49+
{
50+
"maximum_value_warning": "200",
51+
"value": 50
52+
},
53+
"speed_wall_x":
54+
{
55+
"maximum_value_warning": "200",
56+
"value": 80
57+
}
58+
}
59+
}

‎resources/definitions/geeetech_Thunder.def.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,10 @@
8181
"machine_max_jerk_xy": { "value": 45 },
8282
"machine_max_jerk_z": { "value": 0.8 },
8383
"machine_name": { "default_value": "Geeetech Thunder" },
84-
"machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; 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.4 F3000.0 ; Scrape off nozzle residue" },
84+
"machine_start_gcode": { "default_value": ";Official wiki URL for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; 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.4 F3000.0 ; Scrape off nozzle residue" },
8585
"machine_width": { "default_value": 250 },
8686
"material_flow_layer_0": { "value": 95 },
87-
"material_print_temperature":
88-
{
89-
"maximum_value": "250",
90-
"value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220"
91-
},
87+
"material_print_temperature": { "maximum_value": "250" },
9288
"material_print_temperature_layer_0":
9389
{
9490
"maximum_value_warning": 300,

‎resources/definitions/hellbot_hidra.def.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
0,
2222
5
2323
],
24-
"platform_texture": "hellbot_hidra.png"
24+
"platform_texture": "Hellbot_Hidra_and_Hidra_Plus_V2.png"
2525
},
2626
"overrides":
2727
{

‎resources/definitions/hellbot_hidra_plus.def.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
0,
2222
5
2323
],
24-
"platform_texture": "hellbot_hidra_plus.png"
24+
"platform_texture": "Hellbot_Hidra_and_Hidra_Plus_V2.png"
2525
},
2626
"overrides":
2727
{

‎resources/definitions/sovol_sv01.def.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"version": 2,
33
"name": "Sovol SV01",
4-
"inherits": "sovol_base_bowden",
4+
"inherits": "sovol_base_titan",
55
"metadata":
66
{
77
"visible": true,
8-
"quality_definition": "sovol_base_bowden"
8+
"quality_definition": "sovol_base_titan"
99
},
1010
"overrides":
1111
{

‎resources/definitions/toybox_alpha_one_two.def.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"version": 2,
3+
"name": "Toybox Alpha One/Two",
4+
"inherits": "fdmprinter",
5+
"metadata":
6+
{
7+
"visible": true,
8+
"author": "lukbrew25",
9+
"manufacturer": "Toybox",
10+
"file_formats": "text/x-gcode",
11+
"has_machine_quality": false,
12+
"machine_extruder_trains": { "0": "toybox_alpha_one_two_extruder_0" }
13+
},
14+
"overrides":
15+
{
16+
"gantry_height": { "value": "0.0" },
17+
"machine_depth": { "default_value": 80 },
18+
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
19+
"machine_height": { "default_value": 90 },
20+
"machine_name": { "default_value": "Toybox Alpha One/Two" },
21+
"machine_start_gcode": { "default_value": "G90\nM82" },
22+
"machine_width": { "default_value": 70 },
23+
"material_diameter": { "default_value": 1.75 }
24+
}
25+
}

0 commit comments

Comments
 (0)