Adjust wall thickness to 1 line if using spiralise

Except for printers that explicitly override it. Fixes #7317.
2025-08-12 07:38:58 +08:00 · 2020-03-24 14:22:28 +01:00 · 2020-03-24 14:22:28 +01:00 · 8e324c594e
commit 8e324c594e
parent 5cdf1adccc
38 changed files with 38 additions and 37 deletions
--- a/resources/definitions/abax_pri3.def.json
+++ b/resources/definitions/abax_pri3.def.json
@ -44,7 +44,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/abax_pri5.def.json
+++ b/resources/definitions/abax_pri5.def.json
@ -44,7 +44,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/abax_titan.def.json
+++ b/resources/definitions/abax_titan.def.json
@ -44,7 +44,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/alfawise_u20.def.json
+++ b/resources/definitions/alfawise_u20.def.json
@ -51,7 +51,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "speed_print": {
            "default_value": 40
--- a/resources/definitions/alfawise_u30.def.json
+++ b/resources/definitions/alfawise_u30.def.json
@ -23,7 +23,7 @@
        },
        "material_diameter": { "default_value": 1.75 },
        "layer_height_0": { "default_value": 0.2 },
-        "wall_thickness": { "default_value": 1.2 },
+        "wall_thickness": { "value": "1.2" },
        "speed_print": { "default_value": 40 },
        "support_enable": { "default_value": true },
        "retraction_enable": { "default_value": true },
--- a/resources/definitions/bq_hephestos.def.json
+++ b/resources/definitions/bq_hephestos.def.json
@ -49,7 +49,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/bq_hephestos_2.def.json
+++ b/resources/definitions/bq_hephestos_2.def.json
@ -26,7 +26,7 @@
        "machine_center_is_zero": { "default_value": false },
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.2 },
-        "wall_thickness": { "default_value": 1.2 },
+        "wall_thickness": { "value": "1.2" },
        "top_bottom_thickness": { "default_value": 1.2 },
        "infill_sparse_density": { "default_value": 20 },
        "speed_print": { "default_value": 60 },
--- a/resources/definitions/bq_hephestos_xl.def.json
+++ b/resources/definitions/bq_hephestos_xl.def.json
@ -48,7 +48,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/bq_witbox.def.json
+++ b/resources/definitions/bq_witbox.def.json
@ -49,7 +49,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/bq_witbox_2.def.json
+++ b/resources/definitions/bq_witbox_2.def.json
@ -48,7 +48,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "top_bottom_thickness": {
            "default_value": 1.2
--- a/resources/definitions/cocoon_create_modelmaker.def.json
+++ b/resources/definitions/cocoon_create_modelmaker.def.json
@ -54,7 +54,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "top_bottom_thickness": {
            "default_value": 0.6
--- a/resources/definitions/creality_cr-x.def.json
+++ b/resources/definitions/creality_cr-x.def.json
@ -41,7 +41,7 @@
        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
        "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" },
        "machine_end_gcode": { "default_value": "M104 S0  ;hotend off\nM140 S0  ;bed off\nG92 E0\nG1 F2000 E-100  ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270  ;move bed for easy part removal\nM84  ;disable steppers" },
-        "wall_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" },
        "top_bottom_thickness": { "default_value": 1 }
    }
 }
--- a/resources/definitions/cubicon_common.def.json
+++ b/resources/definitions/cubicon_common.def.json
@ -46,7 +46,7 @@
        "max_skin_angle_for_expansion": { "default_value": 90 },
        "skin_angles": { "default_value": "[135,45]" },
        "coasting_volume": { "default_value": 0.032 },
-        "wall_thickness": { "default_value": 1.2 },
+        "wall_thickness": { "value": "1.2" },
        "cool_min_layer_time_fan_speed_max": { "default_value": 15 },
        "cool_min_layer_time": { "default_value": 15 },
        "support_interface_pattern": { "default_value": "zigzag" },
--- a/resources/definitions/easyarts_ares.def.json
+++ b/resources/definitions/easyarts_ares.def.json
@ -44,7 +44,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1
+            "value": "1"
        },
        "top_bottom_thickness": {
            "default_value": 1
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -1032,6 +1032,7 @@
                    "description": "The thickness of the walls in the horizontal direction. This value divided by the wall line width defines the number of walls.",
                    "unit": "mm",
                    "default_value": 0.8,
+                    "value": "wall_line_width_0 if magic_spiralize else 0.8",
                    "minimum_value": "0",
                    "minimum_value_warning": "line_width",
                    "maximum_value_warning": "10 * line_width",
--- a/resources/definitions/felixpro2dual.def.json
+++ b/resources/definitions/felixpro2dual.def.json
@ -26,7 +26,7 @@
        "layer_height_0": { "default_value": 0.2 },
        
        "infill_sparse_density": { "default_value": 20 },
-        "wall_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" },
        "top_bottom_thickness": { "default_value": 1 },

        "machine_width": { "default_value": 240 },
