Skip to content

Commit b137559

Browse files
discipdiscip
authored
Merge branch 'SoftFever:main' into test
2 parents 147489b + 1bce6a2 commit b137559

36 files changed

+355
-64
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Join our Discord community here:<br>
1010

1111
<h3>🚨🚨🚨Important Security Alert🚨🚨🚨</h3>
1212

13-
The only official platforms for OrcaSlicer are **our GitHub project page**, <a href="https://www.orcaslicer.com/">**orcaslicer.com**</a>, and the <a href="https://discord.gg/P4VE9UY9gJ">**official Discord channel**</a>.
13+
The only official platforms for OrcaSlicer are **our GitHub project page**, <a href="https://orcaslicer.com/">**orcaslicer.com**</a>, and the <a href="https://discord.gg/P4VE9UY9gJ">**official Discord channel**</a>.
1414

1515
Please be aware that "**orcaslicer.net**", "**orcaslicer.co**" or "**orca-slicer.com**" are NOT an official website for OrcaSlicer and may be potentially malicious. These sites appear to use AI-generated content, lacking genuine context and seems to exist solely to profit from advertisements. Worse, it may redirect download links to harmful sources. For your safety, avoid downloading OrcaSlicer from this site as the links may be compromised.
1616

‎doc/Calibration.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ The default value in Marlin is typically set to 0.08mm, which may be too high fo
315315
M205 J0.012
316316
M500
317317
```
318-
3. Recompile four MarlinFW
319-
1. In Configuration.h set:
318+
3. Recompile your MarlinFW
319+
1. In Configuration.h uncomment and set:
320320
```cpp
321321
#define JUNCTION_DEVIATION_MM 0.012 // (mm) Distance from real junction edge
322322
```
@@ -333,10 +333,10 @@ Because of the nature of these artifacts the methods to reduce them can be mecha
333333

334334
***
335335
*Credits:*
336-
- *The Flowrate test and retraction test is inspired by [SuperSlicer](https://github.com/supermerill/SuperSlicer)*
337-
- *The PA Line method is inspired by [K-factor Calibration Pattern](https://marlinfw.org/tools/lin_advance/k-factor.html)*
338-
- *The PA Tower method is inspired by [Klipper](https://www.klipper3d.org/Pressure_Advance.html)*
339-
- *The temp tower model is remixed from [Smart compact temperature calibration tower](https://www.thingiverse.com/thing:2729076)
340-
- *The max flowrate test was inspired by Stefan(CNC Kitchen), and the model used in the test is a remix of his [Extrusion Test Structure](https://www.printables.com/model/342075-extrusion-test-structure).
341-
- *ZV Input Shaping is inspired by [Marlin Input Shaping](https://marlinfw.org/docs/features/input_shaping.html) and [Ringing Tower 3D STL](https://marlinfw.org/assets/stl/ringing_tower.stl)
336+
- *The Flowrate test and retraction test is inspired by [SuperSlicer](https://github.com/supermerill/SuperSlicer).*
337+
- *The PA Line method is inspired by [K-factor Calibration Pattern](https://marlinfw.org/tools/lin_advance/k-factor.html).*
338+
- *The PA Tower method is inspired by [Klipper](https://www.klipper3d.org/Pressure_Advance.html).*
339+
- *The temp tower model is remixed from [Smart compact temperature calibration tower](https://www.thingiverse.com/thing:2729076).*
340+
- *The max flowrate test was inspired by Stefan (CNC Kitchen), and the model used in the test is a remix of his [Extrusion Test Structure](https://www.printables.com/model/342075-extrusion-test-structure).*
341+
- *ZV Input Shaping is inspired by [Marlin Input Shaping](https://marlinfw.org/docs/features/input_shaping.html) and [Ringing Tower 3D STL](https://marlinfw.org/assets/stl/ringing_tower.stl).*
342342
- *ChatGPT* ;)

‎resources/profiles/Co Print/machine/fdm_machine_common.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
"retraction_speed": [
106106
"60"
107107
],
108+
"machine_load_filament_time": "9.75",
109+
"machine_unload_filament_time": "9.75",
108110
"single_extruder_multi_material": "1",
109111
"wipe": [
110112
"1"

‎resources/profiles/Prusa.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,10 @@
893893
"name": "fdm_filament_pa11cf",
894894
"sub_path": "filament/fdm_filament_pa11cf.json"
895895
},
896+
{
897+
"name": "fdm_filament_flex",
898+
"sub_path": "filament/fdm_filament_flex.json"
899+
},
896900
{
897901
"name": "Prusa Generic PLA",
898902
"sub_path": "filament/Prusa Generic PLA.json"
@@ -997,6 +1001,14 @@
9971001
"name": "Prusa Generic TPU @MINIIS",
9981002
"sub_path": "filament/Prusa Generic TPU @MINIIS.json"
9991003
},
1004+
{
1005+
"name": "Prusa Generic FLEX @XL",
1006+
"sub_path": "filament/Prusa Generic FLEX @XL.json"
1007+
},
1008+
{
1009+
"name": "Prusa Generic FLEX @XL 5T",
1010+
"sub_path": "filament/Prusa Generic FLEX @XL 5T.json"
1011+
},
10001012
{
10011013
"name": "Prusa Generic ASA",
10021014
"sub_path": "filament/Prusa Generic ASA.json"

‎resources/profiles/Prusa/Prusa XL.svg‎

Lines changed: 1 addition & 17 deletions
Loading

‎resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"type": "filament",
3+
"setting_id": "GFSA04",
4+
"name": "Prusa Generic FLEX @XL 5T",
5+
"from": "system",
6+
"instantiation": "true",
7+
"inherits": "fdm_filament_flex",
8+
"filament_loading_speed_start": "3",
9+
"filament_loading_speed": "28",
10+
"filament_unloading_speed_start": "100",
11+
"filament_unloading_speed": "90",
12+
"filament_load_time": "0",
13+
"filament_unload_time": "0",
14+
"filament_cooling_moves": "4",
15+
"filament_cooling_initial_speed": "2.2",
16+
"filament_cooling_final_speed": "3.4",
17+
"filament_retract_lift_below": "0.6",
18+
"filament_multitool_ramming": [
19+
"0"
20+
],
21+
"filament_multitool_ramming_volume": [
22+
"40"
23+
],
24+
"filament_multitool_ramming_flow": [
25+
"2.5"
26+
],
27+
"compatible_printers": [
28+
"Prusa XL 5T 0.25 nozzle",
29+
"Prusa XL 5T 0.3 nozzle",
30+
"Prusa XL 5T 0.4 nozzle",
31+
"Prusa XL 5T 0.5 nozzle",
32+
"Prusa XL 5T 0.6 nozzle",
33+
"Prusa XL 5T 0.8 nozzle"
34+
]
35+
}

‎resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"type": "filament",
3+
"setting_id": "GFSA04",
4+
"name": "Prusa Generic FLEX @XL",
5+
"from": "system",
6+
"instantiation": "true",
7+
"inherits": "fdm_filament_flex",
8+
"filament_loading_speed_start": "3",
9+
"filament_loading_speed": "28",
10+
"filament_unloading_speed_start": "100",
11+
"filament_unloading_speed": "90",
12+
"filament_load_time": "0",
13+
"filament_unload_time": "0",
14+
"filament_cooling_moves": "4",
15+
"filament_cooling_initial_speed": "2.2",
16+
"filament_cooling_final_speed": "3.4",
17+
"filament_retract_lift_below": "0.6",
18+
"filament_multitool_ramming": [
19+
"0"
20+
],
21+
"filament_multitool_ramming_volume": [
22+
"40"
23+
],
24+
"filament_multitool_ramming_flow": [
25+
"2.5"
26+
],
27+
"compatible_printers": [
28+
"Prusa XL 0.25 nozzle",
29+
"Prusa XL 0.3 nozzle",
30+
"Prusa XL 0.4 nozzle",
31+
"Prusa XL 0.5 nozzle",
32+
"Prusa XL 0.6 nozzle",
33+
"Prusa XL 0.8 nozzle"
34+
]
35+
}

‎resources/profiles/Prusa/filament/fdm_filament_flex.json‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"type": "filament",
3+
"name": "fdm_filament_flex",
4+
"from": "system",
5+
"instantiation": "false",
6+
"inherits": "fdm_filament_common",
7+
"filament_id": "GFU99",
8+
"hot_plate_temp_initial_layer" : [
9+
"50"
10+
],
11+
"hot_plate_temp" : [
12+
"50"
13+
],
14+
"fan_cooling_layer_time": [
15+
"100"
16+
],
17+
"filament_max_volumetric_speed": [
18+
"2.5"
19+
],
20+
"filament_type": [
21+
"FLEX"
22+
],
23+
"filament_density": [
24+
"1.22"
25+
],
26+
"filament_cost": [
27+
"20"
28+
],
29+
"filament_retraction_length": [
30+
"2.5"
31+
],
32+
"filament_retraction_speed": [
33+
"60"
34+
],
35+
"filament_deretraction_speed": [
36+
"20"
37+
],
38+
"filament_retraction_minimum_travel": [
39+
"2"
40+
],
41+
"filament_wipe": "0",
42+
"idle_temperature": "70",
43+
"nozzle_temperature_initial_layer": [
44+
"230"
45+
],
46+
"reduce_fan_stop_start_freq": [
47+
"1"
48+
],
49+
"slow_down_for_layer_cooling": [
50+
"1"
51+
],
52+
"fan_max_speed": [
53+
"30"
54+
],
55+
"fan_min_speed": [
56+
"30"
57+
],
58+
"overhang_fan_speed": [
59+
"80"
60+
],
61+
"additional_cooling_fan_speed": [
62+
"70"
63+
],
64+
"close_fan_the_first_x_layers": [
65+
"3"
66+
],
67+
"nozzle_temperature": [
68+
"230"
69+
],
70+
"filament_start_gcode": [
71+
"M900 K0 ; Filament gcode\n\nM142 S36 ; set heatbreak target temp"
72+
],
73+
"filament_end_gcode": [
74+
"; Filament-specific end gcode"
75+
]
76+
}

‎resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "Prusa XL 0.3 nozzle",
55
"from": "system",
66
"instantiation": "true",
7-
"inherits": "fdm_machine_common",
7+
"inherits": "fdm_machine_common_xl",
88
"gcode_flavor": "marlin2",
99
"printer_model": "Prusa XL",
1010
"default_filament_profile": "Prusa Generic PLA @XL",

‎resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"default_filament_profile": "Prusa Generic PLA @XL 5T",
1111
"default_print_profile": "0.15mm Speed @Prusa XL 5T 0.25",
1212
"printer_variant": "0.25",
13+
"max_layer_height": "0.15",
14+
"min_layer_height": "0.05",
1315
"nozzle_diameter": [
1416
"0.25",
1517
"0.25",

0 commit comments

Comments
 (0)