diff --git a/resources/profiles/Ginger Additive.json b/resources/profiles/Ginger Additive.json index 9612e2b8a1..d30a3617cf 100644 --- a/resources/profiles/Ginger Additive.json +++ b/resources/profiles/Ginger Additive.json @@ -6,7 +6,7 @@ "machine_model_list": [ { "name": "ginger G1", - "sub_path": "machine/ginger G1.json" + "sub_path": "machine/Ginger G1.json" } ], "machine_list": [ @@ -16,23 +16,23 @@ }, { "name": "ginger_one_common", - "sub_path": "machine/ginger_one_common.json" + "sub_path": "machine/Ginger_G1_common.json" }, { "name": "ginger G1 1.2 nozzle", - "sub_path": "machine/ginger G1 1.2 nozzle.json" + "sub_path": "machine/Ginger G1 1.2 nozzle.json" }, { "name": "ginger G1 3.0 nozzle", - "sub_path": "machine/ginger G1 3.0 nozzle.json" + "sub_path": "machine/Ginger G1 3.0 nozzle.json" }, { "name": "ginger G1 5.0 nozzle", - "sub_path": "machine/ginger G1 5.0 nozzle.json" + "sub_path": "machine/Ginger G1 5.0 nozzle.json" }, { "name": "ginger G1 8.0 nozzle", - "sub_path": "machine/ginger G1 8.0 nozzle.json" + "sub_path": "machine/Ginger G1 8.0 nozzle.json" } ], "process_list": [ @@ -66,22 +66,6 @@ "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, - { - "name": "fdm_filament_petg", - "sub_path": "filament/fdm_filament_petg.json" - }, - { - "name": "fdm_filament_pla", - "sub_path": "filament/fdm_filament_pla.json" - }, - { - "name": "fdm_filament_rpetg", - "sub_path": "filament/fdm_filament_rpetg.json" - }, - { - "name": "fdm_filament_rpla", - "sub_path": "filament/fdm_filament_rpla.json" - }, { "name": "Ginger Generic PETG", "sub_path": "filament/Ginger Generic PETG.json" @@ -89,14 +73,6 @@ { "name": "Ginger Generic PLA", "sub_path": "filament/Ginger Generic PLA.json" - }, - { - "name": "Ginger Generic rPETG", - "sub_path": "filament/Ginger Generic rPETG.json" - }, - { - "name": "Ginger Generic rPLA", - "sub_path": "filament/Ginger Generic rPLA.json" } ] } diff --git a/resources/profiles/Ginger Additive/Ginger_One.stl b/resources/profiles/Ginger Additive/Ginger_G1.stl similarity index 100% rename from resources/profiles/Ginger Additive/Ginger_One.stl rename to resources/profiles/Ginger Additive/Ginger_G1.stl diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json b/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json index 8fd8e38915..2b76d509e0 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json +++ b/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json @@ -1,29 +1,55 @@ { + "from": "system", "type": "filament", + "instantiation": "true", + "version": "0.1.0.0", + "filament_vendor": ["Generic"], + "inherits": "fdm_filament_common", + "name": "Ginger Generic PETG", + "close_fan_the_first_x_layers": ["4"], "enable_overhang_bridge_fan": ["0"], + "enable_pressure_advance": ["1"], + "extruder_rotation_volume": "624", + "fan_cooling_layer_time": ["100"], "fan_max_speed": ["0"], "fan_min_speed": ["0"], - "filament_diameter": ["1.12838"], - "filament_max_volumetric_speed": ["220"], + "filament_cost": ["6"], + "filament_density": ["1.23"], + "filament_deretraction_speed": ["nil"], + "filament_max_volumetric_speed": ["200"], + "filament_retract_before_wipe": ["nil"], + "filament_retract_lift_above": ["nil"], + "filament_retract_lift_below": ["nil"], + "filament_retract_lift_enforce": ["nil"], + "filament_retract_restart_extra": ["nil"], + "filament_retract_when_changing_layer": ["nil"], + "filament_retraction_length": ["nil"], + "filament_retraction_minimum_travel": ["nil"], + "filament_retraction_speed": ["nil"], "filament_settings_id": ["PETG"], + "filament_start_gcode": ["SET_PRESSURE_ADVANCE EXTRUDER=extruder SMOOTH_TIME=0.5"], "filament_type": ["PETG"], - "filament_vendor": ["Generic"], - "from": "system", - "hot_plate_temp": ["100"], - "hot_plate_temp_initial_layer": ["90"], - "inherits": "fdm_filament_petg", + "filament_wipe": ["nil"], + "filament_wipe_distance": ["nil"], + "filament_z_hop": ["nil"], + "filament_z_hop_types": ["nil"], + "hot_plate_temp": ["80"], + "hot_plate_temp_initial_layer": ["75"], "is_custom_defined": "0", - "name": "Ginger Generic PETG", - "pellet_flow_coefficient": ["1"], - "pressure_advance": ["0.01"], + "mixing_stepper_rotation_volume": "8000", + "multi_zone_1_initial_layer": "240", + "multi_zone_1_temperature": "240", + "multi_zone_2_initial_layer": "240", + "multi_zone_2_temperature": "240", + "multi_zone_3_initial_layer": "220", + "multi_zone_3_temperature": "220", + "nozzle_temperature_range_high": ["260"], + "nozzle_temperature_range_low": ["210"], + "overhang_fan_speed": ["100"], + "overhang_fan_threshold": ["50%"], + "pressure_advance": ["0.3"], + "reduce_fan_stop_start_freq": ["0"], "slow_down_layer_time": ["30"], - "slow_down_min_speed": ["1"], - "version": "0.1.0.0", - "compatible_printers": [ - "ginger G1 1.2 nozzle", - "ginger G1 3.0 nozzle", - "ginger G1 5.0 nozzle", - "ginger G1 8.0 nozzle" - ], - "instantiation": "true" + "slow_down_min_speed": ["1"], + "temperature_vitrification": ["75"] } diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json b/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json index 8242c91b28..eb51947efc 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json +++ b/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json @@ -1,30 +1,55 @@ { - "type": "filament", - "fan_cooling_layer_time": ["60"], - "fan_max_speed": ["60"], - "fan_min_speed": ["20"], - "filament_cost": ["6"], - "filament_diameter": ["1.12838"], - "filament_max_volumetric_speed": ["250"], - "filament_settings_id": ["PLA"], - "filament_vendor": ["Generic"], "from": "system", - "inherits": "fdm_filament_pla", - "is_custom_defined": "0", - "name": "Ginger Generic PLA", - "nozzle_temperature": ["210"], - "nozzle_temperature_initial_layer": ["210"], - "nozzle_temperature_range_high": ["220"], - "pellet_flow_coefficient": ["1"], - "required_nozzle_HRC": ["0"], - "slow_down_layer_time": ["20"], - "slow_down_min_speed": ["3"], + "type": "filament", + "instantiation": "true", "version": "0.1.0.0", - "compatible_printers": [ - "ginger G1 1.2 nozzle", - "ginger G1 3.0 nozzle", - "ginger G1 5.0 nozzle", - "ginger G1 8.0 nozzle" - ], - "instantiation": "true" + "filament_vendor": ["Generic"], + "inherits": "fdm_filament_common", + "name": "Ginger Generic PLA", + "close_fan_the_first_x_layers": ["4"], + "enable_overhang_bridge_fan": ["0"], + "enable_pressure_advance": ["1"], + "extruder_rotation_volume": "456", + "fan_cooling_layer_time": ["100"], + "fan_max_speed": ["0"], + "fan_min_speed": ["0"], + "filament_cost": ["6"], + "filament_density": ["1.24"], + "filament_deretraction_speed": ["nil"], + "filament_max_volumetric_speed": ["250"], + "filament_retract_before_wipe": ["nil"], + "filament_retract_lift_above": ["nil"], + "filament_retract_lift_below": ["nil"], + "filament_retract_lift_enforce": ["nil"], + "filament_retract_restart_extra": ["nil"], + "filament_retract_when_changing_layer": ["nil"], + "filament_retraction_length": ["nil"], + "filament_retraction_minimum_travel": ["nil"], + "filament_retraction_speed": ["nil"], + "filament_settings_id": ["PLA"], + "filament_start_gcode": ["SET_PRESSURE_ADVANCE EXTRUDER=extruder SMOOTH_TIME=0.5"], + "filament_type": ["PLA"], + "filament_wipe": ["nil"], + "filament_wipe_distance": ["nil"], + "filament_z_hop": ["nil"], + "filament_z_hop_types": ["nil"], + "hot_plate_temp": ["50"], + "hot_plate_temp_initial_layer": ["50"], + "is_custom_defined": "0", + "mixing_stepper_rotation_volume": "8000", + "multi_zone_1_initial_layer": "200", + "multi_zone_1_temperature": "200", + "multi_zone_2_initial_layer": "200", + "multi_zone_2_temperature": "200", + "multi_zone_3_initial_layer": "200", + "multi_zone_3_temperature": "200", + "nozzle_temperature_range_high": ["220"], + "nozzle_temperature_range_low": ["180"], + "overhang_fan_speed": ["100"], + "overhang_fan_threshold": ["50%"], + "pressure_advance": ["0.3"], + "reduce_fan_stop_start_freq": ["0"], + "slow_down_layer_time": ["50"], + "slow_down_min_speed": ["1"], + "temperature_vitrification": ["55"] } diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic rPETG.json b/resources/profiles/Ginger Additive/filament/Ginger Generic rPETG.json deleted file mode 100644 index 489744aeff..0000000000 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic rPETG.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "filament", - "fan_cooling_layer_time": ["50"], - "fan_min_speed": ["0"], - "filament_density": ["1.27"], - "filament_diameter": ["1.12838"], - "filament_settings_id": ["rPETG"], - "filament_type": ["rPETG"], - "filament_vendor": ["Generic"], - "from": "system", - "hot_plate_temp": ["90"], - "hot_plate_temp_initial_layer": ["80"], - "inherits": "fdm_filament_rpetg", - "is_custom_defined": "0", - "name": "Ginger Generic rPETG", - "nozzle_temperature_range_high": ["260"], - "nozzle_temperature_range_low": ["230"], - "pellet_flow_coefficient": ["1"], - "pressure_advance": ["0.01"], - "required_nozzle_HRC": ["0"], - "slow_down_min_speed": ["2"], - "temperature_vitrification": ["85"], - "version": "0.1.0.0", - "compatible_printers": [ - "ginger G1 1.2 nozzle", - "ginger G1 3.0 nozzle", - "ginger G1 5.0 nozzle", - "ginger G1 8.0 nozzle" - ], - "instantiation": "true" -} diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic rPLA.json b/resources/profiles/Ginger Additive/filament/Ginger Generic rPLA.json deleted file mode 100644 index 65dc0c13b0..0000000000 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic rPLA.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "filament", - "fan_max_speed": ["0"], - "fan_min_speed": ["0"], - "filament_diameter": ["1.12838"], - "filament_settings_id": ["rPLA"], - "filament_type": ["rPLA"], - "filament_vendor": ["Generic"], - "from": "system", - "inherits": "fdm_filament_rpla", - "is_custom_defined": "0", - "name": "Ginger Generic rPLA", - "pellet_flow_coefficient": ["1"], - "version": "0.1.0.0", - "compatible_printers": [ - "ginger G1 1.2 nozzle", - "ginger G1 3.0 nozzle", - "ginger G1 5.0 nozzle", - "ginger G1 8.0 nozzle" - ], - "instantiation": "true" -} diff --git a/resources/profiles/Ginger Additive/filament/fdm_filament_common.json b/resources/profiles/Ginger Additive/filament/fdm_filament_common.json index ffd1d27d7c..5bcaf14091 100644 --- a/resources/profiles/Ginger Additive/filament/fdm_filament_common.json +++ b/resources/profiles/Ginger Additive/filament/fdm_filament_common.json @@ -1,95 +1,255 @@ { - "type": "filament", - "activate_air_filtration": ["0"], - "activate_chamber_temp_control": ["0"], - "additional_cooling_fan_speed": ["70"], - "chamber_temperature": ["0"], - "close_fan_the_first_x_layers": ["1"], - "compatible_printers": ["Ginger Additive ginger G1 1.0 nozzle"], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": ["70"], - "cool_plate_temp": ["35"], - "cool_plate_temp_initial_layer": ["35"], - "default_filament_colour": [""], - "during_print_exhaust_fan_speed": ["70"], - "enable_overhang_bridge_fan": ["1"], - "enable_pressure_advance": ["1"], - "eng_plate_temp": ["0"], - "eng_plate_temp_initial_layer": ["0"], - "fan_cooling_layer_time": ["60"], - "fan_max_speed": ["0"], - "fan_min_speed": ["0"], - "filament_cooling_final_speed": ["3.4"], - "filament_cooling_initial_speed": ["2.2"], - "filament_cooling_moves": ["4"], - "filament_cost": ["5"], - "filament_density": ["1.24"], - "filament_deretraction_speed": ["nil"], - "filament_diameter": ["2.8"], - "filament_end_gcode": ["; filament end gcode \nM106 P3 S0\n"], - "filament_flow_ratio": ["1"], - "filament_id": "P510eff9", - "filament_is_support": ["0"], - "filament_load_time": ["0"], - "filament_loading_speed": ["28"], - "filament_loading_speed_start": ["3"], - "filament_max_volumetric_speed": ["300"], - "filament_minimal_purge_on_wipe_tower": ["15"], - "filament_multitool_ramming": ["0"], - "filament_multitool_ramming_flow": ["10"], - "filament_multitool_ramming_volume": ["10"], - "filament_notes": [""], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_retract_before_wipe": ["nil"], - "filament_retract_lift_above": ["nil"], - "filament_retract_lift_below": ["nil"], - "filament_retract_lift_enforce": ["nil"], - "filament_retract_restart_extra": ["nil"], - "filament_retract_when_changing_layer": ["nil"], - "filament_retraction_length": ["nil"], - "filament_retraction_minimum_travel": ["nil"], - "filament_retraction_speed": ["nil"], - "filament_settings_id": ["Ginger Filaments Common"], - "filament_shrink": ["100%"], - "filament_soluble": ["0"], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" - ], - "filament_toolchange_delay": ["0"], - "filament_unload_time": ["0"], - "filament_unloading_speed": ["90"], - "filament_unloading_speed_start": ["100"], - "filament_vendor": ["Generic"], - "filament_wipe": ["nil"], - "filament_wipe_distance": ["nil"], - "filament_z_hop": ["nil"], - "filament_z_hop_types": ["nil"], - "from": "system", - "full_fan_speed_layer": ["0"], - "hot_plate_temp": ["1"], - "hot_plate_temp_initial_layer": ["60"], - "is_custom_defined": "0", - "name": "fdm_filament_common", - "nozzle_temperature": ["220"], - "nozzle_temperature_initial_layer": ["220"], - "nozzle_temperature_range_high": ["240"], - "nozzle_temperature_range_low": ["190"], - "overhang_fan_speed": ["100"], - "overhang_fan_threshold": ["50%"], - "pressure_advance": ["0.4"], - "reduce_fan_stop_start_freq": ["0"], - "required_nozzle_HRC": ["3"], - "slow_down_for_layer_cooling": ["1"], - "slow_down_layer_time": ["30"], - "slow_down_min_speed": ["20"], - "support_material_interface_fan_speed": ["-1"], - "temperature_vitrification": ["55"], - "textured_plate_temp": ["55"], - "textured_plate_temp_initial_layer": ["55"], - "version": "1.7.0.2", - "instantiation": "false" -} + "type": "filament", + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers": [ + "Ginger G1 1.2 nozzle", + "Ginger G1 3.0 nozzle", + "Ginger G1 5.0 nozzle", + "Ginger G1 8.0 nozzle" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "70" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "70" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "60" + ], + "fan_max_speed": [ + "0" + ], + "fan_min_speed": [ + "0" + ], + "filament_cooling_final_speed": [ + "3.4" + ], + "filament_cooling_initial_speed": [ + "2.2" + ], + "filament_cooling_moves": [ + "4" + ], + "filament_cost": [ + "5" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.12838" + ], + "filament_end_gcode": [ + "; filament end gcode \nM106 P3 S0\n" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_id": "P510eff9", + "filament_is_support": [ + "0" + ], + "filament_load_time": [ + "0" + ], + "filament_loading_speed": [ + "28" + ], + "filament_loading_speed_start": [ + "3" + ], + "filament_max_volumetric_speed": [ + "300" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "10" + ], + "filament_multitool_ramming_volume": [ + "10" + ], + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_settings_id": [ + "Ginger Filaments Common" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unload_time": [ + "0" + ], + "filament_unloading_speed": [ + "90" + ], + "filament_unloading_speed_start": [ + "100" + ], + "filament_vendor": [ + "Generic" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "from": "system", + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "1" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "is_custom_defined": "0", + "name": "fdm_filament_common", + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.4" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "30" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "55" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ], + "version": "1.7.0.2", + "pellet_flow_coefficient": [ + "1" + ], + "instantiation": "false" +} \ No newline at end of file diff --git a/resources/profiles/Ginger Additive/filament/fdm_filament_petg.json b/resources/profiles/Ginger Additive/filament/fdm_filament_petg.json deleted file mode 100644 index 3046df8a81..0000000000 --- a/resources/profiles/Ginger Additive/filament/fdm_filament_petg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "filament_type": ["PETG"], - "close_fan_the_first_x_layers": ["4"], - "fan_cooling_layer_time": ["100"], - "fan_max_speed": ["50"], - "fan_min_speed": ["5"], - "filament_diameter": ["2.4"], - "filament_settings_id": ["PETG"], - "filament_vendor": ["Generic"], - "from": "system", - "hot_plate_temp": ["50"], - "hot_plate_temp_initial_layer": ["50"], - "inherits": "fdm_filament_common", - "name": "fdm_filament_petg", - "pressure_advance": ["0"], - "slow_down_layer_time": ["25"], - "version": "1.7.0.2", - "instantiation": "false" -} diff --git a/resources/profiles/Ginger Additive/filament/fdm_filament_pla.json b/resources/profiles/Ginger Additive/filament/fdm_filament_pla.json deleted file mode 100644 index d10da9b052..0000000000 --- a/resources/profiles/Ginger Additive/filament/fdm_filament_pla.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "filament_type": ["PLA"], - "close_fan_the_first_x_layers": ["4"], - "fan_cooling_layer_time": ["100"], - "fan_max_speed": ["50"], - "fan_min_speed": ["5"], - "filament_diameter": ["2.4"], - "filament_settings_id": ["PLA"], - "filament_vendor": ["Generic"], - "from": "system", - "hot_plate_temp": ["50"], - "hot_plate_temp_initial_layer": ["50"], - "inherits": "fdm_filament_common", - "name": "fdm_filament_pla", - "pressure_advance": ["0"], - "slow_down_layer_time": ["25"], - "version": "1.7.0.2", - "instantiation": "false" -} diff --git a/resources/profiles/Ginger Additive/filament/fdm_filament_rpetg.json b/resources/profiles/Ginger Additive/filament/fdm_filament_rpetg.json deleted file mode 100644 index 826d04babf..0000000000 --- a/resources/profiles/Ginger Additive/filament/fdm_filament_rpetg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "filament_type": ["rPETG"], - "close_fan_the_first_x_layers": ["4"], - "fan_cooling_layer_time": ["100"], - "fan_max_speed": ["50"], - "fan_min_speed": ["5"], - "filament_diameter": ["2.4"], - "filament_settings_id": ["rPETG"], - "filament_vendor": ["Generic"], - "from": "system", - "hot_plate_temp": ["50"], - "hot_plate_temp_initial_layer": ["50"], - "inherits": "fdm_filament_common", - "name": "fdm_filament_rpetg", - "pressure_advance": ["0"], - "slow_down_layer_time": ["25"], - "version": "1.7.0.2", - "instantiation": "false" -} diff --git a/resources/profiles/Ginger Additive/filament/fdm_filament_rpla.json b/resources/profiles/Ginger Additive/filament/fdm_filament_rpla.json deleted file mode 100644 index 05a73700c7..0000000000 --- a/resources/profiles/Ginger Additive/filament/fdm_filament_rpla.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "filament_type": ["rPLA"], - "close_fan_the_first_x_layers": ["4"], - "fan_cooling_layer_time": ["100"], - "fan_max_speed": ["50"], - "fan_min_speed": ["5"], - "filament_diameter": ["2.4"], - "filament_settings_id": ["rPLA"], - "filament_vendor": ["Generic"], - "from": "system", - "hot_plate_temp": ["50"], - "hot_plate_temp_initial_layer": ["50"], - "inherits": "fdm_filament_common", - "name": "fdm_filament_rpla", - "pressure_advance": ["0"], - "slow_down_layer_time": ["25"], - "version": "1.7.0.2", - "instantiation": "false" -} diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1 1.2 nozzle.json b/resources/profiles/Ginger Additive/machine/Ginger G1 1.2 nozzle.json new file mode 100644 index 0000000000..1070fe5735 --- /dev/null +++ b/resources/profiles/Ginger Additive/machine/Ginger G1 1.2 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "Ginger G1 1.2 nozzle", + "renamed_from":"ginger G1 1.2 nozzle", + "printer_settings_id": "Ginger G1 1.2 nozzle", + "instantiation": "true", + "inherits": "Ginger_G1_common", + "max_layer_height": ["1"], + "nozzle_diameter": ["1.2"], + "printer_variant": "1.2", + "printer_model": "ginger G1", + "version": "0.1.0.0" +} diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1 3.0 nozzle.json b/resources/profiles/Ginger Additive/machine/Ginger G1 3.0 nozzle.json new file mode 100644 index 0000000000..2969b6bf18 --- /dev/null +++ b/resources/profiles/Ginger Additive/machine/Ginger G1 3.0 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "Ginger G1 3.0 nozzle", + "renamed_from":"ginger G1 3.0 nozzle", + "printer_settings_id": "Ginger G1 3.0 nozzle", + "instantiation": "true", + "inherits": "Ginger_G1_common", + "max_layer_height": ["2.5"], + "nozzle_diameter": ["3.0"], + "printer_variant": "3.0", + "printer_model": "ginger G1", + "version": "0.1.0.0" +} diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1 5.0 nozzle.json b/resources/profiles/Ginger Additive/machine/Ginger G1 5.0 nozzle.json new file mode 100644 index 0000000000..7efa58a40f --- /dev/null +++ b/resources/profiles/Ginger Additive/machine/Ginger G1 5.0 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "Ginger G1 5.0 nozzle", + "renamed_from":"ginger G1 5.0 nozzle", + "printer_settings_id": "Ginger G1 5.0 nozzle", + "instantiation": "true", + "inherits": "Ginger_G1_common", + "max_layer_height": ["3.5"], + "nozzle_diameter": ["5.0"], + "printer_variant": "5.0", + "printer_model": "ginger G1", + "version": "0.1.0.0" +} diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1 8.0 nozzle.json b/resources/profiles/Ginger Additive/machine/Ginger G1 8.0 nozzle.json new file mode 100644 index 0000000000..74469794e2 --- /dev/null +++ b/resources/profiles/Ginger Additive/machine/Ginger G1 8.0 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "Ginger G1 8.0 nozzle", + "renamed_from":"ginger G1 8.0 nozzle", + "printer_settings_id": "Ginger G1 8.0 nozzle", + "instantiation": "true", + "inherits": "Ginger_G1_common", + "max_layer_height": ["5.0"], + "nozzle_diameter": ["8.0"], + "printer_variant": "8.0", + "printer_model": "ginger G1", + "version": "0.1.0.0" +} diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1.json b/resources/profiles/Ginger Additive/machine/Ginger G1.json new file mode 100644 index 0000000000..a8b81438b6 --- /dev/null +++ b/resources/profiles/Ginger Additive/machine/Ginger G1.json @@ -0,0 +1,11 @@ +{ + "type": "machine_model", + "name": "Ginger G1", + "renamed_from":"ginger G1", + "model_id": "Ginger_G1", + "nozzle_diameter": "1.2;3.0;5.0;8.0", + "machine_tech": "FGF", + "family": "Ginger", + "bed_model": "Ginger_G1.stl", + "default_materials": "Ginger Generic PETG;Ginger Generic PLA" +} diff --git a/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json b/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json new file mode 100644 index 0000000000..3bbb18eea8 --- /dev/null +++ b/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json @@ -0,0 +1,50 @@ +{ + "type": "machine", + "name": "Ginger_G1_common", + "renamed_from":"ginger_one_common", + "printer_settings_id": "Ginger_G1_common", + "from": "system", + "inherits": "fdm_machine_common", + "instantiation": "false", + "is_custom_defined": "0", + "default_filament_profile": ["Ginger Generic PLA"], + "default_print_profile": "1.50mm Standard @Ginger G1", + "deretraction_speed": ["200"], + "extruder_clearance_height_to_lid": "200", + "extruder_clearance_height_to_rod": "100", + "extruder_clearance_radius": "200", + "machine_end_gcode": "END_PRINT", + "machine_max_acceleration_e": ["1000", "5000"], + "machine_max_acceleration_extruding": ["2500", "20000"], + "machine_max_acceleration_retracting": ["2500", "5000"], + "machine_max_acceleration_x": ["2500", "20000"], + "machine_max_acceleration_y": ["2500", "20000"], + "machine_max_jerk_e": ["30", "2.5"], + "machine_max_jerk_x": ["7", "9"], + "machine_max_jerk_y": ["7", "9"], + "machine_max_jerk_z": ["7", "0.4"], + "machine_max_speed_e": ["500", "25"], + "machine_max_speed_x": ["300", "200"], + "machine_max_speed_y": ["300", "200"], + "machine_max_speed_z": ["12", "12"], + "machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] KAMP_LEVELING=1 EXTRUDER_ROTATION_VOLUME={extruder_rotation_volume[0]} MIXING_STEPPER_ROTATION_VOLUME={mixing_stepper_rotation_volume[0]} PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=500 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=10000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer] PRESSURE_ADVANCE=0.2 PRESSURE_ADVANCE_SMOOTH_TIME=0.5 ZONE_1_TEMPERATURE={multi_zone_1_initial_layer[0]} ZONE_2_TEMPERATURE={multi_zone_2_initial_layer[0]} ZONE_3_TEMPERATURE={multi_zone_3_initial_layer[0]}", + "print_host": "G1OS.local", + "printer_model": "Ginger G1", + "retract_before_wipe": ["0%"], + "retract_restart_extra": ["35"], + "retraction_length": ["20"], + "retraction_minimum_travel": ["10"], + "retraction_speed": ["200"], + "support_air_filtration": "0", + "support_chamber_temp_control": "0", + "version": "1.9.0.2", + "wipe_distance": ["10"], + "z_hop": ["1.5"], + "z_hop_types": ["Normal Lift"], + "pellet_modded_printer": "1", + "use_extruder_rotation_volume": "1", + "use_active_pellet_feeding": "1", + "multi_zone": "1", + "multi_zone_number": "3", + "active_feeder_motor_name": ["mixing_stepper"] +} diff --git a/resources/profiles/Ginger Additive/machine/fdm_machine_common.json b/resources/profiles/Ginger Additive/machine/fdm_machine_common.json index a26021c545..d91e06b1c0 100644 --- a/resources/profiles/Ginger Additive/machine/fdm_machine_common.json +++ b/resources/profiles/Ginger Additive/machine/fdm_machine_common.json @@ -67,7 +67,6 @@ "nozzle_type": "undefine", "nozzle_volume": "0", "parking_pos_retraction": "92", - "pellet_modded_printer": "1", "preferred_orientation": "0", "print_host": "http://10.0.1.200/", "print_host_webui": "", @@ -94,7 +93,7 @@ "retract_lift_enforce": ["All Surfaces"], "retract_restart_extra": ["0"], "retract_restart_extra_toolchange": ["0"], - "retract_when_changing_layer": ["1"], + "retract_when_changing_layer": ["0"], "retraction_length": ["0.8"], "retraction_minimum_travel": ["1"], "retraction_speed": ["30"], diff --git a/resources/profiles/Ginger Additive/machine/ginger G1 1.2 nozzle.json b/resources/profiles/Ginger Additive/machine/ginger G1 1.2 nozzle.json deleted file mode 100644 index 76a80a20d4..0000000000 --- a/resources/profiles/Ginger Additive/machine/ginger G1 1.2 nozzle.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "deretraction_speed": ["300"], - "extruder_clearance_height_to_lid": "200", - "extruder_clearance_height_to_rod": "200", - "extruder_clearance_radius": "180", - "from": "system", - "inherits": "ginger_one_common", - "is_custom_defined": "0", - "machine_max_speed_e": ["250", "25"], - "machine_max_speed_x": ["250", "200"], - "machine_max_speed_y": ["250", "200"], - "machine_max_speed_z": ["12", "12"], - "machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] MATERIAL=[filament_type] KAMP_LEVELING=1 PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=300 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=3000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer]", - "max_layer_height": ["1"], - "name": "ginger G1 1.2 nozzle", - "nozzle_diameter": ["1.2"], - "printer_variant": "1.2", - "printer_model": "ginger G1", - "print_host": "192.168.1.97", - "printer_settings_id": "ginger G1 1.2 nozzle", - "retract_before_wipe": ["20%"], - "retract_restart_extra": ["12"], - "retraction_length": ["20"], - "retraction_speed": ["250"], - "support_air_filtration": "0", - "support_chamber_temp_control": "0", - "version": "0.1.0.0", - "wipe_distance": ["20"], - "z_hop": ["0.8"], - "z_hop_types": ["Slope Lift"], - "instantiation": "true" -} diff --git a/resources/profiles/Ginger Additive/machine/ginger G1 3.0 nozzle.json b/resources/profiles/Ginger Additive/machine/ginger G1 3.0 nozzle.json deleted file mode 100644 index 8976a3ce37..0000000000 --- a/resources/profiles/Ginger Additive/machine/ginger G1 3.0 nozzle.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "deretraction_speed": ["250"], - "extruder_clearance_height_to_lid": "200", - "extruder_clearance_height_to_rod": "200", - "extruder_clearance_radius": "180", - "from": "system", - "inherits": "ginger_one_common", - "is_custom_defined": "0", - "machine_max_speed_e": ["300", "25"], - "machine_max_speed_x": ["250", "200"], - "machine_max_speed_y": ["250", "200"], - "machine_max_speed_z": ["12", "12"], - "machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] MATERIAL=[filament_type] KAMP_LEVELING=1 PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=300 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=3000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer]", - "max_layer_height": ["2.2"], - "nozzle_diameter": ["3.0"], - "printer_variant": "3.0", - "printer_model": "ginger G1", - "name": "ginger G1 3.0 nozzle", - "print_host": "192.168.1.39", - "printer_settings_id": "ginger G1 3.0 nozzle", - "retract_before_wipe": ["20%"], - "retract_restart_extra": ["5"], - "retraction_length": ["15"], - "retraction_speed": ["250"], - "support_air_filtration": "0", - "support_chamber_temp_control": "0", - "version": "0.1.0.0", - "wipe_distance": ["15"], - "z_hop": ["1.2"], - "z_hop_types": ["Normal Lift"], - "instantiation": "true" -} diff --git a/resources/profiles/Ginger Additive/machine/ginger G1 5.0 nozzle.json b/resources/profiles/Ginger Additive/machine/ginger G1 5.0 nozzle.json deleted file mode 100644 index 02231c1ad7..0000000000 --- a/resources/profiles/Ginger Additive/machine/ginger G1 5.0 nozzle.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "deretraction_speed": ["300"], - "extruder_clearance_height_to_lid": "200", - "extruder_clearance_height_to_rod": "200", - "extruder_clearance_radius": "180", - "from": "system", - "inherits": "ginger_one_common", - "is_custom_defined": "0", - "machine_max_speed_e": ["300", "25"], - "machine_max_speed_x": ["250", "200"], - "machine_max_speed_y": ["250", "200"], - "machine_max_speed_z": ["12", "12"], - "machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] MATERIAL=[filament_type] KAMP_LEVELING=1 PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=300 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=3000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer]", - "max_layer_height": ["3.5"], - "name": "ginger G1 5.0 nozzle", - "nozzle_diameter": ["5.0"], - "printer_variant": "5.0", - "printer_model": "ginger G1", - "print_host": "192.168.1.97", - "printer_settings_id": "ginger G1 5.0 nozzle", - "retract_before_wipe": ["20%"], - "retract_restart_extra": ["15"], - "retraction_length": ["25"], - "retraction_speed": ["300"], - "support_air_filtration": "0", - "support_chamber_temp_control": "0", - "version": "0.1.0.0", - "wipe_distance": ["20"], - "z_hop": ["2"], - "z_hop_types": ["Normal Lift"], - "instantiation": "true" -} diff --git a/resources/profiles/Ginger Additive/machine/ginger G1 8.0 nozzle.json b/resources/profiles/Ginger Additive/machine/ginger G1 8.0 nozzle.json deleted file mode 100644 index b9a1e9b5d4..0000000000 --- a/resources/profiles/Ginger Additive/machine/ginger G1 8.0 nozzle.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "machine", - "deretraction_speed": ["300"], - "extruder_clearance_height_to_lid": "200", - "extruder_clearance_height_to_rod": "200", - "extruder_clearance_radius": "180", - "from": "system", - "inherits": "ginger_one_common", - "is_custom_defined": "0", - "machine_max_speed_e": ["300", "25"], - "machine_max_speed_x": ["250", "200"], - "machine_max_speed_y": ["250", "200"], - "machine_max_speed_z": ["12", "12"], - "machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] MATERIAL=[filament_type] KAMP_LEVELING=1 PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=300 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=3000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer]", - "max_layer_height": ["6"], - "name": "ginger G1 8.0 nozzle", - "nozzle_diameter": ["8.0"], - "printer_variant": "8.0", - "printer_model": "ginger G1", - "print_host": "192.168.1.39", - "printer_settings_id": "ginger G1 8.0 nozzle", - "retract_before_wipe": ["20%"], - "retract_length_toolchange": ["4"], - "retract_restart_extra": ["30"], - "retraction_length": ["40"], - "retraction_speed": ["300"], - "support_air_filtration": "0", - "support_chamber_temp_control": "0", - "version": "0.1.0.0", - "wipe_distance": ["30"], - "z_hop": ["2"], - "z_hop_types": ["Normal Lift"], - "instantiation": "true" -} diff --git a/resources/profiles/Ginger Additive/machine/ginger G1.json b/resources/profiles/Ginger Additive/machine/ginger G1.json deleted file mode 100644 index e74982b250..0000000000 --- a/resources/profiles/Ginger Additive/machine/ginger G1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "machine_model", - "name": "ginger G1", - "model_id": "Ginger_One", - "nozzle_diameter": "1.2;3.0;5.0;8.0", - "machine_tech": "FFF", - "family": "Ginger", - "bed_model": "Ginger_One.stl", - "bed_texture": "Ginger_One_texture.png", - "default_materials": "Ginger Generic PETG;Ginger Generic PLA;Ginger Generic rPETG;Ginger Generic rPLA" -} diff --git a/resources/profiles/Ginger Additive/machine/ginger_one_common.json b/resources/profiles/Ginger Additive/machine/ginger_one_common.json deleted file mode 100644 index 1917e0c170..0000000000 --- a/resources/profiles/Ginger Additive/machine/ginger_one_common.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "instantiation": "false", - "deretraction_speed": ["60"], - "from": "system", - "inherits": "fdm_machine_common", - "machine_end_gcode": "END_PRINT", - "machine_max_acceleration_e": ["1000", "5000"], - "machine_max_acceleration_extruding": ["2500", "20000"], - "machine_max_acceleration_retracting": ["2500", "5000"], - "machine_max_acceleration_x": ["2500", "20000"], - "machine_max_acceleration_y": ["2500", "20000"], - "machine_max_jerk_e": ["30", "2.5"], - "machine_max_jerk_x": ["7", "9"], - "machine_max_jerk_y": ["7", "9"], - "machine_max_jerk_z": ["7", "0.4"], - "machine_max_speed_e": ["100", "25"], - "machine_max_speed_x": ["350", "200"], - "machine_max_speed_y": ["300", "200"], - "machine_max_speed_z": ["5", "12"], - "machine_start_gcode": "START_PRINT MATERIAL=[filament_type] BED=[bed_temperature_initial_layer]\n", - "name": "ginger_one_common", - "print_host": "192.168.0.167", - "printer_settings_id": "ginger_one_common", - "retract_restart_extra": ["0.5"], - "retraction_length": ["3"], - "retraction_minimum_travel": ["10"], - "retraction_speed": ["60"], - "version": "1.9.0.2", - "wipe_distance": ["10"], - "z_hop": ["0.1"], - "z_hop_types": ["Auto Lift"] -} diff --git a/resources/profiles/Ginger Additive/process/0.60mm Standard.json b/resources/profiles/Ginger Additive/process/0.60mm Standard.json index 8c0030b50e..0b08cb66bb 100644 --- a/resources/profiles/Ginger Additive/process/0.60mm Standard.json +++ b/resources/profiles/Ginger Additive/process/0.60mm Standard.json @@ -2,16 +2,16 @@ "type": "process", "accel_to_decel_enable": "0", "bottom_shell_layers": "0", - "bottom_solid_infill_flow_ratio": "0.98", + "bottom_solid_infill_flow_ratio": "1", "bridge_flow": "0.95", "brim_object_gap": "0.05", "brim_type": "no_brim", "brim_width": "10", "default_acceleration": "2500", "default_jerk": "5", - "elefant_foot_compensation": "0.15", + "elefant_foot_compensation": "0", "exclude_object": "1", - "extra_perimeters_on_overhangs": "1", + "extra_perimeters_on_overhangs": "0", "from": "User", "gap_fill_target": "nowhere", "gap_infill_speed": "100", @@ -20,11 +20,10 @@ "infill_wall_overlap": "30%", "inherits": "fdm_process_common", "initial_layer_acceleration": "1000", - "initial_layer_infill_speed": "70", "initial_layer_jerk": "5", "initial_layer_line_width": "1.26", "initial_layer_print_height": "0.6", - "initial_layer_speed": "50", + "initial_layer_speed": "70", "inner_wall_acceleration": "2500", "inner_wall_jerk": "5", "inner_wall_line_width": "1.26", @@ -45,25 +44,23 @@ "overhang_2_4_speed": "50", "overhang_3_4_speed": "30", "overhang_4_4_speed": "10", - "overhang_reverse": "1", + "overhang_reverse": "0", "overhang_reverse_internal_only": "1", "overhang_reverse_threshold": "0%", "print_settings_id": "0.60mm Standard", "reduce_infill_retraction": "1", - "role_based_wipe_speed": "0", + "role_based_wipe_speed": "1", "skirt_distance": "10", "skirt_loops": "3", "sparse_infill_density": "0%", "sparse_infill_line_width": "1.26", "sparse_infill_pattern": "crosshatch", "sparse_infill_speed": "200", - "spiral_mode_max_xy_smoothing": "1e+07", - "spiral_mode_smooth": "1", "support_line_width": "1.26", "support_speed": "100", "thick_internal_bridges": "0", "top_shell_layers": "0", - "top_solid_infill_flow_ratio": "0.92", + "top_solid_infill_flow_ratio": "1", "top_surface_acceleration": "2500", "top_surface_jerk": "5", "top_surface_line_width": "1.26", @@ -73,8 +70,8 @@ "version": "0.0.0.0", "wipe_on_loops": "1", "wipe_speed": "30", - "xy_contour_compensation": "-0.05", - "xy_hole_compensation": "0.1", + "xy_contour_compensation": "0", + "xy_hole_compensation": "0", "instantiation": "true", - "compatible_printers": ["ginger G1 1.2 nozzle"] + "compatible_printers": ["Ginger G1 1.2 nozzle"] } diff --git a/resources/profiles/Ginger Additive/process/1.50mm Standard.json b/resources/profiles/Ginger Additive/process/1.50mm Standard.json index f3491f0285..9657edc661 100644 --- a/resources/profiles/Ginger Additive/process/1.50mm Standard.json +++ b/resources/profiles/Ginger Additive/process/1.50mm Standard.json @@ -1,16 +1,15 @@ { "type": "process", "accel_to_decel_enable": "0", - "bottom_solid_infill_flow_ratio": "0.8", + "bottom_solid_infill_flow_ratio": "1", "brim_type": "outer_only", "brim_width": "20", "default_acceleration": "2500", "default_jerk": "5", - "elefant_foot_compensation": "0.2", - "enable_overhang_speed": "0", + "elefant_foot_compensation": "0", "ensure_vertical_shell_thickness": "none", "exclude_object": "1", - "extra_perimeters_on_overhangs": "1", + "extra_perimeters_on_overhangs": "0", "from": "User", "gap_fill_target": "nowhere", "gap_infill_speed": "120", @@ -21,7 +20,7 @@ "initial_layer_acceleration": "2500", "initial_layer_jerk": "5", "initial_layer_print_height": "1", - "initial_layer_speed": "40", + "initial_layer_speed": "70", "inner_wall_acceleration": "2500", "inner_wall_jerk": "5", "inner_wall_speed": "120", @@ -32,27 +31,25 @@ "outer_wall_acceleration": "2500", "outer_wall_jerk": "5", "outer_wall_speed": "120", - "overhang_1_4_speed": "20", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "40", - "overhang_4_4_speed": "40", - "overhang_reverse": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "40", + "overhang_3_4_speed": "20", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", "overhang_reverse_internal_only": "1", "overhang_reverse_threshold": "0%", "print_settings_id": "1.50mm Standard", - "role_based_wipe_speed": "0", + "role_based_wipe_speed": "1", "seam_position": "aligned", "skirt_distance": "10", "sparse_infill_density": "10%", "sparse_infill_line_width": "3.2", "sparse_infill_pattern": "crosshatch", "sparse_infill_speed": "120", - "spiral_mode_max_xy_smoothing": "1e+07", - "spiral_mode_smooth": "1", "support_speed": "120", "thick_internal_bridges": "0", "top_shell_layers": "0", - "top_solid_infill_flow_ratio": "0.9", + "top_solid_infill_flow_ratio": "1", "top_surface_acceleration": "2500", "top_surface_jerk": "5", "top_surface_speed": "120", @@ -60,12 +57,12 @@ "travel_jerk": "7", "travel_speed": "250", "version": "0.0.0.0", - "wall_generator": "classic", + "wall_generator": "arachne", "wall_loops": "1", "wipe_on_loops": "1", "wipe_speed": "40", - "xy_contour_compensation": "-0.15", - "xy_hole_compensation": "0.2", + "xy_contour_compensation": "0", + "xy_hole_compensation": "0", "instantiation": "true", - "compatible_printers": ["ginger G1 3.0 nozzle"] + "compatible_printers": ["Ginger G1 3.0 nozzle"] } diff --git a/resources/profiles/Ginger Additive/process/1.80mm Vasemode.json b/resources/profiles/Ginger Additive/process/1.80mm Vasemode.json index e33db41d6a..d081db4351 100644 --- a/resources/profiles/Ginger Additive/process/1.80mm Vasemode.json +++ b/resources/profiles/Ginger Additive/process/1.80mm Vasemode.json @@ -1,16 +1,15 @@ { "type": "process", "accel_to_decel_enable": "0", - "bottom_solid_infill_flow_ratio": "0.8", + "bottom_solid_infill_flow_ratio": "1", "brim_type": "no_brim", "brim_width": "20", "default_acceleration": "2500", "default_jerk": "5", - "elefant_foot_compensation": "0.2", - "enable_overhang_speed": "0", + "elefant_foot_compensation": "0", "ensure_vertical_shell_thickness": "none", "exclude_object": "1", - "extra_perimeters_on_overhangs": "1", + "extra_perimeters_on_overhangs": "0", "from": "User", "gap_fill_target": "nowhere", "gap_infill_speed": "120", @@ -22,7 +21,7 @@ "initial_layer_jerk": "5", "initial_layer_line_width": "4.2", "initial_layer_print_height": "1", - "initial_layer_speed": "40", + "initial_layer_speed": "70", "inner_wall_acceleration": "2500", "inner_wall_jerk": "5", "inner_wall_line_width": "4.2", @@ -44,7 +43,7 @@ "overhang_reverse_internal_only": "1", "overhang_reverse_threshold": "0%", "print_settings_id": "1.80mm Vasemode", - "role_based_wipe_speed": "0", + "role_based_wipe_speed": "1", "seam_position": "aligned", "skirt_distance": "10", "sparse_infill_density": "0%", @@ -52,13 +51,11 @@ "sparse_infill_pattern": "crosshatch", "sparse_infill_speed": "120", "spiral_mode": "1", - "spiral_mode_max_xy_smoothing": "1e+07", - "spiral_mode_smooth": "1", "support_line_width": "4.2", "support_speed": "120", "thick_internal_bridges": "0", "top_shell_layers": "0", - "top_solid_infill_flow_ratio": "0.9", + "top_solid_infill_flow_ratio": "1", "top_surface_acceleration": "2500", "top_surface_jerk": "5", "top_surface_line_width": "4.2", @@ -70,8 +67,8 @@ "wall_loops": "1", "wipe_on_loops": "1", "wipe_speed": "40", - "xy_contour_compensation": "-0.15", - "xy_hole_compensation": "0.2", + "xy_contour_compensation": "0", + "xy_hole_compensation": "0", "instantiation": "true", - "compatible_printers": ["ginger G1 3.0 nozzle"] + "compatible_printers": ["Ginger G1 3.0 nozzle"] } diff --git a/resources/profiles/Ginger Additive/process/2.50mm Standard.json b/resources/profiles/Ginger Additive/process/2.50mm Standard.json index b72b6fb9b6..f43aca97b2 100644 --- a/resources/profiles/Ginger Additive/process/2.50mm Standard.json +++ b/resources/profiles/Ginger Additive/process/2.50mm Standard.json @@ -1,16 +1,15 @@ { "type": "process", "accel_to_decel_enable": "0", - "bottom_solid_infill_flow_ratio": "0.8", + "bottom_solid_infill_flow_ratio": "1", "brim_type": "outer_only", "brim_width": "20", "default_acceleration": "2500", "default_jerk": "5", - "elefant_foot_compensation": "0.2", - "enable_overhang_speed": "0", + "elefant_foot_compensation": "0", "ensure_vertical_shell_thickness": "none", "exclude_object": "1", - "extra_perimeters_on_overhangs": "1", + "extra_perimeters_on_overhangs": "0", "from": "User", "gap_fill_target": "nowhere", "gap_infill_speed": "120", @@ -22,7 +21,7 @@ "initial_layer_jerk": "5", "initial_layer_line_width": "5.5", "initial_layer_print_height": "1", - "initial_layer_speed": "40", + "initial_layer_speed": "70", "inner_wall_acceleration": "2500", "inner_wall_jerk": "5", "inner_wall_line_width": "5.5", @@ -41,24 +40,22 @@ "overhang_2_4_speed": "30", "overhang_3_4_speed": "40", "overhang_4_4_speed": "40", - "overhang_reverse": "1", + "overhang_reverse": "0", "overhang_reverse_internal_only": "1", "overhang_reverse_threshold": "0%", "print_settings_id": "2.50mm Standard", - "role_based_wipe_speed": "0", + "role_based_wipe_speed": "1", "seam_position": "aligned", "skirt_distance": "10", "sparse_infill_density": "10%", "sparse_infill_line_width": "5.5", "sparse_infill_pattern": "crosshatch", "sparse_infill_speed": "120", - "spiral_mode_max_xy_smoothing": "1e+07", - "spiral_mode_smooth": "1", "support_line_width": "5.5", "support_speed": "120", "thick_internal_bridges": "0", "top_shell_layers": "0", - "top_solid_infill_flow_ratio": "0.9", + "top_solid_infill_flow_ratio": "1", "top_surface_acceleration": "2500", "top_surface_jerk": "5", "top_surface_line_width": "5.5", @@ -67,12 +64,12 @@ "travel_jerk": "7", "travel_speed": "250", "version": "0.0.0.0", - "wall_generator": "classic", + "wall_generator": "arachne", "wall_loops": "1", "wipe_on_loops": "1", "wipe_speed": "40", - "xy_contour_compensation": "-0.15", - "xy_hole_compensation": "0.2", + "xy_contour_compensation": "0", + "xy_hole_compensation": "0", "instantiation": "true", - "compatible_printers": ["ginger G1 5.0 nozzle"] + "compatible_printers": ["Ginger G1 5.0 nozzle"] } diff --git a/resources/profiles/Ginger Additive/process/4.00mm Standard.json b/resources/profiles/Ginger Additive/process/4.00mm Standard.json index dd39cdb20f..fe057dc3f1 100644 --- a/resources/profiles/Ginger Additive/process/4.00mm Standard.json +++ b/resources/profiles/Ginger Additive/process/4.00mm Standard.json @@ -5,11 +5,10 @@ "brim_width": "40", "default_acceleration": "2500", "default_jerk": "5", - "elefant_foot_compensation": "0.2", - "enable_overhang_speed": "0", + "elefant_foot_compensation": "0", "ensure_vertical_shell_thickness": "none", "exclude_object": "1", - "extra_perimeters_on_overhangs": "1", + "extra_perimeters_on_overhangs": "0", "from": "User", "gap_fill_target": "nowhere", "gap_infill_speed": "120", @@ -21,7 +20,7 @@ "initial_layer_jerk": "5", "initial_layer_line_width": "9.5", "initial_layer_print_height": "1", - "initial_layer_speed": "40", + "initial_layer_speed": "70", "inner_wall_acceleration": "2500", "inner_wall_jerk": "5", "inner_wall_line_width": "9.5", @@ -40,19 +39,17 @@ "overhang_2_4_speed": "30", "overhang_3_4_speed": "40", "overhang_4_4_speed": "40", - "overhang_reverse": "1", + "overhang_reverse": "0", "overhang_reverse_internal_only": "1", "overhang_reverse_threshold": "0%", "print_settings_id": "4.00mm Standard", - "role_based_wipe_speed": "0", + "role_based_wipe_speed": "1", "seam_position": "aligned", "skirt_distance": "10", "sparse_infill_density": "10%", "sparse_infill_line_width": "9.5", "sparse_infill_pattern": "crosshatch", "sparse_infill_speed": "120", - "spiral_mode_max_xy_smoothing": "1e+07", - "spiral_mode_smooth": "1", "support_line_width": "9.5", "support_speed": "120", "thick_internal_bridges": "0", @@ -65,12 +62,12 @@ "travel_jerk": "7", "travel_speed": "250", "version": "0.0.0.0", - "wall_generator": "classic", + "wall_generator": "arachne", "wall_loops": "1", "wipe_on_loops": "1", "wipe_speed": "40", - "xy_contour_compensation": "-0.15", - "xy_hole_compensation": "0.2", + "xy_contour_compensation": "0", + "xy_hole_compensation": "0", "instantiation": "true", - "compatible_printers": ["ginger G1 8.0 nozzle"] + "compatible_printers": ["Ginger G1 8.0 nozzle"] } diff --git a/resources/profiles/Ginger Additive/process/fdm_process_common.json b/resources/profiles/Ginger Additive/process/fdm_process_common.json index 81075c236f..c8cabdeea2 100644 --- a/resources/profiles/Ginger Additive/process/fdm_process_common.json +++ b/resources/profiles/Ginger Additive/process/fdm_process_common.json @@ -64,12 +64,12 @@ "infill_jerk": "9", "infill_wall_overlap": "15%", "initial_layer_acceleration": "300", - "initial_layer_infill_speed": "60", + "initial_layer_infill_speed": "70", "initial_layer_jerk": "9", "initial_layer_line_width": "3.2", "initial_layer_min_bead_width": "85%", "initial_layer_print_height": "1.5", - "initial_layer_speed": "30", + "initial_layer_speed": "70", "initial_layer_travel_speed": "100%", "inner_wall_acceleration": "10000", "inner_wall_jerk": "9", @@ -153,7 +153,7 @@ "seam_slope_min_length": "20", "seam_slope_start_height": "0", "seam_slope_steps": "10", - "seam_slope_type": "external", + "seam_slope_type": "none", "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", @@ -187,7 +187,7 @@ "sparse_infill_speed": "100", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", - "spiral_mode_smooth": "0", + "spiral_mode_smooth": "1", "staggered_inner_seams": "0", "standby_temperature_delta": "-5", "support_angle": "0",