Squashing some bugs

This commit is contained in:
cochcoder 2024-09-30 17:26:15 -04:00
parent 78ff7f34b9
commit 48e99dab6a
9 changed files with 419 additions and 37 deletions

View File

@ -55,6 +55,10 @@
{
"name": "Elegoo Neptune 4 Plus",
"sub_path": "machine/Elegoo Neptune 4 Plus.json"
},
{
"name": "Elegoo OrangeStorm Giga",
"sub_path": "machine/Elegoo OrangeStorm Giga.json"
}
],
"process_list": [
@ -74,6 +78,22 @@
"name": "fdm_process_neptune4max_common",
"sub_path": "process/fdm_process_neptune4max_common.json"
},
{
"name": "fdm_process_elegoo_04020",
"sub_path": "process/fdm_process_elegoo_04020.json"
},
{
"name": "fdm_process_elegoo_06030",
"sub_path": "process/fdm_process_elegoo_06030.json"
},
{
"name": "fdm_process_elegoo_08040",
"sub_path": "process/fdm_process_elegoo_08040.json"
},
{
"name": "fdm_process_elegoo_10050",
"sub_path": "process/fdm_process_elegoo_10050.json"
},
{
"name": "0.08mm Extra Fine @Elegoo Neptune",
"sub_path": "process/0.08mm Extra Fine @Elegoo Neptune.json"
@ -673,6 +693,86 @@
{
"name": "0.28mm Extra Draft @Elegoo Neptune4Pro (0.8 nozzle)",
"sub_path": "process/0.28mm Extra Draft @Elegoo Neptune4Pro (0.8 nozzle).json"
},
{
"name": "0.16mm Optimal @Elegoo Giga 0.4 nozzle",
"sub_path": "process/0.16mm Optimal @Elegoo Giga 0.4 nozzle.json"
},
{
"name": "0.18mm Fine @Elegoo Giga 0.6 nozzle",
"sub_path": "process/0.18mm Fine @Elegoo Giga 0.6 nozzle.json"
},
{
"name": "0.20mm Standard @Elegoo Giga 0.4 nozzle",
"sub_path": "process/0.20mm Standard @Elegoo Giga 0.4 nozzle.json"
},
{
"name": "0.20mm Strength @Elegoo Giga 0.4 nozzle",
"sub_path": "process/0.20mm Strength @Elegoo Giga 0.4 nozzle.json"
},
{
"name": "0.24mm Draft @Elegoo Giga 0.4 nozzle",
"sub_path": "process/0.24mm Draft @Elegoo Giga 0.4 nozzle.json"
},
{
"name": "0.24mm Fine @Elegoo Giga 0.8 nozzle",
"sub_path": "process/0.24mm Fine @Elegoo Giga 0.8 nozzle.json"
},
{
"name": "0.24mm Optimal @Elegoo Giga 0.6 nozzle",
"sub_path": "process/0.24mm Optimal @Elegoo Giga 0.6 nozzle.json"
},
{
"name": "0.28mm Extra Draft @Elegoo Giga 0.4 nozzle",
"sub_path": "process/0.28mm Extra Draft @Elegoo Giga 0.4 nozzle.json"
},
{
"name": "0.30mm Fine @Elegoo Giga 1.0 nozzle",
"sub_path": "process/0.30mm Fine @Elegoo Giga 1.0 nozzle.json"
},
{
"name": "0.30mm Standard @Elegoo Giga 0.6 nozzle",
"sub_path": "process/0.30mm Standard @Elegoo Giga 0.6 nozzle.json"
},
{
"name": "0.30mm Strength @Elegoo Giga 0.6 nozzle",
"sub_path": "process/0.30mm Strength @Elegoo Giga 0.6 nozzle.json"
},
{
"name": "0.32mm Optimal @Elegoo Giga 0.8 nozzle",
"sub_path": "process/0.32mm Optimal @Elegoo Giga 0.8 nozzle.json"
},
{
"name": "0.36mm Draft @Elegoo Giga 0.6 nozzle",
"sub_path": "process/0.36mm Draft @Elegoo Giga 0.6 nozzle.json"
},
{
"name": "0.40mm Optimal @Elegoo Giga 1.0 nozzle",
"sub_path": "process/0.40mm Optimal @Elegoo Giga 1.0 nozzle.json"
},
{
"name": "0.40mm Standard @Elegoo Giga 0.8 nozzle",
"sub_path": "process/0.40mm Standard @Elegoo Giga 0.8 nozzle.json"
},
{
"name": "0.42mm Extra Draft @Elegoo Giga 0.6 nozzle",
"sub_path": "process/0.42mm Extra Draft @Elegoo Giga 0.6 nozzle.json"
},
{
"name": "0.48mm Draft @Elegoo Giga 0.8 nozzle",
"sub_path": "process/0.48mm Draft @Elegoo Giga 0.8 nozzle.json"
},
{
"name": "0.50mm Standard @Elegoo Giga 1.0 nozzle",
"sub_path": "process/0.50mm Standard @Elegoo Giga 1.0 nozzle.json"
},
{
"name": "0.56mm Extra Draft @Elegoo Giga 0.8 nozzle",
"sub_path": "process/0.56mm Extra Draft @Elegoo Giga 0.8 nozzle.json"
},
{
"name": "0.60mm Draft @Elegoo Giga 1.0 nozzle",
"sub_path": "process/0.60mm Draft @Elegoo Giga 1.0 nozzle.json"
}
],
"filament_list": [
@ -692,6 +792,10 @@
"name": "fdm_filament_pla",
"sub_path": "filament/fdm_filament_pla.json"
},
{
"name": "fdm_filament_asa",
"sub_path": "filament/fdm_filament_asa.json"
},
{
"name": "Elegoo Generic ABS",
"sub_path": "filament/Elegoo Generic ABS.json"
@ -703,6 +807,34 @@
{
"name": "Elegoo Generic PLA",
"sub_path": "filament/Elegoo Generic PLA.json"
},
{
"name": "Elegoo Generic PLA Matte",
"sub_path": "filament/Elegoo Generic PLA Matte.json"
},
{
"name": "Elegoo Generic ASA",
"sub_path": "filament/Elegoo Generic ASA.json"
},
{
"name": "Elegoo Generic PETG PRO",
"sub_path": "filament/Elegoo Generic PETG PRO.json"
},
{
"name": "Elegoo ASA @Elegoo Giga",
"sub_path": "filament/Elegoo ASA @Elegoo Giga.json"
},
{
"name": "Elegoo PETG PRO @Elegoo Giga",
"sub_path": "filament/Elegoo PETG PRO @Elegoo Giga.json"
},
{
"name": "Elegoo PLA @Elegoo Giga",
"sub_path": "filament/Elegoo PLA @Elegoo Giga.json"
},
{
"name": "Elegoo PLA Matte @Elegoo Giga",
"sub_path": "filament/Elegoo PLA Matte @Elegoo Giga.json"
}
],
"machine_list": [
@ -817,6 +949,22 @@
{
"name": "Elegoo Neptune 4 Pro (0.8 nozzle)",
"sub_path": "machine/Elegoo Neptune 4 Pro (0.8 nozzle).json"
},
{
"name": "Elegoo OrangeStorm Giga 1.0 nozzle",
"sub_path": "machine/Elegoo OrangeStorm Giga 1.0 nozzle.json"
},
{
"name": "Elegoo OrangeStorm Giga 4.0 nozzle",
"sub_path": "machine/Elegoo OrangeStorm Giga 4.0 nozzle.json"
},
{
"name": "Elegoo OrangeStorm Giga 6.0 nozzle",
"sub_path": "machine/Elegoo OrangeStorm Giga 6.0 nozzle.json"
},
{
"name": "Elegoo OrangeStorm Giga 8.0 nozzle",
"sub_path": "machine/Elegoo OrangeStorm Giga 8.0 nozzle.json"
}
]
}

