Merge branch 'main' into main

This commit is contained in:
VOLUMIC 2024-11-29 11:04:19 +01:00 committed by GitHub
commit f30fb2477b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 1093 additions and 325 deletions

View file

@ -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:
@ -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
@ -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

View file

@ -1,12 +0,0 @@
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 528a72e70..1530fe655 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -31,6 +31,7 @@
#include <boost/log/trivial.hpp>
#include <tbb/parallel_for.h>
+#include <tbb/spin_mutex.h>
#include <Shiny/Shiny.h>

View file

@ -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"
@ -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"
@ -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": [

View file

@ -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"
]
}

View file

@ -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"
]
}

View file

@ -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"
]
}

View file

@ -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"
]
}

View file

@ -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"
]
}

View file

@ -0,0 +1,66 @@
{
"type": "filament",
"filament_id": "GFC99",
"setting_id": "GFCA04",
"name": "RatRig Generic 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": [
"40"
],
"fan_min_speed": [
"10"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"8"
],
"filament_flow_ratio": [
"0.94"
],
"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": [
"255"
],
"nozzle_temperature": [
"255"
],
"nozzle_temperature_range_high": [
"270"
],
"temperature_vitrification": [
"90"
]
}

View file

@ -0,0 +1,59 @@
{
"type": "machine",
"setting_id": "GM002",
"name": "RatRig V-Core 4 HYBRID 300 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "RatRig V-Core 4 HYBRID 300",
"printer_variant": "0.8",
"nozzle_diameter": [
"0.8"
],
"printable_area": [
"0x0",
"300x0",
"300x300",
"0x300"
],
"machine_max_speed_x": ["500", "500"],
"machine_max_speed_y": ["500", "500"],
"machine_max_speed_z": ["200", "200"],
"machine_max_speed_e": ["120", "120"],
"machine_max_acceleration_x": ["20000", "20000"],
"machine_max_acceleration_y": ["20000", "20000"],
"machine_max_acceleration_z": ["200", "200"],
"machine_max_acceleration_e": ["5000", "5000"],
"machine_max_acceleration_extruding": ["20000", "20000"],
"machine_max_acceleration_retracting": ["20000", "20000"],
"machine_max_acceleration_travel": ["20000", "20000"],
"machine_max_jerk_x": ["5", "5"],
"machine_max_jerk_y": ["5", "5"],
"machine_max_jerk_z": ["0.4", "0.4"],
"machine_max_jerk_e": ["5", "5"],
"min_layer_height": ["0.12"],
"max_layer_height": ["0.5"],
"extruder_clearance_radius": "45",
"extruder_clearance_height_to_rod": "25",
"extruder_clearance_height_to_lid": "140",
"retract_lift_below": ["0.3"],
"retraction_length": ["0.8"],
"retraction_speed": ["120"],
"deretraction_speed": ["120"],
"wipe": ["1"],
"retract_before_wipe": ["70%"],
"z_hop": ["0.2"],
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}",
"change_filament_gcode": "M600",
"machine_pause_gcode": "PAUSE",
"printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0",
"printable_height": "300",
"time_lapse_gcode": "TIMELAPSE_TAKE_FRAME",
"thumbnails": [
"64x64/PNG",
"100x100/PNG",
"400x300/PNG"
]
}

View file

