diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json index 19e576cfac..550a299284 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "15", - "filament_density": "1.08", + "filament_cost": [ + "15" + ], + "filament_density": [ + "1.08" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "35", + "filament_max_volumetric_speed": [ + "35" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "110", + "temperature_vitrification": [ + "110" + ], "textured_plate_temp": "90", "textured_plate_temp_initial_layer": "90" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json index dd7de35666..e13303047d 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "29", - "filament_density": "1.15", + "filament_cost": [ + "29" + ], + "filament_density": [ + "1.15" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "35", + "filament_max_volumetric_speed": [ + "35" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "110", + "temperature_vitrification": [ + "110" + ], "textured_plate_temp": "90", "textured_plate_temp_initial_layer": "90" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json index 36ff2fbb47..1f01d8a199 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "50", - "filament_density": "1.24", + "filament_cost": [ + "50" + ], + "filament_density": [ + "1.24" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "2", + "filament_max_volumetric_speed": [ + "2" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "8", "slow_down_min_speed": "5", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "108", + "temperature_vitrification": [ + "108" + ], "textured_plate_temp": "45", "textured_plate_temp_initial_layer": "45" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json index 841dad479b..bf6c54cfee 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "14", - "filament_density": "1.23", + "filament_cost": [ + "14" + ], + "filament_density": [ + "1.23" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "30", + "filament_max_volumetric_speed": [ + "30" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "8", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "80", + "temperature_vitrification": [ + "80" + ], "textured_plate_temp": "70", "textured_plate_temp_initial_layer": "70" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json index acc384e609..2e39361e78 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "20", - "filament_density": "1.24", + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "40", + "filament_max_volumetric_speed": [ + "40" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "60", + "temperature_vitrification": [ + "60" + ], "textured_plate_temp": "45", "textured_plate_temp_initial_layer": "45" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json index d34a28b5cf..20b27c49b1 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "20", - "filament_density": "1.26", + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.26" + ], "filament_deretraction_speed": "30", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "2", + "filament_max_volumetric_speed": [ + "2" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "8", "slow_down_min_speed": "5", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "60", + "temperature_vitrification": [ + "60" + ], "textured_plate_temp": "45", "textured_plate_temp_initial_layer": "45" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json index 627498cf05..c5d24b7e95 100644 --- a/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "15", - "filament_density": "1.08", + "filament_cost": [ + "15" + ], + "filament_density": [ + "1.08" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "60", + "filament_max_volumetric_speed": [ + "60" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "110", + "temperature_vitrification": [ + "110" + ], "textured_plate_temp": "90", "textured_plate_temp_initial_layer": "90" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json index bcc69481f7..b61e939f8a 100644 --- a/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "30", - "filament_density": "1.24", + "filament_cost": [ + "30" + ], + "filament_density": [ + "1.24" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "50", + "filament_max_volumetric_speed": [ + "50" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -94,7 +100,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "20", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "60", + "temperature_vitrification": [ + "60" + ], "textured_plate_temp": "45", "textured_plate_temp_initial_layer": "45" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json index d329523c97..12bd2ad9b2 100644 --- a/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "32", - "filament_density": "1.27", + "filament_cost": [ + "32" + ], + "filament_density": [ + "1.27" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "40", + "filament_max_volumetric_speed": [ + "40" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "60", + "temperature_vitrification": [ + "60" + ], "textured_plate_temp": "45", "textured_plate_temp_initial_layer": "45" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json index 6030654fcc..4cb63f01b5 100644 --- a/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json @@ -30,8 +30,12 @@ "filament_cooling_final_speed": "3.4", "filament_cooling_initial_speed": "2.2", "filament_cooling_moves": "4", - "filament_cost": "22", - "filament_density": "1.25", + "filament_cost": [ + "22" + ], + "filament_density": [ + "1.25" + ], "filament_deretraction_speed": "nil", "filament_diameter": "1.75", "filament_end_gcode": [ @@ -42,7 +46,9 @@ "filament_load_time": "0", "filament_loading_speed": "28", "filament_loading_speed_start": "3", - "filament_max_volumetric_speed": "20", + "filament_max_volumetric_speed": [ + "20" + ], "filament_minimal_purge_on_wipe_tower": "15", "filament_multitool_ramming": "0", "filament_multitool_ramming_flow": "10", @@ -93,7 +99,9 @@ "slow_down_layer_time": "5", "slow_down_min_speed": "10", "support_material_interface_fan_speed": "-1", - "temperature_vitrification": "60", + "temperature_vitrification": [ + "60" + ], "textured_plate_temp": "45", "textured_plate_temp_initial_layer": "45" } \ No newline at end of file diff --git a/resources/profiles/FLSun/filament/FLSun S1 ABS.json b/resources/profiles/FLSun/filament/FLSun S1 ABS.json index ea0c969bc8..057b9d9b27 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ABS.json +++ b/resources/profiles/FLSun/filament/FLSun S1 ABS.json @@ -12,7 +12,9 @@ "fan_min_speed": [ "10" ], - "filament_density": "1.05", + "filament_density": [ + "1.05" + ], "filament_flow_ratio": "0.95", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 ASA.json b/resources/profiles/FLSun/filament/FLSun S1 ASA.json index b9b9a3a271..7cfab298c9 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ASA.json +++ b/resources/profiles/FLSun/filament/FLSun S1 ASA.json @@ -12,7 +12,9 @@ "fan_min_speed": [ "35" ], - "filament_density": "1.05", + "filament_density": [ + "1.05" + ], "filament_flow_ratio": "0.95", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json b/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json index ffcc9752e0..8443d9f0f9 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json @@ -21,7 +21,9 @@ "filament_cost": [ "0" ], - "filament_density": "1.32", + "filament_density": [ + "1.32" + ], "full_fan_speed_layer": [ "3" ], diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json index b77ec25d36..0280200447 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json @@ -21,7 +21,9 @@ "filament_cost": [ "0" ], - "filament_density": "1.32", + "filament_density": [ + "1.32" + ], "full_fan_speed_layer": [ "3" ], diff --git a/resources/profiles/FLSun/filament/FLSun S1 TPU.json b/resources/profiles/FLSun/filament/FLSun S1 TPU.json index d960cfcad7..9ef133ce56 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 TPU.json +++ b/resources/profiles/FLSun/filament/FLSun S1 TPU.json @@ -12,7 +12,9 @@ "fan_min_speed": [ "100" ], - "filament_density": "1.22", + "filament_density": [ + "1.22" + ], "filament_flow_ratio": "1", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 ABS.json b/resources/profiles/FLSun/filament/FLSun T1 ABS.json index d21533ec7b..56c2da7a32 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ABS.json +++ b/resources/profiles/FLSun/filament/FLSun T1 ABS.json @@ -12,7 +12,9 @@ "fan_min_speed": [ "10" ], - "filament_density": "1.05", + "filament_density": [ + "1.05" + ], "filament_flow_ratio": "0.95", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 ASA.json b/resources/profiles/FLSun/filament/FLSun T1 ASA.json index 6dea93df0c..3a9515485c 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ASA.json +++ b/resources/profiles/FLSun/filament/FLSun T1 ASA.json @@ -12,7 +12,9 @@ "fan_min_speed": [ "35" ], - "filament_density": "1.05", + "filament_density": [ + "1.05" + ], "filament_flow_ratio": "0.95", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json b/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json index 3139191b78..69cb18361b 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json @@ -21,7 +21,9 @@ "filament_cost": [ "0" ], - "filament_density": "1.32", + "filament_density": [ + "1.32" + ], "full_fan_speed_layer": [ "3" ], diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json index d7cb573a7e..1777fd0f3f 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json @@ -21,7 +21,9 @@ "filament_cost": [ "0" ], - "filament_density": "1.32", + "filament_density": [ + "1.32" + ], "full_fan_speed_layer": [ "3" ], diff --git a/resources/profiles/FLSun/filament/FLSun T1 TPU.json b/resources/profiles/FLSun/filament/FLSun T1 TPU.json index 1a2ff12ad4..b572a22dc3 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 TPU.json +++ b/resources/profiles/FLSun/filament/FLSun T1 TPU.json @@ -12,7 +12,9 @@ "fan_min_speed": [ "100" ], - "filament_density": "1.22", + "filament_density": [ + "1.22" + ], "filament_flow_ratio": "1", "activate_air_filtration": [ "1" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json index c5f149a55e..7940b7f665 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json @@ -81,24 +81,6 @@ "slow_down_min_speed": [ "5" ], - "initial_layer_print_speed": [ - "15" - ], - "outer_wall_speed": [ - "25" - ], - "inner_wall_speed": [ - "30" - ], - "infill_speed": [ - "30" - ], - "top_surface_speed": [ - "25" - ], - "travel_speed": [ - "150" - ], "enable_pressure_advance": [ "0" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json index 61387aff47..473a27bfa4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json @@ -81,24 +81,6 @@ "slow_down_min_speed": [ "5" ], - "initial_layer_print_speed": [ - "15" - ], - "outer_wall_speed": [ - "25" - ], - "inner_wall_speed": [ - "30" - ], - "infill_speed": [ - "30" - ], - "top_surface_speed": [ - "25" - ], - "travel_speed": [ - "150" - ], "enable_pressure_advance": [ "0" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json index 7d99b714ff..85e6396eed 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json @@ -81,24 +81,6 @@ "slow_down_min_speed": [ "5" ], - "initial_layer_print_speed": [ - "15" - ], - "outer_wall_speed": [ - "25" - ], - "inner_wall_speed": [ - "30" - ], - "infill_speed": [ - "30" - ], - "top_surface_speed": [ - "25" - ], - "travel_speed": [ - "150" - ], "enable_pressure_advance": [ "0" ], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json index d9a2d08a70..b104a94ff6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json @@ -81,24 +81,6 @@ "slow_down_min_speed": [ "5" ], - "initial_layer_print_speed": [ - "15" - ], - "outer_wall_speed": [ - "25" - ], - "inner_wall_speed": [ - "30" - ], - "infill_speed": [ - "30" - ], - "top_surface_speed": [ - "25" - ], - "travel_speed": [ - "150" - ], "enable_pressure_advance": [ "0" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json index 1677db4bea..14474cd48f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json @@ -10,7 +10,9 @@ "Prusa MK4S HF0.4 nozzle" ], "fan_max_speed": "15", - "filament_max_volumetric_speed": "26", + "filament_max_volumetric_speed": [ + "26" + ], "filament_start_gcode": [ "M572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.015{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\nM142 S40 ; set heatbreak target temp" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json index f729679dfd..2edd53ba65 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json @@ -9,5 +9,7 @@ "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" ], - "filament_max_volumetric_speed": "27" + "filament_max_volumetric_speed": [ + "27" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json index df72898b79..de36d2dde7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json @@ -9,5 +9,7 @@ "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" ], - "filament_max_volumetric_speed": "34" + "filament_max_volumetric_speed": [ + "34" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json index 2b829c2368..ea5aaeb167 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json @@ -10,6 +10,8 @@ "Prusa MK4S HF0.8 nozzle" ], "fan_min_speed": "15", - "filament_max_volumetric_speed": "36", + "filament_max_volumetric_speed": [ + "36" + ], "slow_down_layer_time": "25" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json index 42912365b5..f824c48755 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json @@ -15,11 +15,15 @@ ], "default_filament_colour": "#FFF2EC", "fan_max_speed": "10", - "filament_cost": "27.82", + "filament_cost": [ + "27.82" + ], "filament_end_gcode": [ "; Filament-specific end gcode" ], - "filament_max_volumetric_speed": "15", + "filament_max_volumetric_speed": [ + "15" + ], "filament_minimal_purge_on_wipe_tower": "35", "filament_notes": [ "" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json index 827dc9c750..e8f4c4bad6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json @@ -9,7 +9,9 @@ "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" ], - "filament_max_volumetric_speed": "26", + "filament_max_volumetric_speed": [ + "26" + ], "filament_start_gcode": [ "M572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.015{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\nM142 S40 ; set heatbreak target temp" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json index e5a81920ba..324269e696 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json @@ -9,5 +9,7 @@ "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" ], - "filament_max_volumetric_speed": "27" + "filament_max_volumetric_speed": [ + "27" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json index bd11c2da3d..13a4552f04 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json @@ -11,5 +11,7 @@ ], "fan_max_speed": "15", "fan_min_speed": "15", - "filament_max_volumetric_speed": "34" + "filament_max_volumetric_speed": [ + "34" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json index 084021cb4b..0995b117b7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json @@ -11,7 +11,9 @@ ], "fan_max_speed": "15", "fan_min_speed": "15", - "filament_max_volumetric_speed": "36", + "filament_max_volumetric_speed": [ + "36" + ], "nozzle_temperature": "270", "nozzle_temperature_initial_layer": "270", "slow_down_layer_time": "20" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json index f2498f08a7..d24d4d3be0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json @@ -17,12 +17,18 @@ "fan_cooling_layer_time": "20", "fan_max_speed": "12", "fan_min_speed": "12", - "filament_cost": "35.28", - "filament_density": "1.07", + "filament_cost": [ + "35.28" + ], + "filament_density": [ + "1.07" + ], "filament_end_gcode": [ "; Filament-specific end gcode" ], - "filament_max_volumetric_speed": "15", + "filament_max_volumetric_speed": [ + "15" + ], "filament_minimal_purge_on_wipe_tower": "35", "filament_notes": [ "" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json index fcf01bf7f1..56dcd8e0be 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json @@ -10,7 +10,9 @@ "Prusa MK4S 0.6 nozzle" ], "fan_cooling_layer_time": "22", - "filament_max_volumetric_speed": "17", + "filament_max_volumetric_speed": [ + "17" + ], "overhang_fan_speed": "45", "slow_down_layer_time": "10" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json index a5ef8704da..e0ba61d1f9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json @@ -12,7 +12,9 @@ "fan_cooling_layer_time": "25", "fan_max_speed": "45", "fan_min_speed": "25", - "filament_max_volumetric_speed": "22", + "filament_max_volumetric_speed": [ + "22" + ], "filament_retract_before_wipe": "50", "nozzle_temperature": "245", "nozzle_temperature_initial_layer": "240", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json index 1a409ae461..3eb26f12c1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json @@ -9,7 +9,9 @@ "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" ], - "filament_max_volumetric_speed": "24", + "filament_max_volumetric_speed": [ + "24" + ], "filament_start_gcode": [ "M572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.044{elsif nozzle_diameter[0]==0.6}0.035{elsif nozzle_diameter[0]==0.8}0.022{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json index f87800ec7e..5863062486 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json @@ -9,5 +9,7 @@ "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" ], - "filament_max_volumetric_speed": "29" + "filament_max_volumetric_speed": [ + "29" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json index e173dc8343..84bdbbe75b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json @@ -10,7 +10,9 @@ "Prusa MK4S HF0.6 nozzle" ], "fan_cooling_layer_time": "22", - "filament_max_volumetric_speed": "33", + "filament_max_volumetric_speed": [ + "33" + ], "nozzle_temperature": "240", "nozzle_temperature_initial_layer": "230", "overhang_fan_speed": "45", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json index 7e27452c74..6e83bdfde6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json @@ -11,7 +11,9 @@ ], "fan_cooling_layer_time": "25", "fan_max_speed": "45", - "filament_max_volumetric_speed": "37", + "filament_max_volumetric_speed": [ + "37" + ], "filament_retract_before_wipe": "50", "nozzle_temperature_initial_layer": "240", "overhang_fan_speed": "45", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json index 7b8c9abbba..c52297127e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json @@ -14,11 +14,15 @@ ], "default_filament_colour": "#FF8000", "fan_max_speed": "40", - "filament_cost": "27.82", + "filament_cost": [ + "27.82" + ], "filament_end_gcode": [ "; Filament-specific end gcode" ], - "filament_max_volumetric_speed": "12", + "filament_max_volumetric_speed": [ + "12" + ], "filament_minimal_purge_on_wipe_tower": "35", "filament_notes": [ "" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json index c01d14f0e4..12c33e8e8f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json @@ -11,7 +11,9 @@ ], "fan_cooling_layer_time": "25", "fan_min_speed": "80", - "filament_max_volumetric_speed": "19", + "filament_max_volumetric_speed": [ + "19" + ], "nozzle_temperature": "225", "slow_down_layer_time": "15" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json index c8a223da67..d46cf63de2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json @@ -9,7 +9,9 @@ "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" ], - "filament_max_volumetric_speed": "22", + "filament_max_volumetric_speed": [ + "22" + ], "filament_start_gcode": [ "M572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.026{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.015{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json index 9a316582bb..fed50374af 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json @@ -10,6 +10,8 @@ "Prusa MK4S HF0.5 nozzle" ], "fan_cooling_layer_time": "20", - "filament_max_volumetric_speed": "24", + "filament_max_volumetric_speed": [ + "24" + ], "slow_down_layer_time": "8" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json index 199802bda0..77abdbbeb0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json @@ -10,7 +10,9 @@ "Prusa MK4S HF0.6 nozzle" ], "fan_cooling_layer_time": "22", - "filament_max_volumetric_speed": "30", + "filament_max_volumetric_speed": [ + "30" + ], "slow_down_layer_time": "10", "slow_down_min_speed": "15" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json index f46dca6740..3babfa6a6a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json @@ -11,7 +11,9 @@ ], "fan_cooling_layer_time": "25", "fan_min_speed": "80", - "filament_max_volumetric_speed": "35", + "filament_max_volumetric_speed": [ + "35" + ], "slow_down_layer_time": "15", "slow_down_min_speed": "15" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json index 0e0b4fc461..f87e3e0218 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json @@ -15,11 +15,15 @@ "default_filament_colour": "#FF8000", "fan_cooling_layer_time": "17", "fan_min_speed": "70", - "filament_cost": "25.4", + "filament_cost": [ + "25.4" + ], "filament_end_gcode": [ "; Filament-specific end gcode" ], - "filament_max_volumetric_speed": "15", + "filament_max_volumetric_speed": [ + "15" + ], "filament_notes": [ "" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json index 0d8dd68fd4..6928695da2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json @@ -11,7 +11,9 @@ "Prusa MK4S HF0.6 nozzle" ], "fan_cooling_layer_time": "22", - "filament_max_volumetric_speed": "9", + "filament_max_volumetric_speed": [ + "9" + ], "nozzle_temperature": "215", "slow_down_layer_time": "10" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json index f82ae4ef09..8794ac382c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json @@ -12,6 +12,8 @@ ], "fan_cooling_layer_time": "25", "fan_min_speed": "80", - "filament_max_volumetric_speed": "12", + "filament_max_volumetric_speed": [ + "12" + ], "slow_down_layer_time": "15" } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json index 45879e3298..241a5338ca 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json @@ -16,7 +16,9 @@ "Prusa MK4S HF0.4 nozzle", "Prusa MK4S HF0.5 nozzle" ], - "filament_max_volumetric_speed": "7", + "filament_max_volumetric_speed": [ + "7" + ], "filament_start_gcode": [ "M900 K{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.5}0.022{elsif nozzle_diameter[0]==0.6}0.018{elsif nozzle_diameter[0]==0.8}0.012{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.075{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" ], diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json index 06b5327bc3..6468bab2b8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json @@ -10,5 +10,7 @@ "Prusa MK4S 0.6 nozzle", "Prusa MK4S HF0.6 nozzle" ], - "filament_max_volumetric_speed": "6" + "filament_max_volumetric_speed": [ + "6" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json index 451a6e2124..10db81cd56 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json @@ -10,5 +10,7 @@ "Prusa MK4S 0.8 nozzle", "Prusa MK4S HF0.8 nozzle" ], - "filament_max_volumetric_speed": "9" + "filament_max_volumetric_speed": [ + "9" + ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json index 3857234c74..8e7c92351c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json @@ -17,14 +17,20 @@ "default_filament_colour": "#008000", "fan_max_speed": "50", "fan_min_speed": "30", - "filament_cost": "82", - "filament_density": "1.22", + "filament_cost": [ + "82" + ], + "filament_density": [ + "1.22" + ], "filament_deretraction_speed": "20", "filament_end_gcode": [ "; Filament-specific end gcode" ], "filament_flow_ratio": "1.08", - "filament_max_volumetric_speed": "3", + "filament_max_volumetric_speed": [ + "3" + ], "filament_notes": [ "" ], diff --git a/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json b/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json index 8725038cd5..699fa55bf3 100644 --- a/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json +++ b/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json @@ -12,7 +12,9 @@ "fan_cooling_layer_time": "60", "fan_max_speed": "100", "fan_min_speed": "35", - "filament_max_volumetric_speed": "15", + "filament_max_volumetric_speed": [ + "15" + ], "filament_minimal_purge_on_wipe_tower": "15", "full_fan_speed_layer": "0", "nozzle_temperature": "235", diff --git a/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json b/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json index b83deb1f27..9ae7a30b54 100644 --- a/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json +++ b/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json @@ -21,7 +21,9 @@ "filament_flow_ratio": [ "0.98" ], - "filament_max_volumetric_speed": "25", + "filament_max_volumetric_speed": [ + "25" + ], "enable_pressure_advance": [ "1" ], diff --git a/scripts/orca_filament_lib.py b/scripts/orca_filament_lib.py index c85855acf0..2a3cccf727 100644 --- a/scripts/orca_filament_lib.py +++ b/scripts/orca_filament_lib.py @@ -206,6 +206,25 @@ def clean_up_profile(vendor="", profile_type="", force=False): else: del _profile['extruder_clearance_max_radius'] + # Convert filament fields to arrays if not already + if profile_type == 'filament': + fields_to_arrayify = ['filament_cost', 'filament_density', 'filament_type', "temperature_vitrification", "filament_max_volumetric_speed", "filament_vendor"] + for field in fields_to_arrayify: + if field in _profile and not isinstance(_profile[field], list): + original_value = _profile[field] + _profile[field] = [original_value] + print(f"Converted {field} to array in {file}") + need_update = True + + # remove following fields from filament profile + fields_to_remove = ['initial_layer_print_speed', 'outer_wall_speed', 'inner_wall_speed', 'infill_speed', 'top_surface_speed', 'travel_speed'] + for field in fields_to_remove: + if field in _profile: + del _profile[field] + print(f"Removed {field} field from {file}") + need_update = True + + if need_update or force: # write back to file f.seek(0)