Merge branch 'main' into belt/baseChanges

This commit is contained in:
Rodrigo Faselli
2026-05-28 07:44:43 -03:00
committed by GitHub
65 changed files with 2329 additions and 1465 deletions
+93 -37
View File
@@ -12,21 +12,21 @@
"name": "re3D Gigabot 4 XLT", "name": "re3D Gigabot 4 XLT",
"sub_path": "machine/re3D Gigabot 4 XLT.json" "sub_path": "machine/re3D Gigabot 4 XLT.json"
}, },
{
"name": "re3D GigabotX 2",
"sub_path": "machine/re3D GigabotX 2.json"
},
{
"name": "re3D GigabotX 2 XLT",
"sub_path": "machine/re3D GigabotX 2 XLT.json"
},
{ {
"name": "re3D Terabot 4", "name": "re3D Terabot 4",
"sub_path": "machine/re3D Terabot 4.json" "sub_path": "machine/re3D Terabot 4.json"
}, },
{ {
"name": "re3D Gigabot X2", "name": "re3D TerabotX 2",
"sub_path": "machine/re3D Gigabot X2.json" "sub_path": "machine/re3D TerabotX 2.json"
},
{
"name": "re3D Gigabot X2 XLT",
"sub_path": "machine/re3D Gigabot X2 XLT.json"
},
{
"name": "re3D Terabot X2",
"sub_path": "machine/re3D Terabot X2.json"
} }
], ],
"process_list": [ "process_list": [
@@ -43,28 +43,32 @@
"sub_path": "process/fgf_process_re3D_common.json" "sub_path": "process/fgf_process_re3D_common.json"
}, },
{ {
"name": "0.2mm Fine @re3D fdm 0.4", "name": "0.2 Fine",
"sub_path": "process/0.2mm Fine @re3D fdm 0.4.json" "sub_path": "process/0.2mm Fine @re3D fdm 0.4.json"
}, },
{ {
"name": "0.26mm Standard @re3D fdm 0.4", "name": "0.26 Standard",
"sub_path": "process/0.26mm Standard @re3D fdm 0.4.json" "sub_path": "process/0.26mm Standard @re3D fdm 0.4.json"
}, },
{ {
"name": "0.32mm Draft @re3D fdm 0.4", "name": "0.32 Draft",
"sub_path": "process/0.32mm Draft @re3D fdm 0.4.json" "sub_path": "process/0.32mm Draft @re3D fdm 0.4.json"
}, },
{ {
"name": "0.2mm Standard @re3D fdm 0.8", "name": "0.3 Fine",
"sub_path": "process/0.2mm Standard @re3D fdm 0.8.json" "sub_path": "process/0.3mm Fine @re3D fdm 0.8.json"
}, },
{ {
"name": "0.4mm Draft @re3D fdm 0.8", "name": "0.4 Standard",
"sub_path": "process/0.4mm Draft @re3D fdm 0.8.json" "sub_path": "process/0.4mm Draft @re3D fdm 0.8.json"
}, },
{ {
"name": "1.0mm Standard @re3D fgf 1.75", "name": "1.0 Standard",
"sub_path": "process/1.0mm Standard @re3D fgf 1.75.json" "sub_path": "process/1.0mm Standard @re3D fgf 1.75.json"
},
{
"name": "0.6 Standard",
"sub_path": "process/0.6mm Standard @re3D fgf 0.8.json"
} }
], ],
"filament_list": [ "filament_list": [
@@ -72,37 +76,77 @@
"name": "fdm_filament_common", "name": "fdm_filament_common",
"sub_path": "filament/fdm_filament_common.json" "sub_path": "filament/fdm_filament_common.json"
}, },
{
"name": "fdm_filament_pet",
"sub_path": "filament/fdm_filament_pet.json"
},
{ {
"name": "fdm_filament_pla", "name": "fdm_filament_pla",
"sub_path": "filament/fdm_filament_pla.json" "sub_path": "filament/fdm_filament_pla.json"
}, },
{
"name": "fdm_filament_pet",
"sub_path": "filament/fdm_filament_pet.json"
},
{ {
"name": "fdm_filament_pc", "name": "fdm_filament_pc",
"sub_path": "filament/fdm_filament_pc.json" "sub_path": "filament/fdm_filament_pc.json"
}, },
{ {
"name": "re3D Greengate rPETG", "name": "re3D PLA",
"sub_path": "filament/re3D Greengate rPETG.json" "sub_path": "filament/re3D PLA.json"
},
{
"name": "re3D PC",
"sub_path": "filament/re3D PC.json"
}, },
{ {
"name": "re3D PETG", "name": "re3D PETG",
"sub_path": "filament/re3D PETG.json" "sub_path": "filament/re3D PETG.json"
}, },
{ {
"name": "re3D PLA", "name": "re3D PC",
"sub_path": "filament/re3D PLA.json" "sub_path": "filament/re3D PC.json"
},
{
"name": "re3D Greengate rPETG",
"sub_path": "filament/re3D Greengate rPETG.json"
}, },
{ {
"name": "re3D rPP", "name": "re3D rPP",
"sub_path": "filament/re3D rPP.json" "sub_path": "filament/re3D rPP.json"
},
{
"name": "re3D PLA @0.4 nozzle",
"sub_path": "filament/re3D PLA @0.4 nozzle.json"
},
{
"name": "re3D PLA @0.8 nozzle",
"sub_path": "filament/re3D PLA @0.8 nozzle.json"
},
{
"name": "re3D PETG @0.4 nozzle",
"sub_path": "filament/re3D PETG @0.4 nozzle.json"
},
{
"name": "re3D PETG @0.8 nozzle",
"sub_path": "filament/re3D PETG @0.8 nozzle.json"
},
{
"name": "re3D PC @0.4 nozzle",
"sub_path": "filament/re3D PC @0.4 nozzle.json"
},
{
"name": "re3D PC @0.8 nozzle",
"sub_path": "filament/re3D PC @0.8 nozzle.json"
},
{
"name": "re3D Greengate rPETG @0.8 nozzle",
"sub_path": "filament/re3D Greengate rPETG @0.8 nozzle.json"
},
{
"name": "re3D Greengate rPETG @1.75 nozzle",
"sub_path": "filament/re3D Greengate rPETG @1.75 nozzle.json"
},
{
"name": "re3D rPP @0.8 nozzle",
"sub_path": "filament/re3D rPP @0.8 nozzle.json"
},
{
"name": "re3D rPP @1.75 nozzle",
"sub_path": "filament/re3D rPP @1.75 nozzle.json"
} }
], ],
"machine_list": [ "machine_list": [
@@ -134,6 +178,22 @@
"name": "re3D Gigabot 4 XLT 0.8 nozzle", "name": "re3D Gigabot 4 XLT 0.8 nozzle",
"sub_path": "machine/re3D Gigabot 4 XLT 0.8 nozzle.json" "sub_path": "machine/re3D Gigabot 4 XLT 0.8 nozzle.json"
}, },
{
"name": "re3D GigabotX 2 0.8 nozzle",
"sub_path": "machine/re3D GigabotX 2 0.8 nozzle.json"
},
{
"name": "re3D GigabotX 2 1.75 nozzle",
"sub_path": "machine/re3D GigabotX 2 1.75 nozzle.json"
},
{
"name": "re3D GigabotX 2 XLT 0.8 nozzle",
"sub_path": "machine/re3D GigabotX 2 XLT 0.8 nozzle.json"
},
{
"name": "re3D GigabotX 2 XLT 1.75 nozzle",
"sub_path": "machine/re3D GigabotX 2 XLT 1.75 nozzle.json"
},
{ {
"name": "re3D Terabot 4 0.4 nozzle", "name": "re3D Terabot 4 0.4 nozzle",
"sub_path": "machine/re3D Terabot 4 0.4 nozzle.json" "sub_path": "machine/re3D Terabot 4 0.4 nozzle.json"
@@ -143,16 +203,12 @@
"sub_path": "machine/re3D Terabot 4 0.8 nozzle.json" "sub_path": "machine/re3D Terabot 4 0.8 nozzle.json"
}, },
{ {
"name": "re3D Gigabot X2 1.75 nozzle", "name": "re3D TerabotX 2 0.8 nozzle",
"sub_path": "machine/re3D Gigabot X2 1.75 nozzle.json" "sub_path": "machine/re3D TerabotX 2 0.8 nozzle.json"
}, },
{ {
"name": "re3D Gigabot X2 XLT 1.75 nozzle", "name": "re3D TerabotX 2 1.75 nozzle",
"sub_path": "machine/re3D Gigabot X2 XLT 1.75 nozzle.json" "sub_path": "machine/re3D TerabotX 2 1.75 nozzle.json"
},
{
"name": "re3D Terabot X2 1.75 nozzle",
"sub_path": "machine/re3D Terabot X2 1.75 nozzle.json"
} }
] ]
} }
@@ -2,170 +2,5 @@
"type": "filament", "type": "filament",
"name": "fdm_filament_common", "name": "fdm_filament_common",
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false"
"cool_plate_temp": [
"60"
],
"eng_plate_temp": [
"60"
],
"hot_plate_temp": [
"60"
],
"textured_plate_temp": [
"60"
],
"cool_plate_temp_initial_layer": [
"60"
],
"eng_plate_temp_initial_layer": [
"60"
],
"hot_plate_temp_initial_layer": [
"60"
],
"textured_plate_temp_initial_layer": [
"60"
],
"overhang_fan_threshold": [
"95%"
],
"overhang_fan_speed": [
"100"
],
"slow_down_for_layer_cooling": [
"1"
],
"close_fan_the_first_x_layers": [
"3"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_flow_ratio": [
"1"
],
"reduce_fan_stop_start_freq": [
"0"
],
"fan_cooling_layer_time": [
"60"
],
"filament_cost": [
"0"
],
"filament_density": [
"0"
],
"filament_deretraction_speed": [
"nil"
],
"filament_diameter": [
"2.85"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_multitool_ramming_volume": [
"15"
],
"filament_multitool_ramming_flow": [
"15"
],
"filament_retraction_minimum_travel": [
"nil"
],
"filament_retract_before_wipe": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil"
],
"filament_retraction_length": [
"nil"
],
"filament_z_hop": [
"nil"
],
"filament_z_hop_types": [
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retraction_speed": [
"nil"
],
"filament_settings_id": [
""
],
"filament_soluble": [
"0"
],
"filament_type": [
"PLA"
],
"filament_vendor": [
"Generic"
],
"filament_wipe": [
"nil"
],
"filament_wipe_distance": [
"nil"
],
"bed_type": [
"Cool Plate"
],
"nozzle_temperature_initial_layer": [
"200"
],
"full_fan_speed_layer": [
"0"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"35"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"8"
],
"filament_start_gcode": [
"; Filament gcode\n"
],
"nozzle_temperature": [
"200"
],
"temperature_vitrification": [
"100"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
]
} }
@@ -4,91 +4,7 @@
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_common", "inherits": "fdm_filament_common",
"pressure_advance": [
"0.096"
],
"cool_plate_temp": [
"115"
],
"eng_plate_temp": [
"115"
],
"hot_plate_temp": [
"115"
],
"textured_plate_temp": [
"115"
],
"cool_plate_temp_initial_layer": [
"113"
],
"eng_plate_temp_initial_layer": [
"113"
],
"hot_plate_temp_initial_layer": [
"113"
],
"textured_plate_temp_initial_layer": [
"113"
],
"slow_down_for_layer_cooling": [
"1"
],
"close_fan_the_first_x_layers": [
"3"
],
"fan_cooling_layer_time": [
"30"
],
"slow_down_layer_time": [
"2"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_type": [ "filament_type": [
"PC" "PC"
],
"filament_density": [
"1.04"
],
"filament_cost": [
"0"
],
"nozzle_temperature_initial_layer": [
"260"
],
"reduce_fan_stop_start_freq": [
"1"
],
"fan_max_speed": [
"60"
],
"fan_min_speed": [
"10"
],
"overhang_fan_speed": [
"60"
],
"overhang_fan_threshold": [
"25%"
],
"support_material_interface_fan_speed": [
"100"
],
"nozzle_temperature": [
"260"
],
"temperature_vitrification": [
"120"
],
"nozzle_temperature_range_low": [
"260"
],
"nozzle_temperature_range_high": [
"280"
],
"filament_start_gcode": [
"; filament start gcode\n"
] ]
} }
@@ -4,79 +4,7 @@
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_common", "inherits": "fdm_filament_common",
"filament_density": [
"1.27"
],
"filament_cost": [
"0"
],
"temperature_vitrification": [
"70"
],
"close_fan_the_first_x_layers": [
"3"
],
"enable_overhang_bridge_fan": [
"1"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"80"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.91"
],
"filament_max_volumetric_speed": [
"9.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_type": [ "filament_type": [
"PETG" "PETG"
],
"hot_plate_temp": [
"70"
],
"hot_plate_temp_initial_layer": [
"70"
],
"nozzle_temperature": [
"250"
],
"nozzle_temperature_initial_layer": [
"250"
],
"nozzle_temperature_range_low": [
"230"
],
"nozzle_temperature_range_high": [
"250"
],
"overhang_fan_threshold": [
"95%"
],
"pressure_advance": [
"0.205"
],
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"10"
],
"support_material_interface_fan_speed": [
"100"
] ]
} }
@@ -4,97 +4,7 @@
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_common", "inherits": "fdm_filament_common",
"filament_flow_ratio": [
"0.91"
],
"pressure_advance": [
"0.11"
],
"fan_cooling_layer_time": [
"100"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_type": [ "filament_type": [
"PLA" "PLA"
],
"filament_density": [
"1.24"
],
"filament_cost": [
"20"
],
"cool_plate_temp": [
"60"
],
"eng_plate_temp": [
"60"
],
"hot_plate_temp": [
"60"
],
"textured_plate_temp": [
"60"
],
"cool_plate_temp_initial_layer": [
"60"
],
"eng_plate_temp_initial_layer": [
"60"
],
"hot_plate_temp_initial_layer": [
"60"
],
"textured_plate_temp_initial_layer": [
"60"
],
"nozzle_temperature_initial_layer": [
"220"
],
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"100"
],
"overhang_fan_speed": [
"100"
],
"overhang_fan_threshold": [
"0%"
],
"close_fan_the_first_x_layers": [
"1"
],
"nozzle_temperature": [
"220"
],
"temperature_vitrification": [
"45"
],
"nozzle_temperature_range_low": [
"190"
],
"nozzle_temperature_range_high": [
"230"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"4"
],
"additional_cooling_fan_speed": [
"70"
],
"filament_start_gcode": [
"; filament start gcode\n"
] ]
} }
@@ -1,94 +1,113 @@
{ {
"type": "filament", "type": "filament",
"name": "fdm_filament_abs", "filament_id": "GFG01",
"setting_id": "GFSG01",
"name": "re3D Greengate rPETG @0.8 nozzle",
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "true",
"inherits": "fdm_filament_common", "inherits": "fdm_filament_pet",
"fan_cooling_layer_time": [
"100"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_type": [
"ABS"
],
"filament_density": [
"1.24"
],
"filament_cost": [
"20"
],
"cool_plate_temp": [
"60"
],
"eng_plate_temp": [
"60"
],
"hot_plate_temp": [
"60"
],
"textured_plate_temp": [
"60"
],
"cool_plate_temp_initial_layer": [
"60"
],
"eng_plate_temp_initial_layer": [
"60"
],
"hot_plate_temp_initial_layer": [
"60"
],
"textured_plate_temp_initial_layer": [
"60"
],
"nozzle_temperature_initial_layer": [ "nozzle_temperature_initial_layer": [
"0"
],
"nozzle_temperature": [
"0"
],
"nozzle_temperature_range_low": [
"220" "220"
], ],
"reduce_fan_stop_start_freq": [ "nozzle_temperature_range_high": [
"1" "260"
], ],
"slow_down_for_layer_cooling": [ "hot_plate_temp_initial_layer": [
"1" "70"
],
"hot_plate_temp": [
"70"
],
"filament_flow_ratio": [
"1.0"
],
"enable_pressure_advance": [
"0"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"25"
],
"filament_start_gcode": [
"M190 S75\nM104 S220 T0\nM104 S210 T1\nM104 S200 T2\nM109 S220 T0\nM109 S210 T1\nM109 S200 T2"
],
"filament_density": [
"1.27"
],
"filament_diameter": [
"2.85"
],
"filament_max_volumetric_speed": [
"60"
],
"cool_plate_temp": [
"70"
],
"cool_plate_temp_initial_layer": [
"70"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
], ],
"fan_max_speed": [ "fan_max_speed": [
"100" "100"
], ],
"fan_min_speed": [ "fan_min_speed": [
"100" "30"
], ],
"overhang_fan_speed": [ "fan_cooling_layer_time": [
"100" "20"
],
"full_fan_speed_layer": [
"2"
], ],
"overhang_fan_threshold": [ "overhang_fan_threshold": [
"50%" "95%"
], ],
"close_fan_the_first_x_layers": [ "overhang_fan_speed": [
"80"
],
"enable_overhang_bridge_fan": [
"1" "1"
], ],
"nozzle_temperature": [ "slow_down_for_layer_cooling": [
"220" "1"
],
"pressure_advance": [
"0.205"
],
"reduce_fan_stop_start_freq": [
"1"
], ],
"temperature_vitrification": [ "temperature_vitrification": [
"60"
],
"nozzle_temperature_range_low": [
"190"
],
"nozzle_temperature_range_high": [
"230"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"4"
],
"additional_cooling_fan_speed": [
"70" "70"
], ],
"filament_start_gcode": [ "support_material_interface_fan_speed": [
"; filament start gcode\n" "100"
],
"filament_soluble": [
"0"
],
"compatible_printers": [
"re3D GigabotX 2 0.8 nozzle",
"re3D GigabotX 2 XLT 0.8 nozzle",
"re3D TerabotX 2 0.8 nozzle"
] ]
} }
@@ -0,0 +1,113 @@
{
"type": "filament",
"filament_id": "GFG01",
"setting_id": "GFSG01_175",
"name": "re3D Greengate rPETG @1.75 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"nozzle_temperature_initial_layer": [
"0"
],
"nozzle_temperature": [
"0"
],
"nozzle_temperature_range_low": [
"220"
],
"nozzle_temperature_range_high": [
"260"
],
"hot_plate_temp_initial_layer": [
"70"
],
"hot_plate_temp": [
"70"
],
"filament_flow_ratio": [
"1.0"
],
"enable_pressure_advance": [
"0"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"25"
],
"filament_start_gcode": [
"M190 S75\nM104 S220 T0\nM104 S210 T1\nM104 S200 T2\nM109 S220 T0\nM109 S210 T1\nM109 S200 T2"
],
"filament_density": [
"1.27"
],
"filament_diameter": [
"2.85"
],
"filament_max_volumetric_speed": [
"60"
],
"cool_plate_temp": [
"70"
],
"cool_plate_temp_initial_layer": [
"70"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"30"
],
"fan_cooling_layer_time": [
"20"
],
"full_fan_speed_layer": [
"2"
],
"overhang_fan_threshold": [
"95%"
],
"overhang_fan_speed": [
"80"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"pressure_advance": [
"0.205"
],
"reduce_fan_stop_start_freq": [
"1"
],
"temperature_vitrification": [
"70"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_soluble": [
"0"
],
"compatible_printers": [
"re3D GigabotX 2 1.75 nozzle",
"re3D GigabotX 2 XLT 1.75 nozzle",
"re3D TerabotX 2 1.75 nozzle"
]
}
@@ -1,47 +1,20 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"name": "re3D Greengate rPETG", "name": "re3D Greengate rPETG",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_filament_pet", "inherits": "fdm_filament_pet",
"nozzle_temperature_initial_layer": [ "filament_id": "GFG01",
"255" "setting_id": "re3d_greengate_rpetg",
], "filament_settings_id": [
"nozzle_temperature": [ "re3D Greengate rPETG"
"255"
],
"nozzle_temperature_range_low": [
"220"
],
"nozzle_temperature_range_high": [
"260"
],
"hot_plate_temp_initial_layer": [
"80"
],
"hot_plate_temp": [
"80"
],
"filament_flow_ratio": [
"1.02"
],
"enable_pressure_advance": [
"0"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"25"
],
"filament_start_gcode": [
"M190 S75\nM104 S220 T0\nM104 S210 T1\nM104 S200 T2\nM109 S220 T0\nM109 S210 T1\nM109 S200 T2"
], ],
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot X2 1.75 nozzle", "re3D GigabotX 2",
"re3D Gigabot X2 XLT 1.75 nozzle", "re3D GigabotX 2 XLT",
"re3D Terabot X2 1.75 nozzle" "re3D TerabotX 2"
],
"filament_vendor": [
"re3D"
] ]
} }
@@ -0,0 +1,173 @@
{
"type": "filament",
"name": "re3D PC @0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pc",
"filament_id": "GFG99",
"setting_id": "re3d_pc_04",
"filament_settings_id": [
"re3D PC @0.4 nozzle"
],
"compatible_printers": [
"re3D Gigabot 4 0.4 nozzle",
"re3D Gigabot 4 XLT 0.4 nozzle",
"re3D Terabot 4 0.4 nozzle"
],
"filament_vendor": [
"re3D"
],
"filament_density": [
"1.19"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.99"
],
"filament_max_volumetric_speed": [
"11.5"
],
"nozzle_temperature": [
"260"
],
"nozzle_temperature_initial_layer": [
"20"
],
"nozzle_temperature_range_low": [
"250"
],
"nozzle_temperature_range_high": [
"270"
],
"hot_plate_temp": [
"115"
],
"hot_plate_temp_initial_layer": [
"113"
],
"cool_plate_temp": [
"115"
],
"cool_plate_temp_initial_layer": [
"113"
],
"eng_plate_temp": [
"115"
],
"eng_plate_temp_initial_layer": [
"113"
],
"textured_plate_temp": [
"115"
],
"textured_plate_temp_initial_layer": [
"113"
],
"fan_max_speed": [
"80"
],
"fan_min_speed": [
"30"
],
"fan_cooling_layer_time": [
"20"
],
"close_fan_the_first_x_layers": [
"2"
],
"overhang_fan_threshold": [
"50%"
],
"overhang_fan_speed": [
"40"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"30"
],
"slow_down_min_speed": [
"30"
],
"pressure_advance": [
"0.096"
],
"enable_pressure_advance": [
"1"
],
"reduce_fan_stop_start_freq": [
"0"
],
"filament_retraction_length": [
"0.8"
],
"filament_soluble": [
"0"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"20"
],
"filament_multitool_ramming_flow": [
"10.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_tower_interface_pre_extrusion_dist": [
"0"
],
"filament_tower_interface_pre_extrusion_length": [
"0"
],
"filament_tower_ironing_area": [
"0"
],
"filament_tower_interface_purge_volume": [
"0"
],
"filament_tower_interface_print_temp": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_stamping_distance": [
"0"
]
}
@@ -0,0 +1,173 @@
{
"type": "filament",
"name": "re3D PC @0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pc",
"filament_id": "GFG99",
"setting_id": "re3d_pc_08",
"filament_settings_id": [
"re3D PC @0.8 nozzle"
],
"compatible_printers": [
"re3D Gigabot 4 0.8 nozzle",
"re3D Gigabot 4 XLT 0.8 nozzle",
"re3D Terabot 4 0.8 nozzle"
],
"filament_vendor": [
"re3D"
],
"filament_density": [
"1.19"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.99"
],
"filament_max_volumetric_speed": [
"11.5"
],
"nozzle_temperature": [
"265"
],
"nozzle_temperature_initial_layer": [
"265"
],
"nozzle_temperature_range_low": [
"250"
],
"nozzle_temperature_range_high": [
"270"
],
"hot_plate_temp": [
"115"
],
"hot_plate_temp_initial_layer": [
"113"
],
"cool_plate_temp": [
"115"
],
"cool_plate_temp_initial_layer": [
"113"
],
"eng_plate_temp": [
"115"
],
"eng_plate_temp_initial_layer": [
"113"
],
"textured_plate_temp": [
"115"
],
"textured_plate_temp_initial_layer": [
"113"
],
"fan_max_speed": [
"80"
],
"fan_min_speed": [
"30"
],
"fan_cooling_layer_time": [
"20"
],
"close_fan_the_first_x_layers": [
"2"
],
"overhang_fan_threshold": [
"50%"
],
"overhang_fan_speed": [
"40"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"30"
],
"slow_down_min_speed": [
"30"
],
"pressure_advance": [
"0.096"
],
"enable_pressure_advance": [
"1"
],
"reduce_fan_stop_start_freq": [
"0"
],
"filament_retraction_length": [
"0.8"
],
"filament_soluble": [
"0"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"20"
],
"filament_multitool_ramming_flow": [
"10.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_tower_interface_pre_extrusion_dist": [
"0"
],
"filament_tower_interface_pre_extrusion_length": [
"0"
],
"filament_tower_ironing_area": [
"0"
],
"filament_tower_interface_purge_volume": [
"0"
],
"filament_tower_interface_print_temp": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_stamping_distance": [
"0"
]
}
+11 -8
View File
@@ -1,17 +1,20 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"name": "re3D PC", "name": "re3D PC",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_filament_pc", "inherits": "fdm_filament_pc",
"filament_id": "GFG99",
"setting_id": "re3d_pc",
"filament_settings_id": [
"re3D PC"
],
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4",
"re3D Gigabot 4 XLT 0.4 nozzle", "re3D Gigabot 4 XLT",
"re3D Terabot 4 0.4 nozzle", "re3D Terabot 4"
"re3D Gigabot 4 0.8 nozzle", ],
"re3D Gigabot 4 XLT 0.8 nozzle", "filament_vendor": [
"re3D Terabot 4 0.8 nozzle" "re3D"
] ]
} }
@@ -0,0 +1,173 @@
{
"type": "filament",
"name": "re3D PETG @0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_id": "GFG03",
"setting_id": "re3d_petg_04",
"filament_settings_id": [
"re3D PETG @0.4 nozzle"
],
"compatible_printers": [
"re3D Gigabot 4 0.4 nozzle",
"re3D Gigabot 4 XLT 0.4 nozzle",
"re3D Terabot 4 0.4 nozzle"
],
"filament_vendor": [
"re3D"
],
"close_fan_the_first_x_layers": [
"2"
],
"filament_density": [
"1.27"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.99"
],
"filament_max_volumetric_speed": [
"10.5"
],
"nozzle_temperature": [
"250"
],
"nozzle_temperature_initial_layer": [
"250"
],
"nozzle_temperature_range_low": [
"240"
],
"nozzle_temperature_range_high": [
"260"
],
"hot_plate_temp": [
"70"
],
"hot_plate_temp_initial_layer": [
"70"
],
"cool_plate_temp": [
"70"
],
"cool_plate_temp_initial_layer": [
"70"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"fan_max_speed": [
"80"
],
"fan_min_speed": [
"20"
],
"fan_cooling_layer_time": [
"20"
],
"full_fan_speed_layer": [
"3"
],
"overhang_fan_threshold": [
"50%"
],
"overhang_fan_speed": [
"80"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"30"
],
"pressure_advance": [
"0.205"
],
"enable_pressure_advance": [
"1"
],
"reduce_fan_stop_start_freq": [
"1"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_soluble": [
"0"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"20"
],
"filament_multitool_ramming_flow": [
"10.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_tower_interface_pre_extrusion_dist": [
"0"
],
"filament_tower_interface_pre_extrusion_length": [
"0"
],
"filament_tower_ironing_area": [
"0"
],
"filament_tower_interface_purge_volume": [
"0"
],
"filament_tower_interface_print_temp": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_stamping_distance": [
"0"
]
}
@@ -0,0 +1,173 @@
{
"type": "filament",
"name": "re3D PETG @0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_id": "GFG03",
"setting_id": "re3d_petg_08",
"filament_settings_id": [
"re3D PETG @0.8 nozzle"
],
"compatible_printers": [
"re3D Gigabot 4 0.8 nozzle",
"re3D Gigabot 4 XLT 0.8 nozzle",
"re3D Terabot 4 0.8 nozzle"
],
"filament_vendor": [
"re3D"
],
"close_fan_the_first_x_layers": [
"2"
],
"filament_density": [
"1.27"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.99"
],
"filament_max_volumetric_speed": [
"10.5"
],
"nozzle_temperature": [
"250"
],
"nozzle_temperature_initial_layer": [
"250"
],
"nozzle_temperature_range_low": [
"240"
],
"nozzle_temperature_range_high": [
"260"
],
"hot_plate_temp": [
"70"
],
"hot_plate_temp_initial_layer": [
"70"
],
"cool_plate_temp": [
"70"
],
"cool_plate_temp_initial_layer": [
"70"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"fan_max_speed": [
"80"
],
"fan_min_speed": [
"20"
],
"fan_cooling_layer_time": [
"20"
],
"full_fan_speed_layer": [
"3"
],
"overhang_fan_threshold": [
"50%"
],
"overhang_fan_speed": [
"80"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"30"
],
"pressure_advance": [
"0.205"
],
"enable_pressure_advance": [
"1"
],
"reduce_fan_stop_start_freq": [
"1"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_soluble": [
"0"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"20"
],
"filament_multitool_ramming_flow": [
"10.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_tower_interface_pre_extrusion_dist": [
"0"
],
"filament_tower_interface_pre_extrusion_length": [
"0"
],
"filament_tower_ironing_area": [
"0"
],
"filament_tower_interface_purge_volume": [
"0"
],
"filament_tower_interface_print_temp": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_stamping_distance": [
"0"
]
}
+10 -16
View File
@@ -1,26 +1,20 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"name": "re3D PETG", "name": "re3D PETG",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_filament_pet", "inherits": "fdm_filament_pet",
"filament_start_gcode": [ "filament_id": "GFG03",
"; Filament gcode" "setting_id": "re3d_petg",
], "filament_settings_id": [
"filament_end_gcode": [ "re3D PETG"
"; filament end gcode"
],
"filament_retraction_length": [
"1"
], ],
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4",
"re3D Gigabot 4 XLT 0.4 nozzle", "re3D Gigabot 4 XLT",
"re3D Terabot 4 0.4 nozzle", "re3D Terabot 4"
"re3D Gigabot 4 0.8 nozzle", ],
"re3D Gigabot 4 XLT 0.8 nozzle", "filament_vendor": [
"re3D Terabot 4 0.8 nozzle" "re3D"
] ]
} }
@@ -0,0 +1,174 @@
{
"type": "filament",
"name": "re3D PLA @0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_id": "GFL99",
"setting_id": "re3d_pla_04",
"filament_settings_id": [
"re3D PLA @0.4 nozzle"
],
"compatible_printers": [
"re3D Gigabot 4 0.4 nozzle",
"re3D Gigabot 4 XLT 0.4 nozzle",
"re3D Terabot 4 0.4 nozzle"
],
"filament_vendor": [
"re3D"
],
"close_fan_the_first_x_layers": "2",
"filament_density": [
"1.24"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.99"
],
"filament_max_volumetric_speed": [
"12"
],
"nozzle_temperature": [
"240"
],
"nozzle_temperature_initial_layer": [
"240"
],
"nozzle_temperature_range_low": [
"220"
],
"nozzle_temperature_range_high": [
"250"
],
"hot_plate_temp": [
"65"
],
"hot_plate_temp_initial_layer": [
"65"
],
"cool_plate_temp": [
"65"
],
"cool_plate_temp_initial_layer": [
"65"
],
"eng_plate_temp": [
"65"
],
"eng_plate_temp_initial_layer": [
"65"
],
"textured_plate_temp": [
"65"
],
"textured_plate_temp_initial_layer": [
"65"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"80"
],
"fan_cooling_layer_time": [
"20"
],
"full_fan_speed_layer": [
"2"
],
"overhang_fan_threshold": [
"0%"
],
"overhang_fan_speed": [
"80"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"30"
],
"pressure_advance": [
"0.096"
],
"enable_pressure_advance": [
"1"
],
"reduce_fan_stop_start_freq": [
"1"
],
"temperature_vitrification": [
"70"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_soluble": [
"0"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"20"
],
"filament_multitool_ramming_flow": [
"10.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_tower_interface_pre_extrusion_dist": [
"0"
],
"filament_tower_interface_pre_extrusion_length": [
"0"
],
"filament_tower_ironing_area": [
"0"
],
"filament_tower_interface_purge_volume": [
"0"
],
"filament_tower_interface_print_temp": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_stamping_distance": [
"0"
]
}
@@ -0,0 +1,174 @@
{
"type": "filament",
"name": "re3D PLA @0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_id": "GFL99",
"setting_id": "re3d_pla_08",
"filament_settings_id": [
"re3D PLA @0.8 nozzle"
],
"compatible_printers": [
"re3D Gigabot 4 0.8 nozzle",
"re3D Gigabot 4 XLT 0.8 nozzle",
"re3D Terabot 4 0.8 nozzle"
],
"filament_vendor": [
"re3D"
],
"close_fan_the_first_x_layers": "2",
"filament_density": [
"1.24"
],
"filament_diameter": [
"2.85"
],
"filament_flow_ratio": [
"0.99"
],
"filament_max_volumetric_speed": [
"12"
],
"nozzle_temperature": [
"240"
],
"nozzle_temperature_initial_layer": [
"240"
],
"nozzle_temperature_range_low": [
"220"
],
"nozzle_temperature_range_high": [
"250"
],
"hot_plate_temp": [
"65"
],
"hot_plate_temp_initial_layer": [
"65"
],
"cool_plate_temp": [
"65"
],
"cool_plate_temp_initial_layer": [
"65"
],
"eng_plate_temp": [
"65"
],
"eng_plate_temp_initial_layer": [
"65"
],
"textured_plate_temp": [
"65"
],
"textured_plate_temp_initial_layer": [
"65"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"80"
],
"fan_cooling_layer_time": [
"20"
],
"full_fan_speed_layer": [
"2"
],
"overhang_fan_threshold": [
"0%"
],
"overhang_fan_speed": [
"80"
],
"enable_overhang_bridge_fan": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"20"
],
"slow_down_min_speed": [
"30"
],
"pressure_advance": [
"0.096"
],
"enable_pressure_advance": [
"1"
],
"reduce_fan_stop_start_freq": [
"1"
],
"temperature_vitrification": [
"70"
],
"support_material_interface_fan_speed": [
"100"
],
"filament_soluble": [
"0"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"20"
],
"filament_multitool_ramming_flow": [
"10.5"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_tower_interface_pre_extrusion_dist": [
"0"
],
"filament_tower_interface_pre_extrusion_length": [
"0"
],
"filament_tower_ironing_area": [
"0"
],
"filament_tower_interface_purge_volume": [
"0"
],
"filament_tower_interface_print_temp": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_final_speed": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_stamping_distance": [
"0"
]
}
+11 -8
View File
@@ -1,17 +1,20 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFL99",
"setting_id": "GFSL99",
"name": "re3D PLA", "name": "re3D PLA",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_filament_pla", "inherits": "fdm_filament_pla",
"filament_id": "GFL99",
"setting_id": "re3d_pla",
"filament_settings_id": [
"re3D PLA"
],
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4",
"re3D Gigabot 4 XLT 0.4 nozzle", "re3D Gigabot 4 XLT",
"re3D Terabot 4 0.4 nozzle", "re3D Terabot 4"
"re3D Gigabot 4 0.8 nozzle", ],
"re3D Gigabot 4 XLT 0.8 nozzle", "filament_vendor": [
"re3D Terabot 4 0.8 nozzle" "re3D"
] ]
} }
@@ -0,0 +1,65 @@
{
"type": "filament",
"filament_id": "GFG02",
"setting_id": "GFSG02",
"name": "re3D rPP @0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_type": [
"PP"
],
"filament_vendor": [
"re3D"
],
"close_fan_the_first_x_layers": [
"2"
],
"default_filament_colour": [
"#FFFFFF"
],
"filament_density": [
"0.675"
],
"filament_max_volumetric_speed": [
"40"
],
"nozzle_temperature_initial_layer": [
"190"
],
"nozzle_temperature": [
"190"
],
"nozzle_temperature_range_low": [
"180"
],
"nozzle_temperature_range_high": [
"280"
],
"hot_plate_temp_initial_layer": [
"110"
],
"hot_plate_temp": [
"110"
],
"filament_flow_ratio": [
"1.1"
],
"enable_pressure_advance": [
"0"
],
"slow_down_layer_time": [
"25"
],
"slow_down_min_speed": [
"3"
],
"filament_start_gcode": [
"; filament start gcode\nM190 S110\nM104 S190 T0\nM104 S185 T1\nM104 S170 T2\nM109 S190 T0\nM109 S185 T1\nM109 S170 T2\n"
],
"compatible_printers": [
"re3D GigabotX 2 0.8 nozzle",
"re3D GigabotX 2 XLT 0.8 nozzle",
"re3D TerabotX 2 0.8 nozzle"
]
}
@@ -0,0 +1,65 @@
{
"type": "filament",
"filament_id": "GFG02",
"setting_id": "GFSG02_175",
"name": "re3D rPP @1.75 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_type": [
"PP"
],
"filament_vendor": [
"re3D"
],
"close_fan_the_first_x_layers": [
"2"
],
"default_filament_colour": [
"#FFFFFF"
],
"filament_density": [
"0.675"
],
"filament_max_volumetric_speed": [
"50"
],
"nozzle_temperature_initial_layer": [
"185"
],
"nozzle_temperature": [
"185"
],
"nozzle_temperature_range_low": [
"180"
],
"nozzle_temperature_range_high": [
"280"
],
"hot_plate_temp_initial_layer": [
"110"
],
"hot_plate_temp": [
"110"
],
"filament_flow_ratio": [
"1.15"
],
"enable_pressure_advance": [
"0"
],
"slow_down_layer_time": [
"50"
],
"slow_down_min_speed": [
"3"
],
"filament_start_gcode": [
"; filament start gcode\nM190 S110\nM104 S185 T0\nM104 S185 T1\nM104 S185 T2\nM109 S185 T0\nM109 S185 T1\nM109 S185 T2\n"
],
"compatible_printers": [
"re3D GigabotX 2 1.75 nozzle",
"re3D GigabotX 2 XLT 1.75 nozzle",
"re3D TerabotX 2 1.75 nozzle"
]
}
+10 -37
View File
@@ -1,7 +1,5 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"name": "re3D rPP", "name": "re3D rPP",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
@@ -9,42 +7,17 @@
"filament_type": [ "filament_type": [
"PP" "PP"
], ],
"nozzle_temperature_initial_layer": [ "filament_id": "GFG02",
"185" "setting_id": "re3d_rpp",
], "filament_settings_id": [
"nozzle_temperature": [ "re3D rPP"
"185"
],
"nozzle_temperature_range_low": [
"180"
],
"nozzle_temperature_range_high": [
"200"
],
"hot_plate_temp_initial_layer": [
"110"
],
"hot_plate_temp": [
"110"
],
"filament_flow_ratio": [
"1.18"
],
"enable_pressure_advance": [
"0"
],
"slow_down_layer_time": [
"60"
],
"slow_down_min_speed": [
"10"
],
"filament_start_gcode": [
"M190 S110\nM104 S185 T0\nM104 S185 T1\nM104 S185 T2\nM109 S185 T0\nM109 S185 T1\nM109 S185 T2"
], ],
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot X2 1.75 nozzle", "re3D GigabotX 2",
"re3D Gigabot X2 XLT 1.75 nozzle", "re3D GigabotX 2 XLT",
"re3D Terabot X2 1.75 nozzle" "re3D TerabotX 2"
],
"filament_vendor": [
"re3D"
] ]
} }
@@ -3,115 +3,11 @@
"name": "fdm_machine_common", "name": "fdm_machine_common",
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"printer_technology": "FFF", "auxiliary_fan": "0",
"deretraction_speed": [ "bed_exclude_area": ["0x0"],
"40" "family": "re3D",
],
"extruder_colour": [
"#FCE94F"
],
"extruder_offset": [
"0x0"
],
"gcode_flavor": "klipper", "gcode_flavor": "klipper",
"emit_machine_limits_to_gcode": "0",
"silent_mode": "0", "silent_mode": "0",
"machine_max_acceleration_e": [ "scan_first_layer": "0"
"5000"
],
"machine_max_acceleration_extruding": [
"10000"
],
"machine_max_acceleration_retracting": [
"1000"
],
"machine_max_acceleration_x": [
"10000"
],
"machine_max_acceleration_y": [
"10000"
],
"machine_max_acceleration_z": [
"100"
],
"machine_max_speed_e": [
"60"
],
"machine_max_speed_x": [
"500"
],
"machine_max_speed_y": [
"500"
],
"machine_max_speed_z": [
"10"
],
"machine_max_jerk_e": [
"5"
],
"machine_max_jerk_x": [
"8"
],
"machine_max_jerk_y": [
"8"
],
"machine_max_jerk_z": [
"0.4"
],
"machine_min_extruding_rate": [
"0"
],
"machine_min_travel_rate": [
"0"
],
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.1"
],
"printable_height": "400",
"extruder_clearance_radius": "65",
"extruder_clearance_height_to_rod": "36",
"extruder_clearance_height_to_lid": "140",
"nozzle_diameter": [
"0.4"
],
"printer_settings_id": "",
"printer_variant": "0.4",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"70%"
],
"retract_when_changing_layer": [
"1"
],
"retraction_length": [
"5"
],
"retract_length_toolchange": [
"1"
],
"z_hop": [
"0"
],
"retract_restart_extra": [
"0"
],
"retract_restart_extra_toolchange": [
"0"
],
"retraction_speed": [
"60"
],
"single_extruder_multi_material": "1",
"change_filament_gcode": "",
"wipe": [
"1"
],
"z_lift_type": "NormalLift",
"default_print_profile": "0.16mm Optimal @Bambu Lab X1 Carbon 0.4 nozzle",
"machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
"machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end"
} }
@@ -1,146 +1,131 @@
{ {
"type": "machine",
"name": "fdm_re3D_common",
"from": "system",
"instantiation": "false",
"inherits": "fdm_machine_common",
"gcode_flavor": "klipper",
"machine_max_acceleration_e": [
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"5000",
"5000"
],
"machine_max_acceleration_retracting": [
"5000",
"5000"
],
"machine_max_acceleration_travel": [
"20000",
"20000"
],
"machine_max_acceleration_x": [
"5000",
"5000"
],
"machine_max_acceleration_y": [
"5000",
"5000"
],
"machine_max_acceleration_z": [
"5000",
"5000"
],
"machine_max_speed_e": [
"20",
"20"
],
"machine_max_speed_x": [
"500",
"500"
],
"machine_max_speed_y": [
"500",
"500"
],
"machine_max_speed_z": [
"20",
"20"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
],
"machine_max_jerk_y": [
"9",
"9"
],
"machine_max_jerk_z": [
"0.2",
"0.2"
],
"machine_min_extruding_rate": [
"0",
"0"
],
"machine_min_travel_rate": [
"0",
"0"
],
"max_layer_height": [
"0.32"
],
"min_layer_height": [
"0.2"
],
"extruder_clearance_radius": "125",
"extruder_clearance_height_to_rod": "25",
"printer_settings_id": "",
"printer_technology": "FFF",
"printer_variant": "0.4",
"retraction_minimum_travel": [
"1"
],
"retract_before_wipe": [
"70%"
],
"retract_when_changing_layer": [
"1"
],
"retraction_length": [
"1.0"
],
"retract_length_toolchange": [
"12"
],
"z_hop": [
"0"
],
"retract_restart_extra": [
"0"
],
"retract_restart_extra_toolchange": [
"-0.08"
],
"retraction_speed": [
"200"
],
"deretraction_speed": [
"200"
],
"z_hop_types": "Normal Lift",
"silent_mode": "0",
"single_extruder_multi_material": [
"0"
],
"machine_tool_change_time": [
"30"
],
"change_filament_gcode": "",
"machine_pause_gcode": "PAUSE",
"wipe": [
"0"
],
"default_filament_profile": [
""
],
"default_print_profile": "",
"bed_exclude_area": [ "bed_exclude_area": [
"0x0" "0x0"
], ],
"machine_start_gcode": "M220 S100\nM221 S100\nG28\nG92 E0\nG1 Z0.3 F200\n", "instantiation": "false",
"machine_end_gcode": "M104 S0 T0\nM104 S0 T1\nM140 S0\n\nG28 X Y\nM18\nM107\n", "type": "machine",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "deretraction_speed": [
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "30",
"scan_first_layer": "0", "30"
"auxiliary_fan": "0", ],
"enable_filament_ramming": "1",
"extruder_offset": [
"0x0",
"0x0"
],
"extruders_count": [ "extruders_count": [
"2" "2"
] ],
"inherits": "fdm_machine_common",
"machine_end_gcode": "G92 E0\nTURN_OFF_HEATERS\nG28 X Y\nM18\nM107",
"machine_start_gcode": "M83 ; Use relative extrusion distances\nG28 ; Home all axes\nM140 S{first_layer_bed_temperature[initial_tool]} ; Start heating bed\nM190 S{first_layer_bed_temperature[initial_tool]} ; Wait for bed to reach temperature\n\nT{initial_tool}\n\n\n; ---------------------------\n; HEAT THE USED TOOL\n; ---------------------------\n{if is_extruder_used[initial_tool]}\nM104 T{initial_tool} S{first_layer_temperature[initial_tool]} ; Preheat active extruder to first layer temperature\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]} ; Wait for active extruder to reach temperature\n{endif}\n\nG1 F18000\nG4 S0\nG92 E0",
"machine_tool_change_time": [
"90"
],
"name": "fdm_re3D_common",
"printer_technology": "FFF",
"retract_before_wipe": [
"70%",
"70%"
],
"retract_length_toolchange": [
"12",
"12"
],
"retract_restart_extra": [
"0",
"0"
],
"retract_restart_extra_toolchange": [
"-0.08",
"-0.08"
],
"retract_when_changing_layer": [
"1",
"1"
],
"retraction_length": [
"1.0",
"1.0"
],
"retraction_minimum_travel": [
"1",
"1"
],
"retraction_speed": [
"30",
"30"
],
"single_extruder_multi_material": "0",
"wipe": [
"1",
"1"
],
"z_hop": [
"0",
"0"
],
"z_hop_types": [
"Normal Lift",
"Normal Lift"
],
"bed_temperature_formula": "by_first_filament",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"best_object_pos": "0.5,0.5",
"cooling_tube_length": "0",
"cooling_tube_retraction": "0",
"default_nozzle_volume_type": [
"Standard",
"Standard"
],
"disable_m73": "0",
"extruder_colour": [
"#FCE94F",
"#FCE94F"
],
"extruder_type": [
"Direct Drive",
"Direct Drive"
],
"extruder_variant_list": [
"Direct Drive Standard",
"Direct Drive Standard"
],
"fan_kickstart": "0",
"fan_speedup_overhangs": "1",
"fan_speedup_time": "0",
"host_type": "octoprint",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"machine_pause_gcode": "PAUSE",
"machine_unload_filament_time": "0",
"manual_filament_change": "0",
"master_extruder_id": "1",
"physical_extruder_map": [
"0"
],
"preferred_orientation": "0",
"printer_extruder_id": [
"1",
"2"
],
"printer_extruder_variant": [
"Direct Drive Standard",
"Direct Drive Standard"
],
"support_air_filtration": "0",
"support_chamber_temp_control": "0",
"thumbnails": "48x48/PNG, 300x300/PNG",
"thumbnails_format": "PNG",
"travel_slope": [
"3",
"3"
],
"use_firmware_retraction": "0",
"use_relative_e_distances": "1",
"wipe_distance": [
"1",
"1"
],
"wipe_tower_type": "type2",
"z_offset": "0"
} }
@@ -5,81 +5,6 @@
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_machine_common", "inherits": "fdm_machine_common",
"gcode_flavor": "klipper", "gcode_flavor": "klipper",
"machine_max_acceleration_e": [
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"5000",
"5000"
],
"machine_max_acceleration_retracting": [
"5000",
"5000"
],
"machine_max_acceleration_travel": [
"20000",
"5000"
],
"machine_max_acceleration_x": [
"5000",
"5000"
],
"machine_max_acceleration_y": [
"5000",
"5000"
],
"machine_max_acceleration_z": [
"2000",
"2000"
],
"machine_max_speed_e": [
"60",
"60"
],
"machine_max_speed_x": [
"500",
"500"
],
"machine_max_speed_y": [
"500",
"500"
],
"machine_max_speed_z": [
"20",
"20"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
],
"machine_max_jerk_y": [
"9",
"9"
],
"machine_max_jerk_z": [
"0.2",
"0.2"
],
"machine_min_extruding_rate": [
"0",
"0"
],
"machine_min_travel_rate": [
"0",
"0"
],
"max_layer_height": [
"2.25"
],
"min_layer_height": [
"0.3"
],
"extruder_clearance_radius": "70",
"printer_settings_id": "", "printer_settings_id": "",
"printer_technology": "FFF", "printer_technology": "FFF",
"purge_in_prime_tower": "0", "purge_in_prime_tower": "0",
@@ -90,6 +15,9 @@
"retract_before_wipe": [ "retract_before_wipe": [
"70%" "70%"
], ],
"extruders_count": [
"1"
],
"retract_when_changing_layer": [ "retract_when_changing_layer": [
"1" "1"
], ],
@@ -97,10 +25,10 @@
"0" "0"
], ],
"retract_length_toolchange": [ "retract_length_toolchange": [
"2" "0"
], ],
"z_hop": [ "z_hop": [
"0.4" "0"
], ],
"retract_restart_extra": [ "retract_restart_extra": [
"0" "0"
@@ -116,16 +44,12 @@
], ],
"z_hop_types": "Normal Lift", "z_hop_types": "Normal Lift",
"silent_mode": "0", "silent_mode": "0",
"single_extruder_multi_material": "1", "single_extruder_multi_material": "0",
"change_filament_gcode": "M600", "change_filament_gcode": "M600",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"wipe": [ "wipe": [
"1" "1"
], ],
"default_filament_profile": [
"re3D Greengate rPETG"
],
"default_print_profile": "1.0mm Standard @re3D fgf 1.75",
"bed_exclude_area": [ "bed_exclude_area": [
"0x0" "0x0"
], ],
@@ -1,31 +1,36 @@
{ {
"type": "machine", "type": "machine",
"setting_id": "GM001",
"name": "re3D Gigabot 4 0.4 nozzle", "name": "re3D Gigabot 4 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_re3D_common", "inherits": "fdm_re3D_common",
"instantiation": "true",
"machine_tech": "FFF",
"model_id": "GB4",
"printer_model": "re3D Gigabot 4", "printer_model": "re3D Gigabot 4",
"nozzle_diameter": [ "bed_texture": "Gigabot 4_buildplate_texture.png",
"0.4", "default_materials": "re3D PETG;re3D PLA;re3D PC",
"0.4"
],
"printer_variant": "0.4",
"printable_area": [ "printable_area": [
"0x0", "0x0",
"590x0", "590x0",
"590x600", "590x600",
"0x600" "0x600"
], ],
"printable_height": "590", "printable_height": "600",
"nozzle_diameter": [
"0.4",
"0.4"
],
"printer_variant": "0.4",
"max_layer_height": [ "max_layer_height": [
"0.32" "0.32"
], ],
"min_layer_height": [ "min_layer_height": [
"0.2" "0.2"
], ],
"retraction_length": [ "default_filament_profile": [
"0.6" "re3D PLA @0.4 nozzle",
"re3D PETG @0.4 nozzle"
], ],
"default_print_profile": "0.28mm Standard @re3D fdm 0.4" "default_print_profile": "0.26 Standard",
"printer_settings_id": "re3d_gigbot4_04",
"setting_id": "re3d_gigbot4_04"
} }
@@ -1,31 +1,36 @@
{ {
"type": "machine", "type": "machine",
"setting_id": "GM001",
"name": "re3D Gigabot 4 0.8 nozzle", "name": "re3D Gigabot 4 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_re3D_common", "inherits": "fdm_re3D_common",
"instantiation": "true",
"machine_tech": "FFF",
"model_id": "GB4",
"printer_model": "re3D Gigabot 4", "printer_model": "re3D Gigabot 4",
"nozzle_diameter": [ "bed_texture": "Gigabot 4_buildplate_texture.png",
"0.8", "default_materials": "re3D PETG;re3D PLA;re3D PC",
"0.8"
],
"printable_area": [ "printable_area": [
"0x0", "0x0",
"590x0", "590x0",
"590x600", "590x600",
"0x600" "0x600"
], ],
"printable_height": "590", "printable_height": "600",
"max_layer_height": [ "nozzle_diameter": [
"0.64" "0.8",
], "0.8"
"min_layer_height": [
"0.3"
],
"retraction_length": [
"1.0"
], ],
"printer_variant": "0.8", "printer_variant": "0.8",
"default_print_profile": "0.2mm Standard @re3D fdm 0.8" "max_layer_height": [
"0.6"
],
"min_layer_height": [
"0.2"
],
"default_filament_profile": [
"re3D PLA @0.8 nozzle",
"re3D PETG @0.8 nozzle"
],
"default_print_profile": "0.4 Standard",
"printer_settings_id": "re3d_gigbot4_08",
"setting_id": "re3d_gigbot4_08"
} }
@@ -1,15 +1,13 @@
{ {
"type": "machine", "type": "machine",
"setting_id": "GM001",
"name": "re3D Gigabot 4 XLT 0.4 nozzle", "name": "re3D Gigabot 4 XLT 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_re3D_common", "inherits": "fdm_re3D_common",
"instantiation": "true",
"machine_tech": "FFF",
"model_id": "GB4",
"printer_model": "re3D Gigabot 4 XLT", "printer_model": "re3D Gigabot 4 XLT",
"nozzle_diameter": [ "bed_texture": "Gigabot 4 XLT_buildplate_texture.png",
"0.4", "default_materials": "re3D PETG;re3D PLA;re3D PC",
"0.4"
],
"printable_area": [ "printable_area": [
"0x0", "0x0",
"590x0", "590x0",
@@ -17,15 +15,22 @@
"0x760" "0x760"
], ],
"printable_height": "900", "printable_height": "900",
"nozzle_diameter": [
"0.4",
"0.4"
],
"printer_variant": "0.4",
"max_layer_height": [ "max_layer_height": [
"0.32" "0.32"
], ],
"min_layer_height": [ "min_layer_height": [
"0.2" "0.2"
], ],
"retraction_length": [ "default_filament_profile": [
"0.6" "re3D PLA @0.4 nozzle",
"re3D PETG @0.4 nozzle"
], ],
"printer_variant": "0.4", "default_print_profile": "0.26 Standard",
"default_print_profile": "0.28mm Standard @re3D fdm 0.4" "printer_settings_id": "re3d_gigabot4_xlt_04",
"setting_id": "re3d_gigabot4_xlt_04"
} }
@@ -1,31 +1,36 @@
{ {
"type": "machine", "type": "machine",
"setting_id": "GM001",
"name": "re3D Gigabot 4 XLT 0.8 nozzle", "name": "re3D Gigabot 4 XLT 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_re3D_common", "inherits": "fdm_re3D_common",
"instantiation": "true",
"machine_tech": "FFF",
"model_id": "GB4",
"printer_model": "re3D Gigabot 4 XLT", "printer_model": "re3D Gigabot 4 XLT",
"bed_texture": "Gigabot 4 XLT_buildplate_texture.png",
"default_materials": "re3D PETG;re3D PLA;re3D PC",
"printable_area": [
"0x0",
"590x0",
"590x760",
"0x760"
],
"printable_height": "900",
"nozzle_diameter": [ "nozzle_diameter": [
"0.8", "0.8",
"0.8" "0.8"
], ],
"printable_area": [ "printer_variant": "0.8",
"0x0",
"600x0",
"600x760",
"0x760"
],
"printable_height": "900",
"max_layer_height": [ "max_layer_height": [
"0.64" "0.6"
], ],
"min_layer_height": [ "min_layer_height": [
"0.2" "0.2"
], ],
"retraction_length": [ "default_filament_profile": [
"1.0" "re3D PLA @0.8 nozzle",
"re3D PETG @0.8 nozzle"
], ],
"printer_variant": "0.8", "default_print_profile": "0.4 Standard",
"default_print_profile": "0.2mm Standard @re3D fdm 0.8" "printer_settings_id": "re3d_gigabot4_xlt_08",
"setting_id": "re3d_gigabot4_xlt_08"
} }
@@ -1,8 +1,9 @@
{ {
"type": "machine_model", "type": "machine_model",
"name": "re3D Gigabot 4 XLT", "name": "re3D Gigabot 4 XLT",
"model_id": "GB4XLT", "model_id": "re3D Gigabot 4 XLT",
"nozzle_diameter": "0.4;0.8", "nozzle_diameter": "0.4;0.8",
"instantiation": "false",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "re3D", "family": "re3D",
"bed_model": "", "bed_model": "",
@@ -1,8 +1,9 @@
{ {
"type": "machine_model", "type": "machine_model",
"name": "re3D Gigabot 4", "name": "re3D Gigabot 4",
"model_id": "GB4", "model_id": "re3D Gigabot 4",
"nozzle_diameter": "0.4;0.8", "nozzle_diameter": "0.4;0.8",
"instantiation": "false",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "re3D", "family": "re3D",
"bed_model": "", "bed_model": "",
@@ -1,28 +0,0 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "re3D Gigabot X2 1.75 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fgf_re3D_common",
"printer_model": "re3D Gigabot X2",
"nozzle_diameter": [
"1.75"
],
"printable_area": [
"0x0",
"552x0",
"552x593",
"0x593"
],
"printable_height": "470",
"extruder_clearance_height_to_rod": "220",
"extruder_clearance_height_to_lid": "630",
"max_layer_height": [
"1.4"
],
"min_layer_height": [
"0.4"
],
"printer_variant": "1.75"
}
@@ -1,28 +0,0 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "re3D Gigabot X2 XLT 1.75 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fgf_re3D_common",
"printer_model": "re3D Gigabot X2 XLT",
"nozzle_diameter": [
"1.75"
],
"printable_area": [
"0x0",
"552x0",
"552x740",
"0x740"
],
"printable_height": "765",
"extruder_clearance_height_to_rod": "220",
"extruder_clearance_height_to_lid": "630",
"max_layer_height": [
"1.4"
],
"min_layer_height": [
"0.6"
],
"printer_variant": "1.75"
}
@@ -1,12 +0,0 @@
{
"type": "machine_model",
"name": "re3D Gigabot X2 XLT",
"model_id": "GBX2XLT",
"nozzle_diameter": "1.75",
"machine_tech": "FFF",
"family": "re3D",
"bed_model": "",
"bed_texture": "re3D Gigabot X2 XLT_buildplate_texture.svg",
"hotend_model": "GBX-HOTEND.stl",
"default_materials": "re3D rPP;re3D Greengate rPETG;"
}
@@ -1,12 +0,0 @@
{
"type": "machine_model",
"name": "re3D Gigabot X2",
"model_id": "GBX2",
"nozzle_diameter": "1.75",
"machine_tech": "FFF",
"family": "re3D",
"bed_model": "",
"bed_texture": "re3D Gigabot X2_buildplate_texture.svg",
"hotend_model": "GBX-HOTEND.stl",
"default_materials": "re3D rPP;re3D Greengate rPETG;"
}
@@ -0,0 +1,33 @@
{
"type": "machine",
"name": "re3D GigabotX 2 0.8 nozzle",
"inherits": "fgf_re3D_common",
"instantiation": "true",
"machine_tech": "FGF",
"model_id": "re3D GBX2",
"printer_model": "re3D GigabotX 2",
"bed_texture": "Gigabot 4_buildplate_texture.png",
"printable_area": [
"0x0",
"552x0",
"552x593",
"0x593"
],
"printable_height": "470",
"nozzle_diameter": [
"0.8"
],
"printer_variant": "0.8",
"max_layer_height": [
"0.6"
],
"min_layer_height": [
"0.3"
],
"default_filament_profile": [
"re3D Greengate rPETG @0.8 nozzle"
],
"default_print_profile": "0.6 Standard",
"printer_settings_id": "re3d_gbx_08",
"setting_id": "re3d_gbx_08"
}
@@ -0,0 +1,34 @@
{
"type": "machine",
"name": "re3D GigabotX 2 1.75 nozzle",
"renamed_from": "re3D Gigabot X2 1.75 nozzle",
"inherits": "fgf_re3D_common",
"instantiation": "true",
"machine_tech": "FGF",
"model_id": "re3D GBX2",
"printer_model": "re3D GigabotX 2",
"bed_texture": "Gigabot 4_buildplate_texture.png",
"printable_area": [
"0x0",
"552x0",
"552x593",
"0x593"
],
"printable_height": "470",
"nozzle_diameter": [
"1.75"
],
"printer_variant": "1.75",
"max_layer_height": [
"1.3"
],
"min_layer_height": [
"0.6"
],
"default_filament_profile": [
"re3D Greengate rPETG @1.75 nozzle"
],
"default_print_profile": "1.0 Standard",
"printer_settings_id": "re3d_gbx_175",
"setting_id": "re3d_gbx_175"
}
@@ -0,0 +1,33 @@
{
"type": "machine",
"name": "re3D GigabotX 2 XLT 0.8 nozzle",
"inherits": "fgf_re3D_common",
"instantiation": "true",
"machine_tech": "FGF",
"model_id": "re3D GBX2 XLT",
"printer_model": "re3D GigabotX 2 XLT",
"bed_texture": "GigabotX 2 XLT_buildplate_texture.png",
"printable_area": [
"0x0",
"552x0",
"552x740",
"0x740"
],
"printable_height": "470",
"nozzle_diameter": [
"0.8"
],
"printer_variant": "0.8",
"max_layer_height": [
"0.6"
],
"min_layer_height": [
"0.3"
],
"default_filament_profile": [
"re3D Greengate rPETG @0.8 nozzle"
],
"default_print_profile": "0.6 Standard",
"printer_settings_id": "re3d_gbx_xlt_08",
"setting_id": "re3d_gbx_xlt_08"
}
@@ -0,0 +1,34 @@
{
"type": "machine",
"name": "re3D GigabotX 2 XLT 1.75 nozzle",
"renamed_from": "re3D Gigabot X2 XLT 1.75 nozzle",
"inherits": "fgf_re3D_common",
"instantiation": "true",
"machine_tech": "FGF",
"model_id": "re3D GBX2 XLT",
"printer_model": "re3D GigabotX 2 XLT",
"bed_texture": "GigabotX 2 XLT_buildplate_texture.png",
"printable_area": [
"0x0",
"552x0",
"552x740",
"0x740"
],
"printable_height": "470",
"nozzle_diameter": [
"1.75"
],
"printer_variant": "1.75",
"max_layer_height": [
"1.3"
],
"min_layer_height": [
"0.6"
],
"default_filament_profile": [
"re3D Greengate rPETG @1.75 nozzle"
],
"default_print_profile": "1.0 Standard",
"printer_settings_id": "re3d_gbx_xlt_175",
"setting_id": "re3d_gbx_xlt_175"
}
@@ -0,0 +1,13 @@
{
"type": "machine_model",
"name": "re3D GigabotX 2 XLT",
"model_id": "re3D GigabotX 2 XLT",
"nozzle_diameter": "0.8;1.75",
"instantiation": "false",
"machine_tech": "FGF",
"family": "re3D",
"bed_model": "",
"bed_texture": "re3D Gigabot X2 XLT_buildplate_texture.svg",
"hotend_model": "GBX-HOTEND.stl",
"default_materials": "re3D Greengate rPETG;re3D rPP;"
}
@@ -0,0 +1,13 @@
{
"type": "machine_model",
"name": "re3D GigabotX 2",
"model_id": "re3D GigabotX 2",
"nozzle_diameter": "0.8;1.75",
"instantiation": "false",
"machine_tech": "FGF",
"family": "re3D",
"bed_model": "",
"bed_texture": "re3D Gigabot X2_buildplate_texture.svg",
"hotend_model": "GBX-HOTEND.stl",
"default_materials": "re3D Greengate rPETG;re3D rPP;"
}
@@ -1,15 +1,13 @@
{ {
"type": "machine", "type": "machine",
"setting_id": "GM001",
"name": "re3D Terabot 4 0.4 nozzle", "name": "re3D Terabot 4 0.4 nozzle",
"from": "system", "inherits": "fdm_re3D_common",
"instantiation": "true", "instantiation": "true",
"inherits": "fgf_re3D_common", "machine_tech": "FFF",
"model_id": "TB4",
"printer_model": "re3D Terabot 4", "printer_model": "re3D Terabot 4",
"nozzle_diameter": [ "bed_texture": "Gigabot 4_buildplate_texture.png",
"0.4", "default_materials": "re3D PETG;re3D PLA;re3D PC",
"0.4"
],
"printable_area": [ "printable_area": [
"0x0", "0x0",
"915x0", "915x0",
@@ -17,15 +15,22 @@
"0x915" "0x915"
], ],
"printable_height": "1000", "printable_height": "1000",
"nozzle_diameter": [
"0.4",
"0.4"
],
"printer_variant": "0.4",
"max_layer_height": [ "max_layer_height": [
"0.32" "0.32"
], ],
"min_layer_height": [ "min_layer_height": [
"0.2" "0.2"
], ],
"retraction_length": [ "default_filament_profile": [
"0.6" "re3D PLA @0.4 nozzle",
"re3D PETG @0.4 nozzle"
], ],
"printer_variant": "0.4", "default_print_profile": "0.26 Standard",
"default_print_profile": "0.28mm Standard @re3D fdm 0.4" "printer_settings_id": "re3d_terabot4_04",
"setting_id": "re3d_terabot4_04"
} }
@@ -1,15 +1,13 @@
{ {
"type": "machine", "type": "machine",
"setting_id": "GM001",
"name": "re3D Terabot 4 0.8 nozzle", "name": "re3D Terabot 4 0.8 nozzle",
"from": "system", "inherits": "fdm_re3D_common",
"instantiation": "true", "instantiation": "true",
"inherits": "fgf_re3D_common", "machine_tech": "FFF",
"model_id": "TB4",
"printer_model": "re3D Terabot 4", "printer_model": "re3D Terabot 4",
"nozzle_diameter": [ "bed_texture": "Gigabot 4_buildplate_texture.png",
"0.8", "default_materials": "re3D PETG;re3D PLA;re3D PC",
"0.8"
],
"printable_area": [ "printable_area": [
"0x0", "0x0",
"915x0", "915x0",
@@ -17,15 +15,22 @@
"0x915" "0x915"
], ],
"printable_height": "1000", "printable_height": "1000",
"nozzle_diameter": [
"0.8",
"0.8"
],
"printer_variant": "0.8",
"max_layer_height": [ "max_layer_height": [
"0.64" "0.6"
], ],
"min_layer_height": [ "min_layer_height": [
"0.2" "0.2"
], ],
"retraction_length": [ "default_filament_profile": [
"1.0" "re3D PLA @0.8 nozzle",
"re3D PETG @0.8 nozzle"
], ],
"printer_variant": "0.8", "default_print_profile": "0.4 Standard",
"default_print_profile": "0.2mm Standard @re3D fdm 0.8" "printer_settings_id": "re3d_terabot4_08",
"setting_id": "re3d_terabot4_08"
} }
@@ -1,8 +1,9 @@
{ {
"type": "machine_model", "type": "machine_model",
"name": "re3D Terabot 4", "name": "re3D Terabot 4",
"model_id": "TB4", "model_id": "re3D Terabot 4",
"nozzle_diameter": "0.4;0.8", "nozzle_diameter": "0.4;0.8",
"instantiation": "false",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "re3D", "family": "re3D",
"bed_model": "", "bed_model": "",
@@ -1,28 +0,0 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "re3D Terabot X2 1.75 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fgf_re3D_common",
"printer_model": "re3D Terabot X2",
"nozzle_diameter": [
"1.75"
],
"printable_area": [
"0x0",
"879x0",
"879x908",
"0x908"
],
"printable_height": "830",
"extruder_clearance_height_to_rod": "220",
"extruder_clearance_height_to_lid": "630",
"max_layer_height": [
"1.4"
],
"min_layer_height": [
"0.4"
],
"printer_variant": "1.75"
}
@@ -1,12 +0,0 @@
{
"type": "machine_model",
"name": "re3D Terabot X2",
"model_id": "TBX2",
"nozzle_diameter": "1.75",
"machine_tech": "FFF",
"family": "re3D",
"bed_model": "",
"bed_texture": "re3D Terabot X2_buildplate_texture.svg",
"hotend_model": "GBX-HOTEND.stl",
"default_materials": "re3D rPP;re3D Greengate rPETG;"
}
@@ -0,0 +1,33 @@
{
"type": "machine",
"name": "re3D TerabotX 2 0.8 nozzle",
"inherits": "fgf_re3D_common",
"instantiation": "true",
"machine_tech": "FGF",
"model_id": "re3D TBX2",
"printer_model": "re3D TerabotX 2",
"bed_texture": "Gigabot 4_buildplate_texture.png",
"printable_area": [
"0x0",
"892x0",
"892x908",
"0x908"
],
"printable_height": "870",
"nozzle_diameter": [
"0.8"
],
"printer_variant": "0.8",
"max_layer_height": [
"0.6"
],
"min_layer_height": [
"0.3"
],
"default_filament_profile": [
"re3D Greengate rPETG @0.8 nozzle"
],
"default_print_profile": "0.6 Standard",
"printer_settings_id": "re3d_tbx2_08",
"setting_id": "re3d_tbx2_08"
}
@@ -0,0 +1,34 @@
{
"type": "machine",
"name": "re3D TerabotX 2 1.75 nozzle",
"renamed_from": "re3D Terabot X2 1.75 nozzle",
"inherits": "fgf_re3D_common",
"instantiation": "true",
"machine_tech": "FGF",
"model_id": "re3D TBX2",
"printer_model": "re3D TerabotX 2",
"bed_texture": "Gigabot 4_buildplate_texture.png",
"printable_area": [
"0x0",
"892x0",
"892x908",
"0x908"
],
"printable_height": "870",
"nozzle_diameter": [
"1.75"
],
"printer_variant": "1.75",
"max_layer_height": [
"1.3"
],
"min_layer_height": [
"0.6"
],
"default_filament_profile": [
"re3D Greengate rPETG @1.75 nozzle"
],
"default_print_profile": "1.0 Standard",
"printer_settings_id": "re3d_tbx2_175",
"setting_id": "re3d_tbx2_175"
}
@@ -0,0 +1,13 @@
{
"type": "machine_model",
"name": "re3D TerabotX 2",
"model_id": "re3D TerabotX 2",
"nozzle_diameter": "0.8;1.75",
"instantiation": "false",
"machine_tech": "FGF",
"family": "re3D",
"bed_model": "",
"bed_texture": "re3D Terabot X2_buildplate_texture.svg",
"hotend_model": "GBX-HOTEND.stl",
"default_materials": "re3D Greengate rPETG;re3D rPP;"
}
@@ -1,7 +1,8 @@
{ {
"type": "process", "type": "process",
"setting_id": "GP004", "setting_id": "fdm__04_026",
"name": "0.26mm Standard @re3D fdm 0.4", "name": "0.26 Standard",
"renamed_from": "0.26mm Standard @re3D fdm 0.4",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_re3D_common", "inherits": "fdm_process_re3D_common",
@@ -12,36 +13,14 @@
], ],
"layer_height": "0.26", "layer_height": "0.26",
"initial_layer_print_height": "0.4", "initial_layer_print_height": "0.4",
"top_shell_layers": "4", "line_width": "0.48",
"top_shell_thickness": "0.6", "outer_wall_line_width": "0.48",
"bottom_shell_layers": "3", "inner_wall_line_width": "0.48",
"line_width": "0.45",
"outer_wall_line_width": "0.45",
"inner_wall_line_width": "0.45",
"initial_layer_line_width": "0.6", "initial_layer_line_width": "0.6",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.48",
"internal_solid_infill_line_width": "0.45", "internal_solid_infill_line_width": "0.48",
"top_surface_line_width": "0.45", "top_surface_line_width": "0.48",
"support_line_width": "0.45", "support_line_width": "0.48",
"overhang_1_4_speed": "45", "support_top_z_distance": "0.2",
"overhang_2_4_speed": "35", "support_bottom_z_distance": "0.2"
"overhang_3_4_speed": "25",
"overhang_4_4_speed": "15",
"initial_layer_speed": "30",
"initial_layer_infill_speed": "30",
"initial_layer_travel_speed": "50",
"outer_wall_speed": "80",
"inner_wall_speed": "80",
"small_perimeter_speed": "80",
"small_perimeter_threshold": "80",
"sparse_infill_speed": "80",
"internal_solid_infill_speed": "80",
"top_surface_speed": "80",
"gap_infill_speed": "80",
"support_speed": "80",
"support_interface_speed": "80",
"travel_speed": "300",
"standby_temperature_delta": "-55",
"support_top_z_distance": "0.28",
"support_bottom_z_distance": "0.28"
} }
@@ -1,22 +1,26 @@
{ {
"type": "process", "type": "process",
"setting_id": "GP004", "setting_id": "fdm_04_02",
"name": "0.2mm Fine @re3D fdm 0.4", "name": "0.2 Fine",
"renamed_from": "0.2mm Fine @re3D fdm 0.4",
"from": "system", "from": "system",
"inherits": "fdm_process_re3D_common", "inherits": "fdm_process_re3D_common",
"instantiation": "true", "instantiation": "true",
"layer_height": "0.2",
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4 0.4 nozzle",
"re3D Gigabot 4 XLT 0.4 nozzle", "re3D Gigabot 4 XLT 0.4 nozzle",
"re3D Terabot 4 0.4 nozzle" "re3D Terabot 4 0.4 nozzle"
], ],
"line_width": "0.42", "layer_height": "0.2",
"outer_wall_line_width": "0.42", "initial_layer_print_height": "0.4",
"inner_wall_line_width": "0.42", "line_width": "0.44",
"initial_layer_line_width": "0.5", "outer_wall_line_width": "0.44",
"sparse_infill_line_width": "0.42", "inner_wall_line_width": "0.44",
"internal_solid_infill_line_width": "0.42", "initial_layer_line_width": "0.6",
"top_surface_line_width": "0.42", "sparse_infill_line_width": "0.48",
"support_line_width": "0.42" "internal_solid_infill_line_width": "0.48",
"top_surface_line_width": "0.44",
"support_line_width": "0.48",
"support_top_z_distance": "0.2",
"support_bottom_z_distance": "0.2"
} }
@@ -1,47 +0,0 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.2mm Standard @re3D fdm 0.8",
"from": "system",
"inherits": "fdm_process_re3D_common",
"instantiation": "true",
"compatible_printers": [
"re3D Gigabot 4 0.8 nozzle",
"re3D Gigabot 4 XLT 0.8 nozzle",
"re3D Terabot 4 0.8 nozzle"
],
"layer_height": "0.2",
"initial_layer_print_height": "0.4",
"top_shell_layers": "4",
"top_shell_thickness": "0.6",
"bottom_shell_layers": "3",
"line_width": "0.8",
"outer_wall_line_width": "0.8",
"inner_wall_line_width": "0.8",
"initial_layer_line_width": "0.8",
"sparse_infill_line_width": "0.8",
"internal_solid_infill_line_width": "0.8",
"top_surface_line_width": "0.8",
"support_line_width": "0.8",
"overhang_1_4_speed": "45",
"overhang_2_4_speed": "35",
"overhang_3_4_speed": "25",
"overhang_4_4_speed": "15",
"initial_layer_speed": "30",
"initial_layer_infill_speed": "30",
"initial_layer_travel_speed": "50",
"outer_wall_speed": "45",
"inner_wall_speed": "45",
"small_perimeter_speed": "45",
"small_perimeter_threshold": "45",
"sparse_infill_speed": "45",
"internal_solid_infill_speed": "45",
"top_surface_speed": "45",
"gap_infill_speed": "45",
"support_speed": "45",
"support_interface_speed": "45",
"travel_speed": "300",
"standby_temperature_delta": "-55",
"support_top_z_distance": "0.24",
"support_bottom_z_distance": "0.24"
}
@@ -1,7 +1,8 @@
{ {
"type": "process", "type": "process",
"setting_id": "GP004", "setting_id": "fdm_04_032",
"name": "0.32mm Draft @re3D fdm 0.4", "name": "0.32 Draft",
"renamed_from": "0.32mm Draft @re3D fdm 0.4",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_re3D_common", "inherits": "fdm_process_re3D_common",
@@ -12,9 +13,6 @@
], ],
"layer_height": "0.32", "layer_height": "0.32",
"initial_layer_print_height": "0.4", "initial_layer_print_height": "0.4",
"top_shell_layers": "4",
"top_shell_thickness": "0.6",
"bottom_shell_layers": "3",
"line_width": "0.48", "line_width": "0.48",
"outer_wall_line_width": "0.48", "outer_wall_line_width": "0.48",
"inner_wall_line_width": "0.48", "inner_wall_line_width": "0.48",
@@ -23,25 +21,6 @@
"internal_solid_infill_line_width": "0.48", "internal_solid_infill_line_width": "0.48",
"top_surface_line_width": "0.48", "top_surface_line_width": "0.48",
"support_line_width": "0.48", "support_line_width": "0.48",
"overhang_1_4_speed": "45",
"overhang_2_4_speed": "35",
"overhang_3_4_speed": "25",
"overhang_4_4_speed": "15",
"initial_layer_speed": "30",
"initial_layer_infill_speed": "30",
"initial_layer_travel_speed": "50",
"outer_wall_speed": "80",
"inner_wall_speed": "80",
"small_perimeter_speed": "80",
"small_perimeter_threshold": "80",
"sparse_infill_speed": "80",
"internal_solid_infill_speed": "80",
"top_surface_speed": "80",
"gap_infill_speed": "80",
"support_speed": "80",
"support_interface_speed": "80",
"travel_speed": "300",
"standby_temperature_delta": "-55",
"support_top_z_distance": "0.35", "support_top_z_distance": "0.35",
"support_bottom_z_distance": "0.35" "support_bottom_z_distance": "0.35"
} }
@@ -0,0 +1,26 @@
{
"type": "process",
"setting_id": "fdm_08_03",
"name": "0.3 Fine",
"renamed_from": "0.2mm Standard @re3D fdm 0.8",
"from": "system",
"inherits": "fdm_process_re3D_common",
"instantiation": "true",
"compatible_printers": [
"re3D Gigabot 4 0.8 nozzle",
"re3D Gigabot 4 XLT 0.8 nozzle",
"re3D Terabot 4 0.8 nozzle"
],
"layer_height": "0.3",
"initial_layer_print_height": "0.4",
"line_width": "1",
"outer_wall_line_width": "1",
"inner_wall_line_width": "1",
"initial_layer_line_width": "1",
"sparse_infill_line_width": "1",
"internal_solid_infill_line_width": "1",
"top_surface_line_width": "1",
"support_line_width": "1",
"support_top_z_distance": "0.24",
"support_bottom_z_distance": "0.24"
}
@@ -1,7 +1,8 @@
{ {
"type": "process", "type": "process",
"setting_id": "GP004", "setting_id": "fdm_08_04",
"name": "0.4mm Draft @re3D fdm 0.8", "name": "0.4 Standard",
"renamed_from": "0.4mm Draft @re3D fdm 0.8",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_re3D_common", "inherits": "fdm_process_re3D_common",
@@ -12,9 +13,6 @@
], ],
"layer_height": "0.4", "layer_height": "0.4",
"initial_layer_print_height": "0.6", "initial_layer_print_height": "0.6",
"top_shell_layers": "4",
"top_shell_thickness": "0.6",
"bottom_shell_layers": "3",
"line_width": "1", "line_width": "1",
"outer_wall_line_width": "1", "outer_wall_line_width": "1",
"inner_wall_line_width": "1", "inner_wall_line_width": "1",
@@ -23,25 +21,6 @@
"internal_solid_infill_line_width": "1", "internal_solid_infill_line_width": "1",
"top_surface_line_width": "1", "top_surface_line_width": "1",
"support_line_width": "1", "support_line_width": "1",
"overhang_1_4_speed": "45",
"overhang_2_4_speed": "35",
"overhang_3_4_speed": "25",
"overhang_4_4_speed": "15",
"initial_layer_speed": "30",
"initial_layer_infill_speed": "30",
"initial_layer_travel_speed": "50",
"outer_wall_speed": "45",
"inner_wall_speed": "45",
"small_perimeter_speed": "45",
"small_perimeter_threshold": "45",
"sparse_infill_speed": "45",
"internal_solid_infill_speed": "45",
"top_surface_speed": "45",
"gap_infill_speed": "45",
"support_speed": "45",
"support_interface_speed": "45",
"travel_speed": "300",
"standby_temperature_delta": "-55",
"support_top_z_distance": "0.42", "support_top_z_distance": "0.42",
"support_bottom_z_distance": "0.42" "support_bottom_z_distance": "0.42"
} }
@@ -0,0 +1,26 @@
{
"type": "process",
"setting_id": "fgf_08_06",
"name": "0.6 Standard",
"from": "system",
"inherits": "fgf_process_re3D_common",
"instantiation": "true",
"layer_height": "0.6",
"initial_layer_print_height": "0.8",
"line_width": "1.0",
"outer_wall_line_width": "1.0",
"inner_wall_line_width": "1.0",
"sparse_infill_line_width": "1.0",
"internal_solid_infill_line_width": "1.0",
"top_surface_line_width": "1.0",
"support_line_width": "1.0",
"initial_layer_line_width": "1.0",
"support_top_z_distance": "0",
"top_shell_layers": "5",
"support_bottom_z_distance": "0",
"compatible_printers": [
"re3D GigabotX 2 0.8 nozzle",
"re3D GigabotX 2 XLT 0.8 nozzle",
"re3D TerabotX 2 0.8 nozzle"
]
}
@@ -1,16 +1,27 @@
{ {
"type": "process", "type": "process",
"setting_id": "GP004", "setting_id": "fgf_175_10",
"name": "1.0mm Standard @re3D fgf 1.75", "name": "1.0 Standard",
"renamed_from": "1.0mm Standard @re3D fgf 1.75",
"from": "system", "from": "system",
"inherits": "fgf_process_re3D_common", "inherits": "fgf_process_re3D_common",
"instantiation": "true", "instantiation": "true",
"layer_height": "1.0", "layer_height": "1.0",
"bottom_shell_layers": "2", "initial_layer_print_height": "1.0",
"top_shell_layers": "5", "line_width": "1.9",
"outer_wall_line_width": "1.9",
"inner_wall_line_width": "1.9",
"initial_layer_line_width": "1.9",
"sparse_infill_line_width": "1.9",
"internal_solid_infill_line_width": "1.9",
"top_surface_line_width": "1.9",
"support_line_width": "1.9",
"support_top_z_distance": "0",
"support_bottom_z_distance": "0",
"top_shell_layers": "3",
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot X2 1.75 nozzle", "re3D GigabotX 2 1.75 nozzle",
"re3D Gigabot X2 XLT 1.75 nozzle", "re3D GigabotX 2 XLT 1.75 nozzle",
"re3D Terabot X2 1.75 nozzle" "re3D TerabotX 2 1.75 nozzle"
] ]
} }
@@ -6,33 +6,33 @@
"adaptive_layer_height": "0", "adaptive_layer_height": "0",
"reduce_crossing_wall": "0", "reduce_crossing_wall": "0",
"bridge_flow": "0.95", "bridge_flow": "0.95",
"bridge_speed": "25", "bridge_speed": "10",
"brim_width": "5", "brim_width": "5",
"compatible_printers": [], "compatible_printers": [],
"print_sequence": "by layer", "print_sequence": "by layer",
"default_acceleration": "10000", "default_acceleration": "0",
"bridge_no_support": "0", "bridge_no_support": "0",
"elefant_foot_compensation": "0.1", "elefant_foot_compensation": "0.1",
"outer_wall_line_width": "0.4", "outer_wall_line_width": "0.4",
"outer_wall_speed": "120", "outer_wall_speed": "25",
"line_width": "0.45", "line_width": "0.4",
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "15%", "sparse_infill_density": "15%",
"sparse_infill_pattern": "crosshatch", "sparse_infill_pattern": "crosshatch",
"initial_layer_line_width": "0.42", "initial_layer_line_width": "0.4",
"initial_layer_print_height": "0.2", "initial_layer_print_height": "0.2",
"initial_layer_speed": "20", "initial_layer_speed": "15",
"gap_infill_speed": "30", "gap_infill_speed": "25",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "0.45", "sparse_infill_line_width": "0.4",
"infill_wall_overlap": "25%", "infill_wall_overlap": "25%",
"sparse_infill_speed": "50", "sparse_infill_speed": "70",
"interface_shells": "0", "interface_shells": "0",
"detect_overhang_wall": "0", "detect_overhang_wall": "0",
"reduce_infill_retraction": "0", "reduce_infill_retraction": "0",
"filename_format": "{input_filename_base}.gcode", "filename_format": "{input_filename_base}.gcode",
"wall_loops": "3", "wall_loops": "3",
"inner_wall_line_width": "0.45", "inner_wall_line_width": "0.4",
"inner_wall_speed": "40", "inner_wall_speed": "40",
"print_settings_id": "", "print_settings_id": "",
"raft_layers": "0", "raft_layers": "0",
@@ -40,16 +40,16 @@
"skirt_distance": "2", "skirt_distance": "2",
"skirt_height": "2", "skirt_height": "2",
"minimum_sparse_infill_area": "0", "minimum_sparse_infill_area": "0",
"internal_solid_infill_line_width": "0.45", "internal_solid_infill_line_width": "0.4",
"internal_solid_infill_speed": "40", "internal_solid_infill_speed": "60",
"spiral_mode": "0", "spiral_mode": "0",
"standby_temperature_delta": "-5", "standby_temperature_delta": "-20",
"enable_support": "0", "enable_support": "0",
"support_filament": "0", "support_filament": "0",
"support_line_width": "0.42", "support_line_width": "0.38",
"support_interface_filament": "0", "support_interface_filament": "0",
"support_on_build_plate_only": "0", "support_on_build_plate_only": "0",
"support_top_z_distance": "0.15", "support_top_z_distance": "0.2",
"support_interface_loop_pattern": "0", "support_interface_loop_pattern": "0",
"support_interface_top_layers": "2", "support_interface_top_layers": "2",
"support_interface_spacing": "0", "support_interface_spacing": "0",
@@ -61,9 +61,9 @@
"support_object_xy_distance": "0.5", "support_object_xy_distance": "0.5",
"detect_thin_wall": "0", "detect_thin_wall": "0",
"top_surface_line_width": "0.4", "top_surface_line_width": "0.4",
"top_surface_speed": "30", "top_surface_speed": "35",
"travel_speed": "400", "travel_speed": "150",
"enable_prime_tower": "0", "enable_prime_tower": "1",
"prime_tower_width": "60", "prime_tower_width": "60",
"xy_hole_compensation": "0", "xy_hole_compensation": "0",
"xy_contour_compensation": "0" "xy_contour_compensation": "0"
@@ -5,120 +5,112 @@
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_process_common", "inherits": "fdm_process_common",
"adaptive_layer_height": "0", "adaptive_layer_height": "0",
"reduce_crossing_wall": "0", "reduce_crossing_wall": "1",
"bridge_flow": "0.985",
"bridge_speed": "25",
"brim_width": "8",
"print_sequence": "by layer",
"default_acceleration": "5000",
"bridge_no_support": "0",
"elefant_foot_compensation": "0",
"outer_wall_speed": "120",
"sparse_infill_density": "15%",
"sparse_infill_pattern": "rectilinear",
"initial_layer_speed": "50",
"gap_infill_speed": "30",
"infill_combination": "0",
"infill_wall_overlap": "25%",
"sparse_infill_speed": "50",
"detect_overhang_wall": "1",
"reduce_infill_retraction": "0",
"filename_format": "{input_filename_base}.gcode",
"wall_loops": "3",
"inner_wall_speed": "40",
"wall_generator": "arachne",
"raft_layers": "0",
"seam_position": "nearest",
"skirt_distance": "8",
"skirt_height": "1",
"minimum_sparse_infill_area": "0",
"internal_solid_infill_speed": "40",
"spiral_mode": "0",
"standby_temperature_delta": "-75",
"enable_support": "1",
"support_filament": "0",
"support_interface_filament": "0",
"support_on_build_plate_only": "0",
"support_interface_loop_pattern": "0",
"support_interface_top_layers": "2",
"support_interface_spacing": "0.05",
"support_interface_speed": "80",
"support_base_pattern": "rectilinear",
"support_base_pattern_spacing": "2",
"support_speed": "40",
"support_threshold_angle": "30",
"support_object_xy_distance": "0.5",
"detect_thin_wall": "0",
"top_surface_speed": "30",
"travel_speed": "300",
"enable_prime_tower": "0",
"prime_tower_width": "60",
"xy_hole_compensation": "0",
"xy_contour_compensation": "0",
"max_travel_detour_distance": "0", "max_travel_detour_distance": "0",
"bottom_surface_pattern": "monotonic", "bottom_surface_pattern": "monotonic",
"bottom_shell_layers": "3", "bottom_shell_layers": "3",
"bottom_shell_thickness": "0", "bottom_shell_thickness": "0",
"bridge_flow": "1",
"bridge_speed": "25",
"brim_width": "8",
"brim_object_gap": "0.1", "brim_object_gap": "0.1",
"compatible_printers_condition": "", "compatible_printers_condition": "",
"print_sequence": "by layer",
"default_acceleration": "5500",
"top_surface_acceleration": "500", "top_surface_acceleration": "500",
"bridge_no_support": "0",
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0.0", "enable_arc_fitting": "1",
"enable_arc_fitting": "0",
"outer_wall_line_width": "0.44",
"wall_infill_order": "inner wall/outer wall/infill", "wall_infill_order": "inner wall/outer wall/infill",
"line_width": "0.44",
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "10%",
"sparse_infill_pattern": "gyroid",
"initial_layer_acceleration": "500", "initial_layer_acceleration": "500",
"travel_acceleration": "5500", "travel_acceleration": "5000",
"inner_wall_acceleration": "5500", "inner_wall_acceleration": "5000",
"initial_layer_line_width": "0.6",
"initial_layer_print_height": "0.4",
"infill_combination": "0",
"sparse_infill_line_width": "0.44",
"infill_wall_overlap": "25%",
"interface_shells": "0", "interface_shells": "0",
"ironing_flow": "10%", "ironing_flow": "10%",
"ironing_spacing": "0.1", "ironing_spacing": "0.1",
"ironing_speed": "20", "ironing_speed": "20",
"ironing_type": "no ironing", "ironing_type": "no ironing",
"layer_height": "0.2",
"reduce_infill_retraction": "0",
"filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
"detect_overhang_wall": "1",
"overhang_1_4_speed": "45", "overhang_1_4_speed": "45",
"overhang_2_4_speed": "35", "overhang_2_4_speed": "35",
"overhang_3_4_speed": "25", "overhang_3_4_speed": "25",
"overhang_4_4_speed": "15", "overhang_4_4_speed": "15",
"inner_wall_line_width": "0.44", "print_settings_id": "fdm_process_re3D_common",
"wall_loops": "2", "skirt_loops": "2",
"print_settings_id": "", "resolution": "0.0",
"raft_layers": "0",
"seam_position": "aligned",
"skirt_distance": "10",
"skirt_height": "1",
"skirt_loops": "3",
"minimum_sparse_infill_area": "15",
"internal_solid_infill_line_width": "0.44",
"spiral_mode": "0",
"standby_temperature_delta": "-5",
"enable_support": "1",
"resolution": "0.012",
"support_type": "normal(auto)", "support_type": "normal(auto)",
"support_style": "snug", "support_style": "snug",
"support_on_build_plate_only": "0", "support_interface_bottom_layers": "2",
"support_top_z_distance": "0.22",
"support_bottom_z_distance": "0.22",
"support_filament": "0",
"support_line_width": "0.44",
"support_interface_loop_pattern": "0",
"support_interface_filament": "0",
"support_interface_top_layers": "3",
"support_interface_bottom_layers": "1",
"support_interface_spacing": "0.5",
"support_interface_speed": "45",
"support_base_pattern": "rectilinear",
"support_base_pattern_spacing": "2.5",
"support_speed": "45",
"support_threshold_angle": "30",
"support_object_xy_distance": "0.35",
"tree_support_branch_angle": "45", "tree_support_branch_angle": "45",
"tree_support_wall_count": "0", "tree_support_wall_count": "0",
"detect_thin_wall": "0",
"top_surface_pattern": "monotonicline", "top_surface_pattern": "monotonicline",
"top_surface_line_width": "0.44",
"top_shell_layers": "4", "top_shell_layers": "4",
"top_shell_thickness": "0.6", "top_shell_thickness": "0.6",
"initial_layer_speed": "30", "initial_layer_infill_speed": "50",
"initial_layer_infill_speed": "30",
"outer_wall_speed": "45",
"inner_wall_speed": "45",
"internal_solid_infill_speed": "45",
"top_surface_speed": "45",
"gap_infill_speed": "45",
"sparse_infill_speed": "45",
"travel_speed": "300",
"enable_prime_tower": "1",
"wipe_tower_no_sparse_layers": "0", "wipe_tower_no_sparse_layers": "0",
"prime_tower_width": "30", "precise_outer_wall": "0",
"xy_hole_compensation": "0",
"xy_contour_compensation": "0",
"precise_outer_wall": "1",
"outer_wall_acceleration": "2500", "outer_wall_acceleration": "2500",
"bridge_acceleration": "5500", "bridge_acceleration": "5000",
"sparse_infill_acceleration": "5500", "sparse_infill_acceleration": "5000",
"internal_solid_infill_acceleration": "5500", "internal_solid_infill_acceleration": "5000",
"accel_to_decel_enable": "0", "accel_to_decel_enable": "0",
"prime_volume": "200", "prime_volume": "200",
"ooze_prevention": "1", "ooze_prevention": "1",
"preheat_time": "30", "preheat_time": "30",
"initial_layer_travel_speed": "50", "initial_layer_travel_speed": "100",
"slow_down_layers": "2", "slow_down_layers": "2",
"small_perimeter_speed": "45", "small_perimeter_speed": "20",
"small_perimeter_threshold": "45", "small_perimeter_threshold": "10",
"exclude_object": "1", "exclude_object": "1",
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot 4 0.4 nozzle", "re3D Gigabot 4 0.4 nozzle",
"re3D Gigabot 4 0.8 nozzle",
"re3D Gigabot 4 XLT 0.4 nozzle", "re3D Gigabot 4 XLT 0.4 nozzle",
"re3D Terabot 4 0.4 nozzle" "re3D Gigabot 4 XLT 0.8 nozzle",
"re3D Terabot 4 0.4 nozzle",
"re3D Terabot 4 0.8 nozzle"
] ]
} }
@@ -7,71 +7,61 @@
"adaptive_layer_height": "0", "adaptive_layer_height": "0",
"reduce_crossing_wall": "1", "reduce_crossing_wall": "1",
"max_travel_detour_distance": "0", "max_travel_detour_distance": "0",
"bottom_surface_pattern": "monotonic", "bottom_surface_pattern": "monotonicline",
"bottom_shell_layers": "2", "bottom_shell_layers": "2",
"bottom_shell_thickness": "0", "bottom_shell_thickness": "0",
"bridge_speed": "40", "bridge_speed": "40",
"brim_type": "no_brim", "brim_type": "no_brim",
"brim_width": "5", "brim_width": "5",
"brim_object_gap": "0.1", "brim_object_gap": "0.1",
"compatible_printers_condition": "",
"print_sequence": "by layer", "print_sequence": "by layer",
"default_acceleration": "500", "default_acceleration": "2500",
"top_surface_acceleration": "500", "top_surface_acceleration": "500",
"bridge_no_support": "0", "bridge_no_support": "0",
"draft_shield": "disabled", "draft_shield": "disabled",
"elefant_foot_compensation": "0", "elefant_foot_compensation": "0",
"enable_arc_fitting": "1", "enable_arc_fitting": "1",
"outer_wall_line_width": "1.9",
"wall_infill_order": "inner wall/outer wall/infill", "wall_infill_order": "inner wall/outer wall/infill",
"line_width": "1.9",
"infill_direction": "45", "infill_direction": "45",
"sparse_infill_density": "20%", "sparse_infill_density": "20%",
"sparse_infill_pattern": "gyroid", "sparse_infill_pattern": "rectilinear",
"initial_layer_acceleration": "500", "initial_layer_acceleration": "500",
"travel_acceleration": "700", "travel_acceleration": "2500",
"inner_wall_acceleration": "500", "inner_wall_acceleration": "2500",
"initial_layer_line_width": "1.9",
"initial_layer_print_height": "1",
"infill_combination": "0", "infill_combination": "0",
"sparse_infill_line_width": "1.9",
"infill_wall_overlap": "50%", "infill_wall_overlap": "50%",
"wall_generator": "classic", "wall_generator": "arachne",
"interface_shells": "0", "interface_shells": "0",
"ironing_flow": "15%", "ironing_flow": "15%",
"ironing_spacing": "0.1", "ironing_spacing": "0.1",
"ironing_speed": "15", "ironing_speed": "15",
"ironing_type": "no ironing", "ironing_type": "no ironing",
"layer_height": "1",
"reduce_infill_retraction": "1", "reduce_infill_retraction": "1",
"filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "filename_format": "{input_filename_base}.gcode",
"detect_overhang_wall": "1", "detect_overhang_wall": "1",
"overhang_1_4_speed": "0", "overhang_1_4_speed": "0",
"overhang_2_4_speed": "20", "overhang_2_4_speed": "20",
"overhang_3_4_speed": "15", "overhang_3_4_speed": "15",
"overhang_4_4_speed": "10", "overhang_4_4_speed": "10",
"inner_wall_line_width": "1.9",
"wall_loops": "2", "wall_loops": "2",
"print_settings_id": "", "print_settings_id": "fgf_process_re3D_common",
"raft_layers": "0", "raft_layers": "0",
"seam_position": "aligned", "seam_position": "aligned",
"seam_gap": "0", "seam_gap": "10",
"staggered_inner_seams": "1", "staggered_inner_seams": "1",
"skirt_distance": "2", "skirt_distance": "10",
"skirt_height": "1", "skirt_height": "1",
"skirt_loops": "3", "skirt_loops": "3",
"minimum_sparse_infill_area": "15", "minimum_sparse_infill_area": "15",
"internal_solid_infill_line_width": "1.9",
"spiral_mode": "0", "spiral_mode": "0",
"standby_temperature_delta": "-5", "standby_temperature_delta": "0",
"enable_support": "0", "enable_support": "0",
"resolution": "0.012", "resolution": "0.0",
"support_type": "normal(auto)", "support_type": "normal(auto)",
"support_style": "default", "support_style": "default",
"support_on_build_plate_only": "0", "support_on_build_plate_only": "0",
"support_top_z_distance": "0.2", "support_top_z_distance": "0.2",
"support_filament": "0", "support_filament": "0",
"support_line_width": "1.9",
"support_interface_loop_pattern": "0", "support_interface_loop_pattern": "0",
"support_interface_filament": "0", "support_interface_filament": "0",
"support_interface_top_layers": "2", "support_interface_top_layers": "2",
@@ -80,14 +70,13 @@
"support_interface_speed": "100", "support_interface_speed": "100",
"support_base_pattern": "rectilinear", "support_base_pattern": "rectilinear",
"support_base_pattern_spacing": "2.5", "support_base_pattern_spacing": "2.5",
"support_speed": "150", "support_speed": "50",
"support_threshold_angle": "30", "support_threshold_angle": "30",
"support_object_xy_distance": "0.35", "support_object_xy_distance": "0.35",
"tree_support_branch_angle": "45", "tree_support_branch_angle": "45",
"tree_support_wall_count": "0", "tree_support_wall_count": "0",
"detect_thin_wall": "0", "detect_thin_wall": "0",
"top_surface_pattern": "monotonic", "top_surface_pattern": "monotonic",
"top_surface_line_width": "1.9",
"top_shell_layers": "4", "top_shell_layers": "4",
"top_shell_thickness": "0", "top_shell_thickness": "0",
"initial_layer_speed": "30", "initial_layer_speed": "30",
@@ -106,6 +95,7 @@
"xy_contour_compensation": "0", "xy_contour_compensation": "0",
"infill_anchor": "2mm", "infill_anchor": "2mm",
"ensure_vertical_shell_thickness": "none", "ensure_vertical_shell_thickness": "none",
"accel_to_decel_enable": "0",
"slow_down_layers": "1", "slow_down_layers": "1",
"default_jerk": "5", "default_jerk": "5",
"outer_wall_jerk": "9", "outer_wall_jerk": "9",
@@ -115,8 +105,11 @@
"first_layer_jerk": "9", "first_layer_jerk": "9",
"travel_jerk": "9", "travel_jerk": "9",
"compatible_printers": [ "compatible_printers": [
"re3D Gigabot X2 1.75 nozzle", "re3D GigabotX 2 0.8 nozzle",
"re3D Gigabot X2 XLT 1.75 nozzle", "re3D GigabotX 2 1.75 nozzle",
"re3D Terabot X2 1.75 nozzle" "re3D GigabotX 2 XLT 0.8 nozzle",
"re3D GigabotX 2 XLT 1.75 nozzle",
"re3D TerabotX 2 0.8 nozzle",
"re3D TerabotX 2 1.75 nozzle"
] ]
} }
+8
View File
@@ -2871,6 +2871,14 @@ void PresetBundle::load_selections(AppConfig &config, const PresetPreferences& p
if (use_default_nozzle_volume_type) { if (use_default_nozzle_volume_type) {
project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values = current_printer.config.option<ConfigOptionEnumsGeneric>("default_nozzle_volume_type")->values; project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values = current_printer.config.option<ConfigOptionEnumsGeneric>("default_nozzle_volume_type")->values;
} else {
// Orca: make sure `nozzle_volume_type` not shorter than `default_nozzle_volume_type`, otherwise we got array out of bound access
// later in `Tab::switch_excluder`
auto& opt = project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values;
const auto& opt_default = current_printer.config.option<ConfigOptionEnumsGeneric>("default_nozzle_volume_type")->values;
while (opt.size() < opt_default.size()) {
opt.emplace_back(opt_default[opt.size()]);
}
} }
// Parse the initial physical printer name. // Parse the initial physical printer name.
+1 -1
View File
@@ -138,7 +138,7 @@ static const std::unordered_map<std::string, std::vector<std::string>> printer_m
"RatRig V-Core 4 IDEX 400", "RatRig V-Core 4 IDEX 400 COPY MODE", "RatRig V-Core 4 IDEX 400 MIRROR MODE", "RatRig V-Core 4 IDEX 500", "RatRig V-Core 4 IDEX 500 COPY MODE", "RatRig V-Core 4 IDEX 400", "RatRig V-Core 4 IDEX 400 COPY MODE", "RatRig V-Core 4 IDEX 400 MIRROR MODE", "RatRig V-Core 4 IDEX 500", "RatRig V-Core 4 IDEX 500 COPY MODE",
"RatRig V-Core 4 IDEX 500 MIRROR MODE"}}, "RatRig V-Core 4 IDEX 500 MIRROR MODE"}},
{"re3D", {"re3D Gigabot 4", "re3D Gigabot 4 XLT", "re3D Terabot 4", {"re3D", {"re3D Gigabot 4", "re3D Gigabot 4 XLT", "re3D Terabot 4",
"re3D Gigabot X2", "re3D Gigabot X2 XLT", "re3D Terabot X2"}}, "re3D GigabotX 2", "re3D GigabotX 2 XLT", "re3D TerabotX 2"}},
{"RolohaunDesign", {"Rook MK1 LDO"}}, {"RolohaunDesign", {"Rook MK1 LDO"}},
{"SecKit", {"SecKit SK-Tank", "Seckit Go3"}}, {"SecKit", {"SecKit SK-Tank", "Seckit Go3"}},
{"Snapmaker", {"Snapmaker J1", "Snapmaker A250", "Snapmaker A350", "Snapmaker A250 Dual", "Snapmaker A350 Dual", {"Snapmaker", {"Snapmaker J1", "Snapmaker A250", "Snapmaker A350", "Snapmaker A250 Dual", "Snapmaker A350 Dual",
+53 -1
View File
@@ -3349,6 +3349,8 @@ bool GUI_App::on_init_network(bool try_backup)
std::string country_code = app_config->get_country_code(); std::string country_code = app_config->get_country_code();
m_agent->set_country_code(country_code); m_agent->set_country_code(country_code);
m_agent->start(); m_agent->start();
// Orca: disable Bambu telemetry up-front (before any login) so it never starts.
check_track_enable();
} }
// When using Orca cloud alongside the BBL network plugin, the BBL DLL agent still // When using Orca cloud alongside the BBL network plugin, the BBL DLL agent still
@@ -3365,6 +3367,12 @@ bool GUI_App::on_init_network(bool try_backup)
bbl.init_log(); bbl.init_log();
bbl.set_cert_file(resources_dir() + "/cert", "slicer_base64.cer"); bbl.set_cert_file(resources_dir() + "/cert", "slicer_base64.cer");
bbl.set_country_code(app_config->get_country_code()); bbl.set_country_code(app_config->get_country_code());
// Orca: disable Bambu telemetry before start() so the DLL never spins up tracking
// workers. This covers the case where the BBL plugin is loaded for LAN discovery
// but the user has not registered BBL_CLOUD_PROVIDER (so m_agent->track_enable
// would not reach this DLL instance).
bbl.track_enable(false);
bbl.track_remove_files();
bbl.start(); bbl.start();
} }
} }
@@ -4970,7 +4978,7 @@ void GUI_App::on_user_login_handle(wxCommandEvent &evt)
void GUI_App::check_track_enable() void GUI_App::check_track_enable()
{ {
// Orca: alaways disable track event // Orca: telemetry only exists on the BBL cloud agent; always disable it.
if (m_agent) { if (m_agent) {
m_agent->track_enable(false); m_agent->track_enable(false);
m_agent->track_remove_files(); m_agent->track_remove_files();
@@ -5855,15 +5863,59 @@ void GUI_App::reload_settings()
if (is_closing() || !preset_bundle || !app_config || !mainframe) if (is_closing() || !preset_bundle || !app_config || !mainframe)
return; return;
// Snapshot each collection's edited config BEFORE any mutation.
// load_pending_vendors() via apply_vendor_config() can call select_preset(0)
// resetting all selections to defaults and overwriting m_edited_preset.
// The cloud load_user_presets() can also trigger select_preset() via
// remove_users_preset() and overwrite m_edited_preset.config via load_user_preset().
struct PresetSnapshot { std::string name; DynamicPrintConfig config; bool dirty; };
auto snapshot_collection = [](const PresetCollection& col) -> PresetSnapshot {
auto& sel = col.get_selected_preset();
auto& ed = col.get_edited_preset();
return {sel.name, ed.config, sel.is_dirty};
};
PresetSnapshot print_snap = snapshot_collection(preset_bundle->prints);
PresetSnapshot filament_snap = snapshot_collection(preset_bundle->filaments);
PresetSnapshot printer_snap = snapshot_collection(preset_bundle->printers);
// Check the user presets for any system vendors that need to be installed // Check the user presets for any system vendors that need to be installed
for (auto data : user_presets) { for (auto data : user_presets) {
if (!check_preset_parent_available(data)) if (!check_preset_parent_available(data))
add_pending_vendor_preset(data); add_pending_vendor_preset(data);
} }
load_pending_vendors(); load_pending_vendors();
preset_bundle->load_user_presets(*app_config, user_presets, ForwardCompatibilitySubstitutionRule::Enable); preset_bundle->load_user_presets(*app_config, user_presets, ForwardCompatibilitySubstitutionRule::Enable);
preset_bundle->save_user_presets(*app_config, get_delete_cache_presets()); preset_bundle->save_user_presets(*app_config, get_delete_cache_presets());
// Re-apply any edited config that was wiped during vendor loading or sync.
auto restore_snapshot = [](PresetCollection& col, const PresetSnapshot& snap, const char* label) {
auto& ed = col.get_edited_preset();
bool changed = !ed.config.equals(snap.config);
BOOST_LOG_TRIVIAL(info) << "reload_settings restore " << label
<< ": snap_name=" << snap.name << " snap_dirty=" << snap.dirty
<< " current_name=" << ed.name << " changed=" << changed;
if (!snap.dirty) return; // nothing to protect, let cloud updates stand
Preset* p = col.find_preset(snap.name, false, true);
if (p && p->name == snap.name) {
BOOST_LOG_TRIVIAL(info) << "reload_settings RESTORING " << label
<< ": name=" << snap.name;
// If the snapshot preset is not currently selected, re-select it first.
if (col.get_selected_preset().name != snap.name)
col.select_preset_by_name(snap.name, true);
ed = col.get_edited_preset();
ed.config = snap.config;
col.get_selected_preset().is_dirty = snap.dirty;
ed.is_dirty = snap.dirty;
} else {
BOOST_LOG_TRIVIAL(info) << "reload_settings restore " << label
<< ": preset not found name=" << snap.name;
}
};
restore_snapshot(preset_bundle->prints, print_snap, "print");
restore_snapshot(preset_bundle->filaments, filament_snap, "filament");
restore_snapshot(preset_bundle->printers, printer_snap, "printer");
// Orca: settings changed, refresh ui to reflect the new preset values // Orca: settings changed, refresh ui to reflect the new preset values
mainframe->update_side_preset_ui(); mainframe->update_side_preset_ui();
for (auto tab : tabs_list) { for (auto tab : tabs_list) {
+8
View File
@@ -1853,6 +1853,14 @@ Sidebar::Sidebar(Plater *parent)
e.Skip(); e.Skip();
}); });
w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_color](wxMouseEvent &e) { w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_color](wxMouseEvent &e) {
// Orca: if the edit button is already hidden the handler has no
// state to change, so skip the expensive wxFindWindowAtPoint tree
// walk. Without this guard, when the parent window is on an
// inactive Hyprland/Wayland workspace, GTK keeps delivering
// synthetic leave events and the Hide()+Layout() below re-enters
// the same handler in a feedback loop that pegs a CPU core.
// (IsShownOnScreen() can't be used here — see Plater.cpp:9304.)
if (!p->btn_edit_printer->IsShown()) { e.Skip(); return; }
// Use event-relative coords instead of wxGetMousePosition() which // Use event-relative coords instead of wxGetMousePosition() which
// returns (0,0) on Wayland for global screen coordinates. // returns (0,0) on Wayland for global screen coordinates.
wxWindow* evtObj = dynamic_cast<wxWindow*>(e.GetEventObject()); wxWindow* evtObj = dynamic_cast<wxWindow*>(e.GetEventObject());
+4 -3
View File
@@ -1172,7 +1172,6 @@ wxBoxSizer* PreferencesDialog::create_item_link_association( wxString url_prefix
auto checkbox = new ::CheckBox(m_parent); auto checkbox = new ::CheckBox(m_parent);
checkbox->SetToolTip(tooltip); checkbox->SetToolTip(tooltip);
checkbox->SetValue(reg_to_current_instance); // If registered to the current instance, checkbox should be checked checkbox->SetValue(reg_to_current_instance); // If registered to the current instance, checkbox should be checked
checkbox->Enable(!reg_to_current_instance); // Since unregistering isn't supported, checkbox is disabled when checked
// build text next to checkbox // build text next to checkbox
auto checkbox_title = new wxStaticText(m_parent, wxID_ANY, title, wxDefaultPosition, DESIGN_TITLE_SIZE); auto checkbox_title = new wxStaticText(m_parent, wxID_ANY, title, wxDefaultPosition, DESIGN_TITLE_SIZE);
@@ -1223,8 +1222,10 @@ wxBoxSizer* PreferencesDialog::create_item_link_association( wxString url_prefix
v_sizer->Add(registered_instance_title, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(DESIGN_LEFT_MARGIN)); v_sizer->Add(registered_instance_title, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(DESIGN_LEFT_MARGIN));
checkbox->Bind(wxEVT_TOGGLEBUTTON, [=](wxCommandEvent& e) { checkbox->Bind(wxEVT_TOGGLEBUTTON, [=](wxCommandEvent& e) {
wxGetApp().associate_url(url_prefix.ToStdWstring()); if (checkbox->GetValue())
checkbox->Disable(); wxGetApp().associate_url(url_prefix.ToStdWstring());
else
wxGetApp().disassociate_url(url_prefix.ToStdWstring());
update_current_association_str(); update_current_association_str();
e.Skip(); e.Skip();
}); });
+8 -7
View File
@@ -582,21 +582,22 @@ int NetworkAgent::get_my_token(std::string ticket, unsigned int* http_code, std:
return -1; return -1;
} }
int NetworkAgent::track_enable(bool enable, const std::string& provider) int NetworkAgent::track_enable(bool enable)
{ {
this->enable_track = enable; // Orca cloud has no telemetry; the only cloud agent that tracks events is BBL.
const auto cloud_agent = get_cloud_agent(provider); this->enable_track = enable;
const auto cloud_agent = get_cloud_agent(BBL_CLOUD_PROVIDER);
if (cloud_agent) if (cloud_agent)
return cloud_agent->track_enable(enable); return cloud_agent->track_enable(enable);
return -1; return 0;
} }
int NetworkAgent::track_remove_files(const std::string& provider) int NetworkAgent::track_remove_files()
{ {
const auto cloud_agent = get_cloud_agent(provider); const auto cloud_agent = get_cloud_agent(BBL_CLOUD_PROVIDER);
if (cloud_agent) if (cloud_agent)
return cloud_agent->track_remove_files(); return cloud_agent->track_remove_files();
return -1; return 0;
} }
int NetworkAgent::track_event(std::string evt_key, std::string content, const std::string& provider) int NetworkAgent::track_event(std::string evt_key, std::string content, const std::string& provider)
+3 -2
View File
@@ -118,8 +118,9 @@ public:
int get_model_mall_detail_url(std::string* url, std::string id, const std::string& provider = ORCA_CLOUD_PROVIDER); int get_model_mall_detail_url(std::string* url, std::string id, const std::string& provider = ORCA_CLOUD_PROVIDER);
int get_my_profile(std::string token, unsigned int* http_code, std::string* http_body, const std::string& provider = ORCA_CLOUD_PROVIDER); int get_my_profile(std::string token, unsigned int* http_code, std::string* http_body, const std::string& provider = ORCA_CLOUD_PROVIDER);
int get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body, const std::string& provider = ORCA_CLOUD_PROVIDER); int get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body, const std::string& provider = ORCA_CLOUD_PROVIDER);
int track_enable(bool enable, const std::string& provider = ORCA_CLOUD_PROVIDER); // Orca: telemetry only exists on the BBL cloud agent (Orca cloud has no track events).
int track_remove_files(const std::string& provider = ORCA_CLOUD_PROVIDER); int track_enable(bool enable);
int track_remove_files();
int track_event(std::string evt_key, std::string content, const std::string& provider = ORCA_CLOUD_PROVIDER); int track_event(std::string evt_key, std::string content, const std::string& provider = ORCA_CLOUD_PROVIDER);
int track_header(std::string header, const std::string& provider = ORCA_CLOUD_PROVIDER); int track_header(std::string header, const std::string& provider = ORCA_CLOUD_PROVIDER);
int track_update_property(std::string name, std::string value, std::string type = "string", const std::string& provider = ORCA_CLOUD_PROVIDER); int track_update_property(std::string name, std::string value, std::string type = "string", const std::string& provider = ORCA_CLOUD_PROVIDER);