@ -0,0 +1,59 @@
{
"type": "machine",
"setting_id": "GM002",
"name": "RatRig V-Core 4 HYBRID 400 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "RatRig V-Core 4 HYBRID 400",
"printer_variant": "0.8",
"nozzle_diameter": [
"0.8"
],
"printable_area": [
"0x0",
"400x0",
"400x400",
"0x400"
],
"machine_max_speed_x": ["500", "500"],
"machine_max_speed_y": ["500", "500"],
"machine_max_speed_z": ["200", "200"],
"machine_max_speed_e": ["120", "120"],
"machine_max_acceleration_x": ["20000", "20000"],
"machine_max_acceleration_y": ["20000", "20000"],
"machine_max_acceleration_z": ["200", "200"],
"machine_max_acceleration_e": ["5000", "5000"],
"machine_max_acceleration_extruding": ["20000", "20000"],
"machine_max_acceleration_retracting": ["20000", "20000"],
"machine_max_acceleration_travel": ["20000", "20000"],
"machine_max_jerk_x": ["5", "5"],
"machine_max_jerk_y": ["5", "5"],
"machine_max_jerk_z": ["0.4", "0.4"],
"machine_max_jerk_e": ["5", "5"],
"min_layer_height": ["0.12"],
"max_layer_height": ["0.5"],
"extruder_clearance_radius": "45",
"extruder_clearance_height_to_rod": "25",
"extruder_clearance_height_to_lid": "140",
"retract_lift_below": ["0.3"],
"retraction_length": ["0.8"],
"retraction_speed": ["120"],
"deretraction_speed": ["120"],
"wipe": ["1"],
"retract_before_wipe": ["70%"],
"z_hop": ["0.2"],
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}",
"change_filament_gcode": "M600",
"machine_pause_gcode": "PAUSE",
"printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0",
"printable_height": "400",
"time_lapse_gcode": "TIMELAPSE_TAKE_FRAME",
"thumbnails": [
"64x64/PNG",
"100x100/PNG",
"400x300/PNG"
]
}

View file

@ -0,0 +1,59 @@
{
"type": "machine",
"setting_id": "GM002",
"name": "RatRig V-Core 4 HYBRID 500 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "RatRig V-Core 4 HYBRID 500",
"printer_variant": "0.8",
"nozzle_diameter": [
"0.6"
],
"printable_area": [
"0x0",
"500x0",
"500x500",
"0x500"
],
"machine_max_speed_x": ["500", "500"],
"machine_max_speed_y": ["500", "500"],
"machine_max_speed_z": ["200", "200"],
"machine_max_speed_e": ["120", "120"],
"machine_max_acceleration_x": ["20000", "20000"],
"machine_max_acceleration_y": ["20000", "20000"],
"machine_max_acceleration_z": ["200", "200"],
"machine_max_acceleration_e": ["5000", "5000"],
"machine_max_acceleration_extruding": ["20000", "20000"],
"machine_max_acceleration_retracting": ["20000", "20000"],
"machine_max_acceleration_travel": ["20000", "20000"],
"machine_max_jerk_x": ["5", "5"],
"machine_max_jerk_y": ["5", "5"],
"machine_max_jerk_z": ["0.4", "0.4"],
"machine_max_jerk_e": ["5", "5"],
"min_layer_height": ["0.12"],
"max_layer_height": ["0.5"],
"extruder_clearance_radius": "45",
"extruder_clearance_height_to_rod": "25",
"extruder_clearance_height_to_lid": "140",
"retract_lift_below": ["0.3"],
"retraction_length": ["0.8"],
"retraction_speed": ["120"],
"deretraction_speed": ["120"],
"wipe": ["1"],
"retract_before_wipe": ["70%"],
"z_hop": ["0.2"],
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}",
"change_filament_gcode": "M600",
"machine_pause_gcode": "PAUSE",
"printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0",
"printable_height": "500",
"time_lapse_gcode": "TIMELAPSE_TAKE_FRAME",
"thumbnails": [
"64x64/PNG",
"100x100/PNG",
"400x300/PNG"
]
}

View file

@ -57,6 +57,6 @@
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.4 nozzle",
"RatRig V-Core 4 HYBRID 400 0.4 nozzle",
"RatRig V-Core 4 HYBIRD 500 0.4 nozzle"
"RatRig V-Core 4 HYBRID 500 0.4 nozzle"
]
}

View file

@ -1,62 +1,62 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.5",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "4",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "25%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.55",
"initial_layer_line_width": "0.7",
"inner_wall_line_width": "0.55",
"outer_wall_line_width": "0.52",
"sparse_infill_line_width": "0.55",
"internal_solid_infill_line_width": "0.55",
"top_surface_line_width": "0.55",
"support_line_width": "0.55",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.5 nozzle",
"RatRig V-Core 4 HYBRID 400 0.5 nozzle",
"RatRig V-Core 4 HYBIRD 500 0.5 nozzle"
]
}
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.5",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "4",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "25%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.55",
"initial_layer_line_width": "0.7",
"inner_wall_line_width": "0.55",
"outer_wall_line_width": "0.52",
"sparse_infill_line_width": "0.55",
"internal_solid_infill_line_width": "0.55",
"top_surface_line_width": "0.55",
"support_line_width": "0.55",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.5 nozzle",
"RatRig V-Core 4 HYBRID 400 0.5 nozzle",
"RatRig V-Core 4 HYBRID 500 0.5 nozzle"
]
}

