From f1df355721cf2751c816d4b8ef9be010d43be0f7 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 29 Apr 2025 13:51:32 +0200 Subject: [PATCH 1/5] Use `default_value` for string fields NP-935 --- resources/definitions/creality_ender3v3ke.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index 47227e187d..8e04bd0fd7 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -48,12 +48,12 @@ "machine_width": { "default_value": 220 }, "material_print_temp_wait": { "default_value": false }, "retraction_amount": { "default_value": 0.8 }, - "retraction_combing": { "value": "no_outer_surfaces" }, + "retraction_combing": { "default_value": "no_outer_surfaces" }, "retraction_combing_max_distance": { "value": 5.0 }, - "retraction_extrusion_window": { "value": "retraction_amount" }, + "retraction_extrusion_window": { "default_value": "retraction_amount" }, "retraction_min_travel": { "value": 2.0 }, "retraction_speed": { "default_value": 40 }, "speed_layer_0": { "value": 100 }, "speed_print": { "value": 300 } } -} \ No newline at end of file +} From b9977dacf8cc8b6663f272ddd2dc81349cfcb87c Mon Sep 17 00:00:00 2001 From: casperlamboo <6638028+casperlamboo@users.noreply.github.com> Date: Tue, 29 Apr 2025 11:53:08 +0000 Subject: [PATCH 2/5] Apply printer-linter format --- resources/definitions/creality_ender3v3ke.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index 8e04bd0fd7..24c5474f3d 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -56,4 +56,4 @@ "speed_layer_0": { "value": 100 }, "speed_print": { "value": 300 } } -} +} \ No newline at end of file From a2decd198b5ded5ce8b53f5e16ae0dcaeea16b3b Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 29 Apr 2025 14:55:47 +0200 Subject: [PATCH 3/5] Update creality_ender3v3ke.def.json --- resources/definitions/creality_ender3v3ke.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index 24c5474f3d..b0d93e6224 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -48,12 +48,12 @@ "machine_width": { "default_value": 220 }, "material_print_temp_wait": { "default_value": false }, "retraction_amount": { "default_value": 0.8 }, - "retraction_combing": { "default_value": "no_outer_surfaces" }, + "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_combing_max_distance": { "value": 5.0 }, - "retraction_extrusion_window": { "default_value": "retraction_amount" }, + "retraction_extrusion_window": { "value": "retraction_amount" }, "retraction_min_travel": { "value": 2.0 }, "retraction_speed": { "default_value": 40 }, "speed_layer_0": { "value": 100 }, "speed_print": { "value": 300 } } -} \ No newline at end of file +} From 9fcb19c4824bc745dd4fed4646e69698ad2750be Mon Sep 17 00:00:00 2001 From: casperlamboo <6638028+casperlamboo@users.noreply.github.com> Date: Tue, 29 Apr 2025 12:57:28 +0000 Subject: [PATCH 4/5] Apply printer-linter format --- resources/definitions/creality_ender3v3ke.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index b0d93e6224..2718882cc4 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -56,4 +56,4 @@ "speed_layer_0": { "value": 100 }, "speed_print": { "value": 300 } } -} +} \ No newline at end of file From c3e35c385947cb015a9399947b53c17964b9f304 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Fri, 2 May 2025 14:35:39 +0200 Subject: [PATCH 5/5] [SEM-608] Revert the capital M This is not a user-facing name. Only the firmware uses it, and expects a lowercase m --- resources/definitions/ultimaker_s6.def.json | 2 +- resources/definitions/ultimaker_s7.def.json | 2 +- resources/definitions/ultimaker_s8.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s6.def.json b/resources/definitions/ultimaker_s6.def.json index bc0e6a0f4e..2ee99acece 100644 --- a/resources/definitions/ultimaker_s6.def.json +++ b/resources/definitions/ultimaker_s6.def.json @@ -48,6 +48,6 @@ "overrides": { "adhesion_type": { "value": "'brim'" }, - "machine_name": { "default_value": "UltiMaker S6" } + "machine_name": { "default_value": "Ultimaker S6" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 41120c23df..14d9b21168 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -47,7 +47,7 @@ "overrides": { "default_material_print_temperature": { "maximum_value_warning": "320" }, - "machine_name": { "default_value": "UltiMaker S7" }, + "machine_name": { "default_value": "Ultimaker S7" }, "material_print_temperature_layer_0": { "maximum_value_warning": "320" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 8fa2ab8459..5a4d44fa2f 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -385,7 +385,7 @@ "unit": "m/s\u00b3", "value": "20000 if machine_gcode_flavor == 'Cheetah' else 100" }, - "machine_name": { "default_value": "UltiMaker S8" }, + "machine_name": { "default_value": "Ultimaker S8" }, "machine_nozzle_cool_down_speed": { "default_value": 1.3 }, "machine_nozzle_heat_up_speed": { "default_value": 0.6 }, "machine_start_gcode": { "default_value": "M213 U0.1 ;undercut 0.1mm" },