diff --git a/resources/profiles/Peopoly.json b/resources/profiles/Peopoly.json index 4b6b1c071a..6d620b6c22 100644 --- a/resources/profiles/Peopoly.json +++ b/resources/profiles/Peopoly.json @@ -1,6 +1,6 @@ { "name": "Peopoly", - "version": "01.06.05.02", + "version": "02.01.00.01", "force_update": "0", "description": "Peopoly configurations", "machine_model_list": [ diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json b/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json index afcd1681f1..7aa8c32971 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json +++ b/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json @@ -19,6 +19,7 @@ ], "compatible_printers": [ "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.6 nozzle" + "Peopoly Magneto X 0.6 nozzle", + "Peopoly Magneto X 0.8 nozzle" ] } diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json b/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json index cf7768621e..141a1d09b4 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json +++ b/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json @@ -32,6 +32,7 @@ "compatible_printers": [ "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.6 nozzle" + "Peopoly Magneto X 0.6 nozzle", + "Peopoly Magneto X 0.8 nozzle" ] } diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic PLA 0.8 nozzle.json b/resources/profiles/Peopoly/filament/Peopoly Generic PLA 0.8 nozzle.json deleted file mode 100644 index 0c705abb76..0000000000 --- a/resources/profiles/Peopoly/filament/Peopoly Generic PLA 0.8 nozzle.json +++ /dev/null @@ -1,37 +0,0 @@ - -{ - "type": "filament", - "filament_id": "GFL99", - "setting_id": "GFSL99", - "name": "Peopoly Generic PLA 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pla", - "filament_max_volumetric_speed": [ - "40" - ], - "filament_flow_ratio": [ - "0.98" - ], - "nozzle_temperature_initial_layer":[ - "215" - ], - "nozzle_temperature":[ - "210" - ], - "hot_plate_temp_initial_layer":["50"], - "hot_plate_temp":["50"], - "fan_max_speed":[ - "70" - ], - "slow_down_layer_time": [ - "8" - ], - "filament_type": [ - "PLA" - ], - "compatible_printers": [ - "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.8 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json b/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json index aad5083918..49640500ae 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json @@ -47,6 +47,7 @@ ], "compatible_printers": [ "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.6 nozzle" + "Peopoly Magneto X 0.6 nozzle", + "Peopoly Magneto X 0.8 nozzle" ] } diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json index a91a6446b0..e16a87e01f 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json @@ -48,6 +48,7 @@ ], "compatible_printers": [ "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.6 nozzle" + "Peopoly Magneto X 0.6 nozzle", + "Peopoly Magneto X 0.8 nozzle" ] } diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json index eef951eb34..40962dbbf3 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json @@ -41,6 +41,7 @@ ], "compatible_printers": [ "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.6 nozzle" + "Peopoly Magneto X 0.6 nozzle", + "Peopoly Magneto X 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json index 8be154342f..3bab85bef5 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json @@ -40,6 +40,7 @@ ], "compatible_printers": [ "Peopoly Magneto X 0.4 nozzle", - "Peopoly Magneto X 0.6 nozzle" + "Peopoly Magneto X 0.6 nozzle", + "Peopoly Magneto X 0.8 nozzle" ] } diff --git a/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.4 nozzle.json b/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.4 nozzle.json index 7fac3be3eb..a8662dd892 100644 --- a/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.4 nozzle.json +++ b/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.4 nozzle.json @@ -1,19 +1,20 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Peopoly Magneto X 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Peopoly Magneto X", - "nozzle_diameter": [ - "0.4" - ], - "printable_area": [ - "0x0", - "300x0", - "300x400", - "0x400" - ], - "printable_height": "300" -} + "type": "machine", + "setting_id": "GM001", + "name": "Peopoly Magneto X 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Peopoly Magneto X", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "300x0", + "300x400", + "0x400" + ], + "printable_height": "300" +} \ No newline at end of file diff --git a/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.6 nozzle.json b/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.6 nozzle.json index 102df164dc..24fa3670dc 100644 --- a/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.6 nozzle.json +++ b/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.6 nozzle.json @@ -7,13 +7,14 @@ "inherits": "fdm_klipper_common", "printer_model": "Peopoly Magneto X", "nozzle_diameter": [ - "0.6" + "0.6" ], + "printer_variant": "0.6", "printable_area": [ - "0x0", - "300x0", - "300x400", - "0x400" + "0x0", + "300x0", + "300x400", + "0x400" ], "printable_height": "300", "max_layer_height": [ @@ -28,6 +29,4 @@ "retraction_length": [ "1" ] - - } \ No newline at end of file diff --git a/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.8 nozzle.json b/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.8 nozzle.json index 6dbaa280f0..40c830b734 100644 --- a/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.8 nozzle.json +++ b/resources/profiles/Peopoly/machine/Peopoly Magneto X 0.8 nozzle.json @@ -7,13 +7,14 @@ "inherits": "fdm_klipper_common", "printer_model": "Peopoly Magneto X", "nozzle_diameter": [ - "0.8" + "0.8" ], + "printer_variant": "0.8", "printable_area": [ - "0x0", - "300x0", - "300x400", - "0x400" + "0x0", + "300x0", + "300x400", + "0x400" ], "printable_height": "300", "max_layer_height": [ @@ -28,6 +29,4 @@ "retraction_length": [ "3" ] - - } \ No newline at end of file diff --git a/resources/profiles/Peopoly/machine/Peopoly Magneto X.json b/resources/profiles/Peopoly/machine/Peopoly Magneto X.json index 5f3c37f586..924c286263 100644 --- a/resources/profiles/Peopoly/machine/Peopoly Magneto X.json +++ b/resources/profiles/Peopoly/machine/Peopoly Magneto X.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Peopoly Magneto X", "model_id": "Peopoly-Magneto-X", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.6;0.8", "machine_tech": "FFF", "family": "Peopoly", "bed_model": "magnetox_model.stl", diff --git a/resources/profiles/Peopoly/process/fdm_process_common.json b/resources/profiles/Peopoly/process/fdm_process_common.json index 9a79d7a2e5..7adffd8fbd 100644 --- a/resources/profiles/Peopoly/process/fdm_process_common.json +++ b/resources/profiles/Peopoly/process/fdm_process_common.json @@ -18,7 +18,7 @@ "line_width": "0.45", "infill_direction": "45", "sparse_infill_density": "15%", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "crosshatch", "initial_layer_line_width": "0.42", "initial_layer_print_height": "0.2", "initial_layer_speed": "20", diff --git a/resources/profiles/Peopoly/process/fdm_process_peopoly_common.json b/resources/profiles/Peopoly/process/fdm_process_peopoly_common.json index 3e264a37aa..bf26d90f2c 100644 --- a/resources/profiles/Peopoly/process/fdm_process_peopoly_common.json +++ b/resources/profiles/Peopoly/process/fdm_process_peopoly_common.json @@ -30,7 +30,7 @@ "line_width": "0.4", "infill_direction": "45", "sparse_infill_density": "15%", - "sparse_infill_pattern": "grid", + "sparse_infill_pattern": "crosshatch", "initial_layer_acceleration": "500", "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", @@ -84,7 +84,7 @@ "tree_support_branch_angle": "45", "tree_support_wall_count": "0", "detect_thin_wall": "0", - "top_surface_pattern": "monotonic", + "top_surface_pattern": "monotonicline", "top_surface_line_width": "0.4", "top_shell_layers": "3", "top_shell_thickness": "0.8",