View file

@ -1,62 +1,62 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.6",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "4",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "25%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.65",
"initial_layer_line_width": "0.84",
"inner_wall_line_width": "0.65",
"outer_wall_line_width": "0.65",
"sparse_infill_line_width": "0.65",
"internal_solid_infill_line_width": "0.65",
"top_surface_line_width": "0.65",
"support_line_width": "0.65",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.6 nozzle",
"RatRig V-Core 4 HYBRID 400 0.6 nozzle",
"RatRig V-Core 4 HYBIRD 500 0.6 nozzle"
]
}
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.6",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "4",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "25%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.65",
"initial_layer_line_width": "0.84",
"inner_wall_line_width": "0.65",
"outer_wall_line_width": "0.65",
"sparse_infill_line_width": "0.65",
"internal_solid_infill_line_width": "0.65",
"top_surface_line_width": "0.65",
"support_line_width": "0.65",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.6 nozzle",
"RatRig V-Core 4 HYBRID 400 0.6 nozzle",
"RatRig V-Core 4 HYBRID 500 0.6 nozzle"
]
}

View file

@ -1,60 +1,60 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 0.6",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "400",
"small_perimeter_speed": "350",
"outer_wall_speed": "400",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "200",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "10000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "10000",
"line_width": "0.45",
"initial_layer_line_width": "0.5",
"inner_wall_line_width": "0.45",
"outer_wall_line_width": "0.45",
"sparse_infill_line_width": "0.45",
"internal_solid_infill_line_width": "0.45",
"top_surface_line_width": "0.45",
"support_line_width": "0.45",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 300 0.6 nozzle",
"RatRig V-Core 4 400 0.6 nozzle",
"RatRig V-Core 4 500 0.6 nozzle"
]
}
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 0.6",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "400",
"small_perimeter_speed": "350",
"outer_wall_speed": "400",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "200",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "10000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "10000",
"line_width": "0.65",
"initial_layer_line_width": "0.85",
"inner_wall_line_width": "0.65",
"outer_wall_line_width": "0.60",
"sparse_infill_line_width": "0.65",
"internal_solid_infill_line_width": "0.65",
"top_surface_line_width": "0.65",
"support_line_width": "0.65",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 300 0.6 nozzle",
"RatRig V-Core 4 400 0.6 nozzle",
"RatRig V-Core 4 500 0.6 nozzle"
]
}

View file

@ -1,60 +1,60 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 HYBRID 0.5",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "500",
"small_perimeter_speed": "500",
"outer_wall_speed": "500",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "800",
"initial_layer_speed": "200",
"outer_wall_acceleration": "15000",
"inner_wall_acceleration": "20000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "20000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "10000",
"default_acceleration": "20000",
"line_width": "0.45",
"initial_layer_line_width": "0.5",
"inner_wall_line_width": "0.45",
"outer_wall_line_width": "0.45",
"sparse_infill_line_width": "0.45",
"internal_solid_infill_line_width": "0.45",
"top_surface_line_width": "0.45",
"support_line_width": "0.45",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.5 nozzle",
"RatRig V-Core 4 HYBRID 400 0.5 nozzle",
"RatRig V-Core 4 HYBRID 500 0.5 nozzle"
]
}
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 HYBRID 0.5",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "500",
"small_perimeter_speed": "500",
"outer_wall_speed": "500",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "800",
"initial_layer_speed": "200",
"outer_wall_acceleration": "15000",
"inner_wall_acceleration": "20000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "20000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "10000",
"default_acceleration": "20000",
"line_width": "0.55",
"initial_layer_line_width": "0.7",
"inner_wall_line_width": "0.55",
"outer_wall_line_width": "0.52",
"sparse_infill_line_width": "0.55",
"internal_solid_infill_line_width": "0.55",
"top_surface_line_width": "0.55",
"support_line_width": "0.55",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.5 nozzle",
"RatRig V-Core 4 HYBRID 400 0.5 nozzle",
"RatRig V-Core 4 HYBRID 500 0.5 nozzle"
]
}

View file