View File

@ -1,7 +1,7 @@
{
"type": "filament",
"name": "Elegoo ASA @Elegoo Giga",
"inherits": "Elegoo ASA @base",
"inherits": "Elegoo Generic ASA",
"from": "system",
"setting_id": "EASAEOSG00",
"instantiation": "true",
@ -21,4 +21,4 @@
"Elegoo OrangeStorm Giga 1.0 nozzle"
]
}

View File

@ -0,0 +1,17 @@
{
"type": "filament",
"name": "Elegoo Generic ASA",
"inherits": "fdm_filament_asa",
"from": "system",
"filament_id": "EASAB00",
"instantiation": "false",
"filament_vendor": [
"Elegoo"
],
"filament_density": [
"1.1"
],
"filament_max_volumetric_speed": [
"12"
]
}

View File

@ -0,0 +1,80 @@
{
"type": "filament",
"name": "Elegoo Generic PETG PRO",
"inherits": "fdm_filament_pet",
"from": "system",
"filament_id": "EPETGPROB00",
"instantiation": "false",
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"40"
],
"fan_min_speed": [
"10"
],
"filament_cost": [
"0"
],
"filament_density": [
"1.25"
],
"filament_max_volumetric_speed": [
"8"
],
"filament_vendor": [
"Elegoo"
],
"hot_plate_temp": [
"70"
],
"hot_plate_temp_initial_layer": [
"70"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_range_low": [
"230"
],
"nozzle_temperature": [
"240"
],
"nozzle_temperature_initial_layer": [
"240"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"slow_down_layer_time": [
"12"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"filament_start_gcode": [
"; Filament start gcode\n"
],
"filament_end_gcode": [
"; filament end gcode \n"
]
}

View File

@ -0,0 +1,20 @@
{
"type": "filament",
"name": "Elegoo Generic PLA Matte",
"inherits": "fdm_filament_pla",
"from": "system",
"filament_id": "EPLAMB00",
"instantiation": "false",
"filament_cost": [
"0"
],
"filament_density": [
"1.25"
],
"filament_vendor": [
"Elegoo"
],
"filament_start_gcode": [
"; filament start gcode\n"
]
}

View File

@ -1,7 +1,7 @@
{
"type": "filament",
"name": "Elegoo PLA @Elegoo Giga",
"inherits": "Elegoo PLA @base",
"inherits": "Elegoo Generic PLA",
"from": "system",
"setting_id": "EPLAEOSG00",
"instantiation": "true",

View File

@ -1,7 +1,7 @@
{
"type": "filament",
"name": "Elegoo PLA Matte @Elegoo Giga",
"inherits": "Elegoo PLA Matte @base",
"inherits": "Elegoo Generic PLA Matte",
"from": "system",
"setting_id": "EPLAMEOSG00",
"instantiation": "true",
@ -38,4 +38,4 @@
"Elegoo OrangeStorm Giga 0.8 nozzle",
"Elegoo OrangeStorm Giga 1.0 nozzle"
]
}
}