--- a/resources/definitions/felixtec4dual.def.json
+++ b/resources/definitions/felixtec4dual.def.json
@ -25,7 +25,7 @@
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.3 },
        "infill_sparse_density": { "default_value": 20 },
-        "wall_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" },
        "top_bottom_thickness": { "default_value": 1 },

        "infill_pattern": { "value": "'tetrahedral'" },
--- a/resources/definitions/gmax15plus.def.json
+++ b/resources/definitions/gmax15plus.def.json
@ -48,7 +48,7 @@
        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home X/Y/Z\nM104 S{material_print_temperature} ; Preheat\nM109 S{material_print_temperature} ; Preheat\nG91 ;relative positioning\nG90 ;absolute positioning\nG1 Z25.0 F9000 ;raise nozzle 25mm\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." },
        "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
-        "wall_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" },
        "top_bottom_thickness": { "default_value": 1 }
    }
 }
--- a/resources/definitions/gmax15plus_dual.def.json
+++ b/resources/definitions/gmax15plus_dual.def.json
@ -46,7 +46,7 @@
        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home X/Y/Z\nM104 S{material_print_temperature} T0 ; Preheat Left Extruder\nM104 S{material_print_temperature} T1 ; Preheat Right Extruder\nM109 S{material_print_temperature} T0 ; Preheat Left Extruder\nM109 S{material_print_temperature} T1 ; Preheat Right Extruder\nG91 ;relative positioning\nG90 ;absolute positioning\nM218 T1 X34.3 Y0; Set 2nd extruder offset. This can be changed later if needed\nG1 Z25.0 F9000 ;raise nozzle 25mm\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." },
        "machine_end_gcode": { "default_value": "M104 S0 T0;Left extruder off\nM104 S0 T1; Right extruder off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
-        "wall_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" },
        "top_bottom_thickness": { "default_value": 1 }
    }
 }
--- a/resources/definitions/helloBEEprusa.def.json
+++ b/resources/definitions/helloBEEprusa.def.json
@ -28,7 +28,7 @@
        "machine_center_is_zero": { "default_value": false },
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.2 },
-        "wall_thickness": { "default_value": 1.2 },
+        "wall_thickness": { "value": "1.2" },
        "top_bottom_thickness": { "default_value": 1.2 },
        "infill_sparse_density": { "default_value": 20 },
        "speed_print": { "default_value": 60 },