@ -1,60 +1,60 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 HYBRID 0.6",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "500",
"small_perimeter_speed": "500",
"outer_wall_speed": "500",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "800",
"initial_layer_speed": "200",
"outer_wall_acceleration": "15000",
"inner_wall_acceleration": "20000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "20000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "10000",
"default_acceleration": "20000",
"line_width": "0.45",
"initial_layer_line_width": "0.5",
"inner_wall_line_width": "0.45",
"outer_wall_line_width": "0.45",
"sparse_infill_line_width": "0.45",
"internal_solid_infill_line_width": "0.45",
"top_surface_line_width": "0.45",
"support_line_width": "0.45",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.6 nozzle",
"RatRig V-Core 4 HYBRID 400 0.6 nozzle",
"RatRig V-Core 4 HYBRID 500 0.6 nozzle"
]
}
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 HYBRID 0.6",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "500",
"small_perimeter_speed": "500",
"outer_wall_speed": "500",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "800",
"initial_layer_speed": "200",
"outer_wall_acceleration": "15000",
"inner_wall_acceleration": "20000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "20000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "10000",
"default_acceleration": "20000",
"line_width": "0.65",
"initial_layer_line_width": "0.9",
"inner_wall_line_width": "0.65",
"outer_wall_line_width": "0.60",
"sparse_infill_line_width": "0.65",
"internal_solid_infill_line_width": "0.65",
"top_surface_line_width": "0.65",
"support_line_width": "0.65",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.6 nozzle",
"RatRig V-Core 4 HYBRID 400 0.6 nozzle",
"RatRig V-Core 4 HYBRID 500 0.6 nozzle"
]
}

View file

@ -0,0 +1,60 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.25mm Speed @RatRig V-Core 4 HYBRID 0.8",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.25",
"inital_layer_height": "0.3",
"wall_count": "2",
"top_shell_layers": "3",
"bottom_shell_layers": "2",
"top_shell_thickness": "0",
"sparse_infill_density": "10%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "500",
"small_perimeter_speed": "500",
"outer_wall_speed": "500",
"sparse_infill_speed": "500",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "150",
"gap_infill_speed": "200",
"travel_speed": "800",
"initial_layer_speed": "200",
"outer_wall_acceleration": "15000",
"inner_wall_acceleration": "20000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "20000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "10000",
"default_acceleration": "20000",
"line_width": "0.75",
"initial_layer_line_width": "1.1",
"inner_wall_line_width": "0.75",
"outer_wall_line_width": "0.70",
"sparse_infill_line_width": "0.75",
"internal_solid_infill_line_width": "0.75",
"top_surface_line_width": "0.75",
"support_line_width": "0.75",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.8 nozzle",
"RatRig V-Core 4 HYBRID 400 0.8 nozzle",
"RatRig V-Core 4 HYBRID 500 0.8 nozzle"
]
}

View file

@ -0,0 +1,67 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.30mm Big @RatRig V-Core 4 HYBRID 0.8",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.3",
"inital_layer_height": "0.35",
"wall_count": "3",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "25%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"enable_overhang_speed": "1",
"overhang_1_4_speed": "20",
"overhang_2_4_speed": "45",
"overhang_3_4_speed": "80",
"overhang_4_4_speed": "100",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.75",
"initial_layer_line_width": "1.1",
"inner_wall_line_width": "0.75",
"outer_wall_line_width": "0.70",
"sparse_infill_line_width": "0.75",
"internal_solid_infill_line_width": "0.75",
"top_surface_line_width": "0.75",
"support_line_width": "0.75",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.8 nozzle",
"RatRig V-Core 4 HYBRID 400 0.8 nozzle",
"RatRig V-Core 4 HYBRID 500 0.8 nozzle"
]
}

View file

@ -0,0 +1,67 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.35mm Extra Big @RatRig V-Core 4 HYBRID 0.8",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_ratrig_common",
"layer_height": "0.35",
"inital_layer_height": "0.4",
"wall_count": "3",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "30%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"enable_overhang_speed": "1",
"overhang_1_4_speed": "20",
"overhang_2_4_speed": "45",
"overhang_3_4_speed": "80",
"overhang_4_4_speed": "100",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.75",
"initial_layer_line_width": "1.1",
"inner_wall_line_width": "0.75",
"outer_wall_line_width": "0.70",
"sparse_infill_line_width": "0.75",
"internal_solid_infill_line_width": "0.75",
"top_surface_line_width": "0.75",
"support_line_width": "0.75",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 HYBRID 300 0.8 nozzle",
"RatRig V-Core 4 HYBRID 400 0.8 nozzle",
"RatRig V-Core 4 HYBRID 500 0.8 nozzle"
]
}

