From 107d23e9e54338c5fc0f454168528807ac0c8256 Mon Sep 17 00:00:00 2001 From: Sophist <3001893+Sophist-UK@users.noreply.github.com> Date: Fri, 10 Jul 2020 22:45:19 +0200 Subject: [PATCH 1/4] Include additional machine defaults for Dagoma DiscoEasy / DiscoUltimate Values taken from [Dagoma Marlin source code](https://github.com/dagoma3d/Marlin-By-Dagoma/blob/Dagoma-Development/LinuxAddons/Dagoma/conf/serie/E200/Base). --- resources/definitions/dagoma_disco.def.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index a62948c9a7..ad0b346c43 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -57,6 +57,22 @@ }, "top_bottom_thickness": { "default_value": 1 - } + }, + "machine_max_feedrate_x": { "default_value": 500 }, + "machine_max_feedrate_y": { "default_value": 500 }, + "machine_max_feedrate_z": { "default_value": 4 }, + "machine_max_feedrate_e": { "default_value": 170 }, + "machine_max_acceleration_x": { "value": 3000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "machine_max_acceleration_z": { "value": 20 }, + "machine_max_acceleration_e": { "value": 10000 }, + "machine_acceleration": { "value": 3000 }, + "machine_max_jerk_xy": { "value": 20 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 2560 }, + "machine_steps_per_mm_e": { "default_value": 98 } } } From e921c4ae3d19e2cda1a18cf06320123feb896d14 Mon Sep 17 00:00:00 2001 From: Sophist <3001893+Sophist-UK@users.noreply.github.com> Date: Fri, 10 Jul 2020 22:47:37 +0200 Subject: [PATCH 2/4] Tweak indentation --- resources/definitions/dagoma_disco.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index ad0b346c43..dc1f4cee83 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -70,9 +70,9 @@ "machine_max_jerk_xy": { "value": 20 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, - "machine_steps_per_mm_x": { "default_value": 80 }, - "machine_steps_per_mm_y": { "default_value": 80 }, - "machine_steps_per_mm_z": { "default_value": 2560 }, - "machine_steps_per_mm_e": { "default_value": 98 } + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 2560 }, + "machine_steps_per_mm_e": { "default_value": 98 } } } From d16b13d20d928fbb4fea51fb21cccec26e8c9126 Mon Sep 17 00:00:00 2001 From: Sophist <3001893+Sophist-UK@users.noreply.github.com> Date: Fri, 10 Jul 2020 22:48:51 +0200 Subject: [PATCH 3/4] Tweak indentation again --- resources/definitions/dagoma_disco.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index dc1f4cee83..5d6e0fb999 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -70,9 +70,9 @@ "machine_max_jerk_xy": { "value": 20 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, - "machine_steps_per_mm_x": { "default_value": 80 }, - "machine_steps_per_mm_y": { "default_value": 80 }, - "machine_steps_per_mm_z": { "default_value": 2560 }, - "machine_steps_per_mm_e": { "default_value": 98 } + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 2560 }, + "machine_steps_per_mm_e": { "default_value": 98 } } } From a908928c8932f8cf493db6c72870821ad9108522 Mon Sep 17 00:00:00 2001 From: Sophist <3001893+Sophist-UK@users.noreply.github.com> Date: Fri, 10 Jul 2020 22:50:19 +0200 Subject: [PATCH 4/4] Tweak indentation yet again Let's hope I have it right this time! --- resources/definitions/dagoma_disco.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index 5d6e0fb999..bf098b8b4a 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -70,9 +70,9 @@ "machine_max_jerk_xy": { "value": 20 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, - "machine_steps_per_mm_x": { "default_value": 80 }, - "machine_steps_per_mm_y": { "default_value": 80 }, - "machine_steps_per_mm_z": { "default_value": 2560 }, - "machine_steps_per_mm_e": { "default_value": 98 } + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 2560 }, + "machine_steps_per_mm_e": { "default_value": 98 } } }