--- a/resources/definitions/innovo_inventor.def.json
+++ b/resources/definitions/innovo_inventor.def.json
@ -56,7 +56,7 @@
            "default_value": 0.15
        },
        "wall_thickness": {
-            "default_value": 0.8
+            "value": "0.8"
        },
        "top_bottom_thickness": {
            "default_value": 1.2
--- a/resources/definitions/jgaurora_a1.def.json
+++ b/resources/definitions/jgaurora_a1.def.json
@ -51,7 +51,7 @@
            "default_value": 0.12
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "speed_print": {
            "default_value": 40
--- a/resources/definitions/jgaurora_a3s.def.json
+++ b/resources/definitions/jgaurora_a3s.def.json
@ -51,7 +51,7 @@
            "default_value": 0.12
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "speed_print": {
            "default_value": 35
--- a/resources/definitions/jgaurora_a5.def.json
+++ b/resources/definitions/jgaurora_a5.def.json
@ -53,7 +53,7 @@
            "default_value": 0.12
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "speed_print": {
            "default_value": 40
--- a/resources/definitions/jgaurora_jgmaker_magic.def.json
+++ b/resources/definitions/jgaurora_jgmaker_magic.def.json
@ -51,7 +51,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "speed_print": {
            "default_value": 60
--- a/resources/definitions/jgaurora_z_603s.def.json
+++ b/resources/definitions/jgaurora_z_603s.def.json
@ -51,7 +51,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "speed_print": {
            "default_value": 60
--- a/resources/definitions/makeit_pro_l.def.json
+++ b/resources/definitions/makeit_pro_l.def.json
@ -81,7 +81,7 @@
          "default_value": 60
        },
        "wall_thickness": {
-          "default_value": 1.2
+          "value": "1.2"
        },
        "cool_min_layer_time_fan_speed_max": {
          "default_value": 5
--- a/resources/definitions/makeit_pro_m.def.json
+++ b/resources/definitions/makeit_pro_m.def.json
@ -81,7 +81,7 @@
          "default_value": 60
        },
        "wall_thickness": {
-          "default_value": 1.2
+          "value": "1.2"
        },
        "cool_min_layer_time_fan_speed_max": {
          "default_value": 5
--- a/resources/definitions/makeit_pro_mx.def.json
+++ b/resources/definitions/makeit_pro_mx.def.json
@ -81,7 +81,7 @@
          "default_value": 60
        },
        "wall_thickness": {
-          "default_value": 1.2
+          "value": "1.2"
        },
        "cool_min_layer_time_fan_speed_max": {
          "default_value": 5
--- a/resources/definitions/mankati_fullscale_xt_plus.def.json
+++ b/resources/definitions/mankati_fullscale_xt_plus.def.json
@ -39,7 +39,7 @@
        },

        "layer_height": { "default_value": 0.2 },
-        "wall_thickness": { "default_value": 0.8 },
+        "wall_thickness": { "value": "0.8" },
        "top_bottom_thickness": { "default_value": 0.3 },
        "retraction_enable": { "default_value": true },
        "retraction_speed": { "default_value": 50 },
--- a/resources/definitions/peopoly_moai.def.json
+++ b/resources/definitions/peopoly_moai.def.json
@ -189,7 +189,7 @@
            "value": "machine_nozzle_size / 3"
        },
        "wall_thickness": {
-            "value": 0.5
+            "value": "0.5"
        },
        "infill_sparse_density": {
            "value": 70
--- a/resources/definitions/rigidbot.def.json
+++ b/resources/definitions/rigidbot.def.json
@ -44,7 +44,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 0.8
+            "value": "0.8"
        },
        "top_bottom_thickness": {
            "default_value": 0.3
--- a/resources/definitions/rigidbot_big.def.json
+++ b/resources/definitions/rigidbot_big.def.json
@ -44,7 +44,7 @@
            "default_value": 0.2
        },
        "wall_thickness": {
-            "default_value": 0.8
+            "value": "0.8"
        },
        "top_bottom_thickness": {
            "default_value": 0.3
--- a/resources/definitions/robo_3d_r1.def.json
+++ b/resources/definitions/robo_3d_r1.def.json
@ -31,7 +31,7 @@
        "layer_height_0": { "default_value": 0.15 },
        "material_flow": { "default_value": 100 },
        "infill_sparse_density": { "default_value": 10 },
-        "wall_thickness": { "default_value": 1.2 },
+        "wall_thickness": { "value": "1.2" },
        "retraction_amount": { "default_value": 3 },
        "layer_height": { "default_value": 0.2 },
        "speed_print": { "default_value": 40 },
--- a/resources/definitions/skriware_2.def.json
+++ b/resources/definitions/skriware_2.def.json
@ -322,7 +322,7 @@
            "default_value": 2
        },
        "wall_thickness": {
-            "default_value": 1.2
+            "value": "1.2"
        },
        "support_infill_sparse_thickness": {
            "value": "resolveOrValue('layer_height')"
--- a/resources/definitions/tam.def.json
+++ b/resources/definitions/tam.def.json
@ -21,7 +21,7 @@
        "layer_height": { "default_value": 0.2 },
        "layer_height_0": { "default_value": 0.3 },
        "infill_sparse_density": { "default_value": 5 },
-        "wall_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" },
        "top_bottom_thickness": { "default_value": 1 },

        "infill_pattern": { "value": "'tetrahedral'" },
--- a/resources/definitions/vertex_delta_k8800.def.json
+++ b/resources/definitions/vertex_delta_k8800.def.json
@ -49,7 +49,7 @@
        "value": 0.35
    },
    "wall_thickness": {
-        "value": 0.7
+        "value": "0.7"
    },
    "top_bottom_thickness": {
        "value": 0.6
--- a/resources/definitions/vertex_nano_k8600.def.json
+++ b/resources/definitions/vertex_nano_k8600.def.json
@ -47,7 +47,7 @@
            "value": 0.35
        },
        "wall_thickness": {
-            "value": 0.7
+            "value": "0.7"
        },
        "top_bottom_thickness": {
            "value": 0.6