Merge remote-tracking branch 'origin/mastercaution/elegoo_neptune_4_s…

…eries' into definitions/neptune4pro
Ultimaker · Oct 8, 2023 · 2d3219f · 2d3219f
2 parents 1d0784f + 59c5856
commit 2d3219f
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 6 deletions.
diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json
@@ -9,7 +9,6 @@
     },
     "overrides":
     {
-        "acceleration_enabled": { "value": true },
         "acceleration_layer_0": { "value": 3000 },
         "acceleration_print": { "value": 3000 },
         "acceleration_travel": { "value": 5000 },
@@ -47,11 +46,7 @@
         "retraction_amount": { "default_value": 0.5 },
         "retraction_count_max": { "value": 80 },
         "retraction_speed": { "default_value": 45 },
-        "skirt_brim_speed":
-        {
-            "maximum_value_warning": "500",
-            "value": "speed_print_layer_0"
-        },
+        "skirt_brim_speed": { "maximum_value_warning": "500" },
         "speed_infill":
         {
             "maximum_value_warning": "500",

diff --git a/...oo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg b/...oo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg
diff --git a/...oo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg b/...oo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg
diff --git a/...oo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg b/...oo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg
diff --git a/...oo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg b/...oo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg
diff --git a/...oo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg b/...oo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg
diff --git a/...oo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg b/...oo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg
diff --git a/...oo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg b/...oo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg
diff --git a/...oo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg b/...oo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg
diff --git a/...o_n4_petg_nozzle_0.40_layer_0.10.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.10.inst.cfg b/...o_n4_petg_nozzle_0.40_layer_0.10.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.10.inst.cfg
diff --git a/...o_n4_petg_nozzle_0.40_layer_0.15.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.15.inst.cfg b/...o_n4_petg_nozzle_0.40_layer_0.15.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.15.inst.cfg
diff --git a/...o_n4_petg_nozzle_0.40_layer_0.20.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.20.inst.cfg b/...o_n4_petg_nozzle_0.40_layer_0.20.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.20.inst.cfg
diff --git a/...o_n4_petg_nozzle_0.40_layer_0.30.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.30.inst.cfg b/...o_n4_petg_nozzle_0.40_layer_0.30.inst.cfg → ...o_n4_petg_nozzle_0.40_layer_0.30.inst.cfg
diff --git a/...oo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg b/...oo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg
diff --git a/...oo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg b/...oo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg
diff --git a/...oo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg b/...oo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg
diff --git a/...oo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg b/...oo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg
diff --git a/...oo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg b/...oo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg
diff --git a/...oo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg b/...oo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg
diff --git a/...oo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg b/...oo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg
diff --git a/...oo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg b/...oo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg → ...oo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg