Skip to content

Commit

Permalink
Merge branch 'main' into Optimisation-Enable-ERS-segment-length-down-…
Browse files Browse the repository at this point in the history
…to-0.5mm
  • Loading branch information
igiannakas authored Nov 29, 2024
2 parents 91ac292 + 3e6835b commit d895aab
Show file tree
Hide file tree
Showing 27 changed files with 1,093 additions and 325 deletions.
10 changes: 8 additions & 2 deletions flatpak/io.github.softfever.OrcaSlicer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ finish-args:
- --filesystem=xdg-run/gvfs
- --filesystem=/run/media
- --filesystem=/media
- --filesystem=/run/spnav.sock:ro
# Allow OrcaSlicer to talk to other instances
- --talk-name=io.github.softfever.OrcaSlicer.InstanceCheck.*
- --system-talk-name=org.freedesktop.UDisks2
- --env=SPNAV_SOCKET=/run/spnav.sock

modules:

Expand Down Expand Up @@ -78,6 +80,12 @@ modules:
tag: v5.249.0
cleanup:
- /

- name: libspnav
sources:
- type: archive
url: https://github.com/FreeSpacenav/libspnav/releases/download/v1.1/libspnav-1.1.tar.gz
sha256: 04b297f68a10db4fa40edf68d7f823ba7b9d0442f2b665181889abe2cea42759

- name: orca_wxwidgets
buildsystem: simple
Expand Down Expand Up @@ -296,8 +304,6 @@ modules:
# OrcaSlicer Source Archive
- type: dir
path: ../
- type: patch
path: patches/libslic3r_missing_include.patch

# AppData metainfo for Gnome Software & Co.
- type: file
Expand Down
12 changes: 0 additions & 12 deletions flatpak/patches/libslic3r_missing_include.patch

This file was deleted.

36 changes: 36 additions & 0 deletions resources/profiles/Ratrig.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,18 @@
"name": "0.25mm Quality Speed @RatRig V-Core 4 0.5",
"sub_path": "process/0.25mm Quality Speed @RatRig V-Core 4 0.5.json"
},
{
"name": "0.35mm Extra Big @RatRig V-Core 4 HYBRID 0.8",
"sub_path": "process/0.35mm Extra Big @RatRig V-Core 4 HYBRID 0.8.json"
},
{
"name": "0.30mm Big @RatRig V-Core 4 HYBRID 0.8",
"sub_path": "process/0.30mm Big @RatRig V-Core 4 HYBRID 0.8.json"
},
{
"name": "0.25mm Speed @RatRig V-Core 4 HYBRID 0.8",
"sub_path": "process/0.25mm Speed @RatRig V-Core 4 HYBRID 0.8.json"
},
{
"name": "0.25mm Quality Speed @RatRig V-Core 4 0.6",
"sub_path": "process/0.25mm Quality Speed @RatRig V-Core 4 0.6.json"
Expand Down Expand Up @@ -204,6 +216,10 @@
"name": "RatRig Generic PLA-CF",
"sub_path": "filament/RatRig Generic PLA-CF.json"
},
{
"name": "RatRig Generic PCTG",
"sub_path": "filament/RatRig Generic PCTG.json"
},
{
"name": "RatRig Generic PETG",
"sub_path": "filament/RatRig Generic PETG.json"
Expand Down Expand Up @@ -247,6 +263,26 @@
{
"name": "RatRig PunkFil PETG",
"sub_path": "filament/RatRig PunkFil PETG.json"
},
{
"name": "RatRig BigNozzle ABS",
"sub_path": "filament/RatRig BigNozzle ABS.json"
},
{
"name": "RatRig BigNozzle ASA",
"sub_path": "filament/RatRig BigNozzle ASA.json"
},
{
"name": "RatRig BigNozzle PLA",
"sub_path": "filament/RatRig BigNozzle PLA.json"
},
{
"name": "RatRig BigNozzle PETG",
"sub_path": "filament/RatRig BigNozzle PETG.json"
},
{
"name": "RatRig BigNozzle PCTG",
"sub_path": "filament/RatRig BigNozzle PCTG.json"
}
],
"machine_list": [
Expand Down
54 changes: 54 additions & 0 deletions resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"type": "filament",
"filament_id": "GFB99",
"setting_id": "GFSA04",
"name": "RatRig BigNozzle ABS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"18"
],
"filament_z_hop": [
"0"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.03"
],
"hot_plate_temp_initial_layer" : [
"108"
],
"nozzle_temperature_initial_layer": [
"270"
],
"nozzle_temperature": [
"265"
],
"nozzle_temperature_range_low": [
"240"
],
"nozzle_temperature_range_high": [
"290"
],
"close_fan_the_first_x_layers": [
"2"
],
"fan_cooling_layer_time": [
"10"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"overhang_fan_speed": [
"30"
]
}
54 changes: 54 additions & 0 deletions resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"type": "filament",
"filament_id": "GFB98",
"setting_id": "GFSA04",
"name": "RatRig BigNozzle ASA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_asa",
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"19"
],
"filament_z_hop": [
"0"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.033"
],
"hot_plate_temp_initial_layer" : [
"108"
],
"nozzle_temperature_initial_layer": [
"270"
],
"nozzle_temperature": [
"265"
],
"nozzle_temperature_range_low": [
"240"
],
"nozzle_temperature_range_high": [
"290"
],
"close_fan_the_first_x_layers": [
"2"
],
"fan_cooling_layer_time": [
"10"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"overhang_fan_speed": [
"28"
]
}
69 changes: 69 additions & 0 deletions resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"type": "filament",
"filament_id": "GFC99",
"setting_id": "GFSA04",
"name": "RatRig BigNozzle PCTG",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"fan_cooling_layer_time": [
"30"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"25%"
],
"fan_max_speed": [
"50"
],
"fan_min_speed": [
"15"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"8"
],
"filament_flow_ratio": [
"0.96"
],
"filament_density": [
"1.29"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_z_hop": [
"0"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.045"
],
"nozzle_temperature_initial_layer": [
"280"
],
"nozzle_temperature": [
"275"
],
"nozzle_temperature_range_high": [
"300"
],
"nozzle_temperature_range_low": [
"240"
],
"temperature_vitrification": [
"90"
]
}
63 changes: 63 additions & 0 deletions resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSA04",
"name": "RatRig BigNozzle PETG",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"fan_cooling_layer_time": [
"10"
],
"overhang_fan_speed": [
"100"
],
"overhang_fan_threshold": [
"25%"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"8"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_z_hop": [
"0"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.045"
],
"nozzle_temperature_initial_layer": [
"260"
],
"nozzle_temperature": [
"255"
],
"nozzle_temperature_range_high": [
"280"
],
"nozzle_temperature_range_low": [
"230"
]
}
39 changes: 39 additions & 0 deletions resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "filament",
"filament_id": "GFL99",
"setting_id": "GFSA04",
"name": "RatRig BigNozzle PLA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"20"
],
"filament_z_hop": [
"0"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.05"
],
"slow_down_layer_time": [
"8"
],
"nozzle_temperature_initial_layer": [
"230"
],
"nozzle_temperature": [
"235"
],
"nozzle_temperature_range_high": [
"260"
],
"nozzle_temperature_range_low": [
"210"
]
}
Loading

0 comments on commit d895aab

Please sign in to comment.