Skip to content

Commit

Permalink
Cleanup and extention of exclude lists. Protection of PEI flex plate …
Browse files Browse the repository at this point in the history 
…against high probe and first layer temperature.

Relates to PP-441
  • Loading branch information
@pkuiper-ultimaker
pkuiper-ultimaker committed Mar 1, 2024
1 parent c817f11 commit 709e362
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 127 deletions.
4 changes: 2 additions & 2 deletions resources/definitions/ultimaker.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"exclude_materials": [
"generic_hips",
"structur3d_dap100silicone"
"structur3d_*",
"generic_hips"
]
},
"overrides":
Expand Down
29 changes: 13 additions & 16 deletions resources/definitions/ultimaker2.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,20 @@
"file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj",
"exclude_materials": [
"structur3d_*",
"generic_hips",
"generic_petg",
"structur3d_dap100silicone",
"ultimaker_petg_red",
"ultimaker_petg_blue",
"ultimaker_petg_grey",
"ultimaker_petg_black",
"ultimaker_petg_green",
"ultimaker_petg_white",
"ultimaker_petg_orange",
"ultimaker_petg_silver",
"ultimaker_petg_yellow",
"ultimaker_petg_transparent",
"ultimaker_petg_red_translucent",
"ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent"
"generic_cffcpe",
"generic_cffpa",
"generic_gffcpe",
"generic_gffpa",
"generic_pekk",
"generic_pva",
"generic_tough_pla",
"ultimaker_bam",
"ultimaker_pva",
"ultimaker_tough_pla_*",
"ultimaker_petg_*",
"ultimaker_petcf_*"
],
"firmware_file": "MarlinUltimaker2.hex",
"has_machine_quality": true,
Expand Down
39 changes: 8 additions & 31 deletions resources/definitions/ultimaker2_plus.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,20 @@
"file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj",
"exclude_materials": [
"structur3d_*",
"generic_hips",
"generic_petg",
"generic_bam",
"ultimaker_bam",
"generic_pva",
"ultimaker_pva",
"generic_tough_pla",
"ultimaker_tough_pla_black",
"ultimaker_tough_pla_green",
"ultimaker_tough_pla_red",
"ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe",
"generic_cffpa",
"generic_gffcpe",
"generic_gffpa",
"generic_petcf",
"structur3d_dap100silicone",
"ultimaker_petg_red",
"ultimaker_petg_blue",
"ultimaker_petg_grey",
"ultimaker_petg_black",
"ultimaker_petg_green",
"ultimaker_petg_white",
"ultimaker_petg_orange",
"ultimaker_petg_silver",
"ultimaker_petg_yellow",
"ultimaker_petg_transparent",
"ultimaker_petg_red_translucent",
"ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray"
"generic_pva",
"generic_tough_pla",
"ultimaker_bam",
"ultimaker_pva",
"ultimaker_tough_pla_*",
"ultimaker_petg_*",
"ultimaker_petcf_*"
],
"firmware_file": "MarlinUltimaker2plus.hex",
"first_start_actions": [],
Expand Down
18 changes: 9 additions & 9 deletions resources/definitions/ultimaker2_plus_connect.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker2_plus_connect_platform.obj",
"exclude_materials": [
"structur3d_*",
"generic_hips",
"generic_bam",
"ultimaker_bam",
"generic_pva",
"ultimaker_pva",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray",
"generic_petcf",
"generic_cffcpe",
"generic_cffpa",
"generic_gffcpe",
"generic_gffpa",
"structur3d_dap100silicone"
"generic_petcf",
"generic_pva",
"generic_tough_pla",
"ultimaker_bam",
"ultimaker_pva",
"ultimaker_tough_pla_*",
"ultimaker_petg_*",
"ultimaker_petcf_*"
],
"first_start_actions": [],
"has_machine_materials": true,
Expand Down
6 changes: 2 additions & 4 deletions resources/definitions/ultimaker3.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@
9066
],
"exclude_materials": [
"structur3d_*",
"generic_hips",
"generic_cffcpe",
"generic_cffpa",
"generic_gffcpe",
"generic_gffpa",
"generic_petcf",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray",
"structur3d_dap100silicone"
"ultimaker_petcf_*"
],
"firmware_update_info":
{
Expand Down
39 changes: 8 additions & 31 deletions resources/definitions/ultimaker_original.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,20 @@
"file_formats": "text/x-gcode",
"platform": "ultimaker_platform.3mf",
"exclude_materials": [
"structur3d_*",
"generic_hips",
"generic_petg",
"generic_bam",
"ultimaker_bam",
"generic_pva",
"ultimaker_pva",
"generic_tough_pla",
"ultimaker_tough_pla_black",
"ultimaker_tough_pla_green",
"ultimaker_tough_pla_red",
"ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe",
"generic_cffpa",
"generic_gffcpe",
"generic_gffpa",
"generic_petcf",
"structur3d_dap100silicone",
"ultimaker_petg_blue",
"ultimaker_petg_grey",
"ultimaker_petg_black",
"ultimaker_petg_green",
"ultimaker_petg_white",
"ultimaker_petg_orange",
"ultimaker_petg_silver",
"ultimaker_petg_yellow",
"ultimaker_petg_transparent",
"ultimaker_petg_red_translucent",
"ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent",
"ultimaker_petg_red",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray"
"generic_pva",
"generic_tough_pla",
"ultimaker_bam",
"ultimaker_pva",
"ultimaker_tough_pla_*",
"ultimaker_petg_*",
"ultimaker_petcf_*"
],
"firmware_file": "MarlinUltimaker-{baudrate}.hex",
"firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex",
Expand Down
39 changes: 8 additions & 31 deletions resources/definitions/ultimaker_original_dual.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,20 @@
"file_formats": "text/x-gcode",
"platform": "ultimaker_platform.3mf",
"exclude_materials": [
"structur3d_*",
"generic_hips",
"generic_petg",
"generic_bam",
"ultimaker_bam",
"generic_pva",
"ultimaker_pva",
"generic_tough_pla",
"ultimaker_tough_pla_black",
"ultimaker_tough_pla_green",
"ultimaker_tough_pla_red",
"ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe",
"generic_cffpa",
"generic_gffcpe",
"generic_gffpa",
"generic_petcf",
"structur3d_dap100silicone",
"ultimaker_petg_blue",
"ultimaker_petg_grey",
"ultimaker_petg_black",
"ultimaker_petg_green",
"ultimaker_petg_white",
"ultimaker_petg_orange",
"ultimaker_petg_silver",
"ultimaker_petg_yellow",
"ultimaker_petg_transparent",
"ultimaker_petg_red_translucent",
"ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent",
"ultimaker_petg_red",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray"
"generic_pva",
"generic_tough_pla",
"ultimaker_bam",
"ultimaker_pva",
"ultimaker_tough_pla_*",
"ultimaker_petg_*",
"ultimaker_petcf_*"
],
"firmware_file": "MarlinUltimaker-{baudrate}-dual.hex",
"firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex",
Expand Down
4 changes: 2 additions & 2 deletions resources/definitions/ultimaker_s3.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
213484
],
"exclude_materials": [
"generic_hips",
"structur3d_dap100silicone"
"structur3d_*",
"generic_hips"
],
"firmware_update_info":
{
Expand Down
4 changes: 4 additions & 0 deletions resources/definitions/ultimaker_s5.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
214476,
214477
],
"exclude_materials": [
"structur3d_*",
"generic_hips"
],
"firmware_update_info":
{
"check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ],
Expand Down
4 changes: 3 additions & 1 deletion resources/definitions/ultimaker_s7.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
},
"overrides":
{
"machine_name": { "default_value": "Ultimaker S7" }
"default_material_print_temperature": { "maximum_value_warning": "320" },
"machine_name": { "default_value": "Ultimaker S7" },
"material_print_temperature_layer_0": { "maximum_value_warning": "320" }
}
}

0 comments on commit 709e362

Please sign in to comment.