View file

@ -6,7 +6,7 @@
"instantiation": "true",
"inherits": "fdm_machine_common",
"printer_model": "Sovol SV06 ACE",
"default_print_profile": "0.20mm Standard @Sovol SV06 ACE",
"default_print_profile": "0.20mm Standard @Sovol SV06 ACE - official",
"nozzle_diameter": [
"0.4"
],
@ -127,4 +127,4 @@
"default_filament_profile": [
"Sovol SV06 ACE PLA"
]
}
}

View file

@ -6,7 +6,7 @@
"instantiation": "true",
"inherits": "fdm_machine_common",
"printer_model": "Sovol SV06 Plus ACE",
"default_print_profile": "0.20mm Standard @Sovol SV06 Plus ACE",
"default_print_profile": "0.20mm Standard @Sovol SV06 Plus ACE - official",
"nozzle_diameter": [
"0.4"
],
@ -130,4 +130,4 @@
"default_filament_profile": [
"Sovol SV06 Plus ACE PLA"
]
}
}

View file

@ -98,6 +98,8 @@ const std::vector<std::string> GCodeProcessor::Reserved_Tags_compatible = {
const std::string GCodeProcessor::Flush_Start_Tag = " FLUSH_START";
const std::string GCodeProcessor::Flush_End_Tag = " FLUSH_END";
//Orca: External device purge tag
const std::string GCodeProcessor::External_Purge_Tag = " EXTERNAL_PURGE";
const float GCodeProcessor::Wipe_Width = 0.05f;
const float GCodeProcessor::Wipe_Height = 0.05f;
@ -2289,6 +2291,24 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
m_flushing = false;
return;
}
// Orca: Integrate filament consumption for purging performed to an external device and controlled via macros
// (eg. Happy Hare) in the filament consumption stats.
if (boost::starts_with(comment, GCodeProcessor::External_Purge_Tag)) {
std::regex numberRegex(R"(\d+\.\d+)");
std::smatch match;
std::string line(comment);
if (std::regex_search(line, match, numberRegex)) {
float filament_diameter = (static_cast<size_t>(m_extruder_id) < m_result.filament_diameters.size()) ? m_result.filament_diameters[m_extruder_id] : m_result.filament_diameters.back();
float filament_radius = 0.5f * filament_diameter;
float area_filament_cross_section = static_cast<float>(M_PI) * sqr(filament_radius);
float dE = std::stof(match.str());
float volume_extruded_filament = area_filament_cross_section * dE;
m_used_filaments.update_flush_per_filament(m_extruder_id, volume_extruded_filament);
}
return;
}
if (!producers_enabled || m_producer == EProducer::OrcaSlicer) {
// height tag

View file

@ -272,6 +272,7 @@ class Print;
static const std::vector<std::string> Reserved_Tags_compatible;
static const std::string Flush_Start_Tag;
static const std::string Flush_End_Tag;
static const std::string External_Purge_Tag;
public:
enum class ETags : unsigned char
{

View file

@ -31,6 +31,7 @@
#include <boost/log/trivial.hpp>
#include <tbb/parallel_for.h>
#include <tbb/spin_mutex.h>
#include <Shiny/Shiny.h>

View file

@ -159,7 +159,7 @@ void Downloader::start_download(const std::string& full_url)
size_t id = get_next_id();
std::string escaped_url = FileGet::escape_url(full_url.substr(results.length()));
if (is_bambustudio_open(full_url) || (is_orca_open(full_url) && is_makerworld_link(full_url)))
plater->request_model_download(escaped_url);
plater->request_model_download(wxString::FromUTF8(escaped_url));
else {
std::string text(escaped_url);
m_downloads.emplace_back(std::make_unique<Download>(id, std::move(escaped_url), this, m_dest_folder));
@ -254,4 +254,4 @@ void Downloader::set_download_state(int id, DownloadState state)
}
}
}
}