修改机器名称不对的问题

2025-09-23 13:03:16 +08:00 · 2021-05-13 14:25:35 +08:00 · 2021-05-13 14:25:35 +08:00 · 77a2666744
commit 77a2666744
parent e8567ae9e2
50 changed files with 147 additions and 72 deletions
--- a/resources/definitions/goofoo_base.def.json
+++ b/resources/definitions/goofoo_base.def.json
@ -25,9 +25,6 @@
        
    },
    "overrides": {
-        "machine_name": { "default_value": "Goofoo Base Printer" },
-
-        

        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },

--- a/resources/definitions/goofoo_e-one.def.json
+++ b/resources/definitions/goofoo_e-one.def.json
@ -1,15 +1,14 @@
 {
-    "name": "goofoo_E-one",
+    "name": "Goofoo E-one",
    "version": 2,
    "inherits": "goofoo_open",
    "overrides": {
-        "machine_name": { "default_value": "e-one" },
+        "machine_name": { "default_value": "Goofoo E-one" },
        "machine_width": { "default_value": 300 },
        "machine_depth": { "default_value": 300 },
        "machine_height": { "default_value": 380 }
    },
    "metadata": {
-        "author": "goofoo",
        "visible": true,
        "exclude_materials": [
            "goofoo_bronze_pla",
--- a/resources/definitions/goofoo_far.def.json
+++ b/resources/definitions/goofoo_far.def.json
@ -1,9 +1,8 @@
 {
-    "name": "goofoo_far",
+    "name": "Goofoo Far",
    "version": 2,
    "inherits": "goofoo_base",
    "metadata": {
-        "author": "goofoo",
        "quality_definition": "goofoo_far",
        "visible": false,
        "exclude_materials": [
--- a/resources/definitions/goofoo_gemini.def.json
+++ b/resources/definitions/goofoo_gemini.def.json
@ -1,9 +1,9 @@
 {
-    "name": "goofoo_Gemini",
+    "name": "Goofoo Gemini",
    "version": 2,
    "inherits": "goofoo_far",
    "overrides": {
-        "machine_name": { "default_value": "gemini" },
+        "machine_name": { "default_value": "Goofoo Gemini" },
        "machine_width": { "default_value": 360 },
        "machine_depth": { "default_value": 250 },
        "machine_height": { "default_value": 200 },
@ -13,7 +13,6 @@
        }
    },
    "metadata": {
-        "author": "goofoo",
        "machine_extruder_trains": {
            "0": "goofoo_gemini_1st",
            "1": "goofoo_gemini_2st"
--- a/resources/definitions/goofoo_giant.def.json
+++ b/resources/definitions/goofoo_giant.def.json
@ -1,16 +1,15 @@
 {
-    "name": "goofoo_Giant",
+    "name": "Goofoo Giant",
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "giant" },
+        "machine_name": { "default_value": "Goofoo Giant" },
        "machine_width": { "default_value": 600 },
        "machine_depth": { "default_value": 600 },
        "machine_height": { "default_value": 1000 }

    },
    "metadata": {
-        "author": "goofoo",
        "visible": true
    }
 }
--- a/resources/definitions/goofoo_max.def.json
+++ b/resources/definitions/goofoo_max.def.json
@ -1,9 +1,9 @@
 {
-    "name": "goofoo_Max",
+    "name": "Goofoo Max",
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "max" },
+        "machine_name": { "default_value": "Goofoo Max" },
        "machine_width": { "default_value": 600 },
        "machine_depth": { "default_value": 580 },
        "machine_height": { "default_value": 700 },
--- a/resources/definitions/goofoo_mido.def.json
+++ b/resources/definitions/goofoo_mido.def.json
@ -1,16 +1,15 @@
 {
-    "name": "goofoo_Mido",
+    "name": "Goofoo Mido",
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "mido" },
+        "machine_name": { "default_value": "Goofoo Mido" },
        "machine_width": { "default_value": 200 },
        "machine_depth": { "default_value": 200 },
        "machine_height": { "default_value": 200 }

    },
    "metadata": {
-        "author": "goofoo",
        "visible": true
    }
 }
--- a/resources/definitions/goofoo_miniplus.def.json
+++ b/resources/definitions/goofoo_miniplus.def.json
@ -1,16 +1,15 @@
 {
-    "name": "goofoo_Mini+",
+    "name": "Goofoo Mini+",
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "miniadd" },
+        "machine_name": { "default_value": "Goofoo Mini+" },
        "machine_width": { "default_value": 200 },
        "machine_depth": { "default_value": 200 },
        "machine_height": { "default_value": 150 }

    },
    "metadata": {
-        "author": "goofoo",
        "visible": true
    }
 }
--- a/resources/definitions/goofoo_near.def.json
+++ b/resources/definitions/goofoo_near.def.json
@ -1,9 +1,8 @@
 {
-    "name": "goofoo_near",
+    "name": "Goofoo Near",
    "version": 2,
    "inherits": "goofoo_base",
    "metadata": {
-        "author": "goofoo",
        "quality_definition": "goofoo_near",
        "visible": false
    }
--- a/resources/definitions/goofoo_nova.def.json
+++ b/resources/definitions/goofoo_nova.def.json
@ -1,9 +1,9 @@
 {
-    "name": "goofoo_Nova",
+    "name": "Goofoo Nova",
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "nova" },
+        "machine_name": { "default_value": "Goofoo Nova" },
        "machine_width": { "default_value": 280 },
        "machine_depth": { "default_value": 280 },
        "machine_height": { "default_value": 300 }
--- a/resources/definitions/goofoo_open.def.json
+++ b/resources/definitions/goofoo_open.def.json
@ -1,9 +1,8 @@
 {
-    "name": "goofoo_open",
+    "name": "Goofoo Open",
    "version": 2,
    "inherits": "goofoo_base",
    "metadata": {
-        "author": "goofoo",
        "quality_definition": "goofoo_open",
        "visible": false,
        "exclude_materials": [
--- a/resources/definitions/goofoo_plus.def.json
+++ b/resources/definitions/goofoo_plus.def.json
@ -1,16 +1,15 @@
 {
-    "name": "goofoo_Plus",
+    "name": "Goofoo Plus",
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "plus" },
+        "machine_name": { "default_value": "Goofoo Plus" },
        "machine_width": { "default_value": 360 },
        "machine_depth": { "default_value": 360 },
        "machine_height": { "default_value": 400 }

    },
    "metadata": {
-        "author": "goofoo",
        "visible": true
    }
 }
--- a/resources/definitions/goofoo_small.def.json
+++ b/resources/definitions/goofoo_small.def.json
@ -1,10 +1,8 @@
 {
-    "注释":"用于tiny,tiny+",
-    "name": "goofoo_small",
+    "name": "Goofoo Small",
    "version": 2,
    "inherits": "goofoo_base",
    "metadata": {
-        "author": "goofoo",
        "quality_definition": "goofoo_small",
        "visible": false,
        "exclude_materials": [
--- a/resources/definitions/goofoo_t-one.def.json
+++ b/resources/definitions/goofoo_t-one.def.json
@ -1,9 +1,9 @@
 {
-    "name": "goofoo_T-one",
+    "name": "Goofoo T-one",
    "version": 2,
    "inherits": "goofoo_far",
    "overrides": {
-        "machine_name": { "default_value": "t-one" },
+        "machine_name": { "default_value": "Goofoo T-one" },
        "machine_width": { "default_value": 200 },
        "machine_depth": { "default_value": 200 },
        "machine_height": { "default_value": 150 },
@ -12,7 +12,6 @@
        }
    },
    "metadata": {
-        "author": "goofoo",
        "machine_extruder_trains": {
            "0": "goofoo_tone_1st",
            "1": "goofoo_tone_2st"
--- a/resources/definitions/goofoo_tiny.def.json
+++ b/resources/definitions/goofoo_tiny.def.json
@ -1,9 +1,9 @@
 {
-    "name": "goofoo_Tiny",
+    "name": "Goofoo Tiny",
    "version": 2,
    "inherits": "goofoo_small",
    "overrides": {
-        "machine_name": { "default_value": "tiny" },
+        "machine_name": { "default_value": "Goofoo Tiny" },
        "machine_width": { "default_value": 100 },
        "machine_depth": { "default_value": 100 },
        "machine_height": { "default_value": 100 },
@ -11,8 +11,6 @@
        "raft_margin": { "default_value": 5 }
    },
    "metadata": {
-        "author": "goofoo",
-        
        "visible": true
    }
 }
--- a/resources/definitions/goofoo_tinyplus.def.json
+++ b/resources/definitions/goofoo_tinyplus.def.json
@ -1,9 +1,9 @@
 {
-    "name": "goofoo_Tiny+",
+    "name": "Goofoo Tiny+",
    "version": 2,
    "inherits": "goofoo_small",
    "overrides": {
-        "machine_name": { "default_value": "tinyadd" },
+        "machine_name": { "default_value": "Goofoo Tiny+" },
        "machine_width": { "default_value": 120 },
        "machine_depth": { "default_value": 120 },
        "machine_height": { "default_value": 180 },
@ -11,7 +11,6 @@
        "machine_heated_bed": { "default_value": false }
    },
    "metadata": {
-        "author": "goofoo",
        "visible": true
    }
 }
--- a/resources/definitions/renkforce_basic3.def.json
+++ b/resources/definitions/renkforce_basic3.def.json
@ -3,7 +3,7 @@
    "version": 2,
    "inherits": "goofoo_small",
    "overrides": {
-        "machine_name": { "default_value": "Basic 3" },
+        "machine_name": { "default_value": "Renkforce Basic 3" },
        "machine_width": { "default_value": 120 },
        "machine_depth": { "default_value": 120 },
        "machine_height": { "default_value": 180 },
--- a/resources/definitions/renkforce_pro3.def.json
+++ b/resources/definitions/renkforce_pro3.def.json
@ -3,7 +3,7 @@
    "version": 2,
    "inherits": "goofoo_near",
    "overrides": {
-        "machine_name": { "default_value": "Pro 3" },
+        "machine_name": { "default_value": "Renkforce Pro 3" },
        "machine_width": { "default_value": 200 },
        "machine_depth": { "default_value": 200 },
        "machine_height": { "default_value": 150 }
--- a/resources/definitions/renkforce_pro6.def.json
+++ b/resources/definitions/renkforce_pro6.def.json
@ -0,0 +1,17 @@
+{
+    "name": "Renkforce Pro 6",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Renkforce Pro 6" },
+        "machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 200 }
+
+    },
+    "metadata": {
+        "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)",
+        "manufacturer": "Renkforce",
+        "visible": true
+    }
+}
--- a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*8
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*12
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg
+++ b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*4
 support_interface_height = =layer_height*5
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg
+++ b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg
@ -18,3 +18,4 @@ wall_thickness = =line_width*5
 support_interface_height = =layer_height*6
 adaptive_layer_height_enabled = true
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*8
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*12
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg
+++ b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*4
 support_interface_height = =layer_height*5
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg
+++ b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg
@ -18,3 +18,4 @@ wall_thickness = =line_width*5
 support_interface_height = =layer_height*6
 adaptive_layer_height_enabled = true
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*8
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*12
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg
+++ b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*4
 support_interface_height = =layer_height*5
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg
+++ b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg
@ -18,3 +18,4 @@ wall_thickness = =line_width*5
 support_interface_height = =layer_height*6
 adaptive_layer_height_enabled = true
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*8
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg
+++ b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*6
 support_interface_height = =layer_height*12
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg
+++ b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg
@ -17,3 +17,4 @@ top_bottom_thickness = 0.8
 wall_thickness = =line_width*4
 support_interface_height = =layer_height*5
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg
+++ b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg
@ -18,3 +18,4 @@ wall_thickness = =line_width*5
 support_interface_height = =layer_height*6
 adaptive_layer_height_enabled = true
 retraction_speed = 60
+cool_fan_enabled = True
--- a/resources/variants/goofoo_miniplus_0.2.inst.cfg
+++ b/resources/variants/goofoo_miniplus_0.2.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.2mm Nozzle
 version = 4
-definition = goofoo_tinyadd
+definition = goofoo_miniplus

 [metadata]
 setting_version = 16
--- a/resources/variants/goofoo_miniplus_0.4.inst.cfg
+++ b/resources/variants/goofoo_miniplus_0.4.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.4mm Nozzle
 version = 4
-definition = goofoo_miniadd
+definition = goofoo_miniplus

 [metadata]
 setting_version = 16
--- a/resources/variants/goofoo_miniplus_0.6.inst.cfg
+++ b/resources/variants/goofoo_miniplus_0.6.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.6mm Nozzle
 version = 4
-definition = goofoo_tinyadd
+definition = goofoo_miniplus

 [metadata]
 setting_version = 16
--- a/resources/variants/goofoo_miniplus_0.8.inst.cfg
+++ b/resources/variants/goofoo_miniplus_0.8.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.8mm Nozzle
 version = 4
-definition = goofoo_miniadd
+definition = goofoo_miniplus

 [metadata]
 setting_version = 16
--- a/resources/variants/goofoo_miniplus_1.0.inst.cfg
+++ b/resources/variants/goofoo_miniplus_1.0.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 1.0mm Nozzle
 version = 4
-definition = goofoo_tinyadd
+definition = goofoo_miniplus

 [metadata]
 setting_version = 16
--- a/resources/variants/goofoo_tinyplus_0.2.inst.cfg
+++ b/resources/variants/goofoo_tinyplus_0.2.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.2mm Nozzle
 version = 4
-definition = goofoo_miniadd
+definition = goofoo_tinyplus

 [metadata]
 setting_version = 16
--- a/resources/variants/goofoo_tinyplus_0.4.inst.cfg
+++ b/resources/variants/goofoo_tinyplus_0.4.inst.cfg
@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = goofoo_tinyplus
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
--- a/resources/variants/goofoo_tinyplus_0.6.inst.cfg
+++ b/resources/variants/goofoo_tinyplus_0.6.inst.cfg
@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = goofoo_tinyplus
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
--- a/resources/variants/goofoo_tinyplus_0.8.inst.cfg
+++ b/resources/variants/goofoo_tinyplus_0.8.inst.cfg
@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = goofoo_tinyplus
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
--- a/resources/variants/goofoo_tinyplus_1.0.inst.cfg
+++ b/resources/variants/goofoo_tinyplus_1.0.inst.cfg
@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = goofoo_tinyplus
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0
--- a/resources/variants/renkforce_pro6_0.2.inst.cfg
+++ b/resources/variants/renkforce_pro6_0.2.inst.cfg
@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = renkforce_pro6
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
--- a/resources/variants/renkforce_pro6_0.4.inst.cfg
+++ b/resources/variants/renkforce_pro6_0.4.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.4mm Nozzle
 version = 4
-definition = goofoo_tinyadd
+definition = renkforce_pro6

 [metadata]
 setting_version = 16
--- a/resources/variants/renkforce_pro6_0.6.inst.cfg
+++ b/resources/variants/renkforce_pro6_0.6.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.6mm Nozzle
 version = 4
-definition = goofoo_miniadd
+definition = renkforce_pro6

 [metadata]
 setting_version = 16
--- a/resources/variants/renkforce_pro6_0.8.inst.cfg
+++ b/resources/variants/renkforce_pro6_0.8.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 0.8mm Nozzle
 version = 4
-definition = goofoo_tinyadd
+definition = renkforce_pro6

 [metadata]
 setting_version = 16
--- a/resources/variants/renkforce_pro6_1.0.inst.cfg
+++ b/resources/variants/renkforce_pro6_1.0.inst.cfg
@ -1,7 +1,7 @@
 [general]
 name = 1.0mm Nozzle
 version = 4
-definition = goofoo_miniadd
+definition = renkforce_pro6

 [metadata]
 setting_version = 16