View File

@ -0,0 +1,82 @@
{
"type": "filament",
"name": "fdm_filament_asa",
"inherits": "fdm_filament_common",
"from": "system",
"instantiation": "false",
"activate_air_filtration": [
"1"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"eng_plate_temp": [
"90"
],
"eng_plate_temp_initial_layer": [
"90"
],
"fan_cooling_layer_time": [
"35"
],
"fan_max_speed": [
"80"
],
"fan_min_speed": [
"10"
],
"filament_cost": [
"0"
],
"filament_density": [
"1.04"
],
"filament_max_volumetric_speed": [
"16"
],
"filament_type": [
"ASA"
],
"hot_plate_temp": [
"90"
],
"hot_plate_temp_initial_layer": [
"90"
],
"nozzle_temperature": [
"260"
],
"nozzle_temperature_initial_layer": [
"260"
],
"nozzle_temperature_range_high": [
"280"
],
"nozzle_temperature_range_low": [
"240"
],
"overhang_fan_speed": [
"80"
],
"overhang_fan_threshold": [
"25%"
],
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_layer_time": [
"3"
],
"slow_down_min_speed": [
"20"
],
"textured_plate_temp": [
"90"
],
"textured_plate_temp_initial_layer": [
"90"
]
}

View File

@ -1,32 +1,67 @@
{
"type": "filament",
"name": "fdm_filament_pet",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_common",
"cool_plate_temp": ["70"],
"eng_plate_temp": ["70"],
"hot_plate_temp": ["70"],
"textured_plate_temp": ["70"],
"cool_plate_temp_initial_layer": ["70"],
"eng_plate_temp_initial_layer": ["70"],
"hot_plate_temp_initial_layer": ["70"],
"textured_plate_temp_initial_layer": ["70"],
"slow_down_for_layer_cooling": ["1"],
"close_fan_the_first_x_layers": ["3"],
"fan_cooling_layer_time": ["20"],
"filament_max_volumetric_speed": ["8"],
"filament_type": ["PETG"],
"filament_density": ["1.27"],
"filament_cost": ["20"],
"nozzle_temperature_initial_layer": ["240"],
"reduce_fan_stop_start_freq": ["1"],
"fan_max_speed": ["50"],
"fan_min_speed": ["20"],
"overhang_fan_speed": ["100"],
"nozzle_temperature": ["240"],
"temperature_vitrification": ["80"],
"nozzle_temperature_range_low": ["235"],
"nozzle_temperature_range_high": ["240"],
"filament_start_gcode": ["; filament start gcode\n"]
}
{
"type": "filament",
"name": "fdm_filament_pet",
"inherits": "fdm_filament_common",
"from": "system",
"instantiation": "false",
"eng_plate_temp": [
"0"
],
"eng_plate_temp_initial_layer": [
"0"
],
"fan_cooling_layer_time": [
"20"
],
"fan_min_speed": [
"20"
],
"filament_cost": [
"0"
],
"filament_density": [
"1.27"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_type": [
"PETG"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"nozzle_temperature": [
"250"
],
"nozzle_temperature_initial_layer": [
"250"
],
"nozzle_temperature_range_high": [
"260"
],
"nozzle_temperature_range_low": [
"220"
],
"reduce_fan_stop_start_freq": [
"1"
],
"temperature_vitrification": [
"70"
],
"textured_plate_temp": [
"80"
],
"textured_plate_temp_initial_layer": [
"80"
],
"filament_start_gcode": [
"; Filament start gcode\n"
],
"filament_end_gcode": [
"; filament end gcode \n"
]
}