From 807f407d9f8fd07ccefc308a5f9976f121b9770a Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Fri, 14 Apr 2023 11:31:57 +0200 Subject: [PATCH 1/5] SEM-166 Add extra BOM numbers to UMs3, UMs5 and UMs7 --- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 3 ++- resources/definitions/ultimaker_s7.def.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 61652b23a6..4ddb76c7fe 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -9,7 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "bom_numbers": [213482, 213483], + "bom_numbers": [213482, 213483, 213484], "exclude_materials": [ "generic_hips", "generic_petg", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 44ca7d7018..8bb086a654 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -12,7 +12,8 @@ "bom_numbers": [ 9051, 214475, - 214476 + 214476, + 214477 ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index a996e00f72..a7e9742b40 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -10,7 +10,8 @@ "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s7_platform.obj", "bom_numbers": [ - 5078167 + 5078167, + 5078168 ], "firmware_update_info": { From e606dae5c55e5918b4ca00409d577ed4f7d8c823 Mon Sep 17 00:00:00 2001 From: bryanfoley Date: Fri, 14 Apr 2023 09:33:54 +0000 Subject: [PATCH 2/5] Applied printer-linter format --- resources/definitions/ultimaker_s3.def.json | 6 +++++- resources/definitions/ultimaker_s7.def.json | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 4ddb76c7fe..0cf31c7f66 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -9,7 +9,11 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "bom_numbers": [213482, 213483, 213484], + "bom_numbers": [ + 213482, + 213483, + 213484 + ], "exclude_materials": [ "generic_hips", "generic_petg", diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index a7e9742b40..580b43209b 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -9,10 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s7_platform.obj", - "bom_numbers": [ - 5078167, - 5078168 - ], + "bom_numbers": [5078167, 5078168], "firmware_update_info": { "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], From bed7f22a1b5763679a98fdb04a4c01b802b348e2 Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Fri, 14 Apr 2023 13:32:10 +0200 Subject: [PATCH 3/5] SEM-166 UMs7 firmware location updated With this commit we use the dedicated update url for the UMs7 firmware location instead of the UMs5 location --- resources/definitions/ultimaker_s7.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 580b43209b..16a36eefc2 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -12,7 +12,7 @@ "bom_numbers": [5078167, 5078168], "firmware_update_info": { - "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], + "check_urls": [ "https://software.ultimaker.com/releases/firmware/5078167/stable/um-update.swu.version" ], "id": 5078167, "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" }, From 21de7a366735a282fb459dfff4b517a0a6df84e7 Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Tue, 18 Apr 2023 10:06:46 +0200 Subject: [PATCH 4/5] SEM-166 Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 0cf31c7f66..8892e27676 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -12,7 +12,7 @@ "bom_numbers": [ 213482, 213483, - 213484 + 213484, ], "exclude_materials": [ "generic_hips", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 8bb086a654..26b7e864b2 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -13,7 +13,7 @@ 9051, 214475, 214476, - 214477 + 214477, ], "firmware_update_info": { From 3b538d975c70e7eda7d2a61a013cb6d2adb71f97 Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Tue, 18 Apr 2023 10:12:23 +0200 Subject: [PATCH 5/5] Revert "SEM-166 Apply suggestions from code review" This reverts commit 21de7a366735a282fb459dfff4b517a0a6df84e7. --- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 8892e27676..0cf31c7f66 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -12,7 +12,7 @@ "bom_numbers": [ 213482, 213483, - 213484, + 213484 ], "exclude_materials": [ "generic_hips", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 26b7e864b2..8bb086a654 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -13,7 +13,7 @@ 9051, 214475, 214476, - 214477, + 214477 ], "firmware_update_info": {