Merge branch 'main' into main

2026-05-19 11:23:42 +00:00 · 2024-12-14 20:21:34 +08:00
parent dbea5f8229 c9606a9458
commit 8bb8b30053
47 changed files with 219 additions and 68 deletions
--- a/resources/profiles/FlyingBear/filament/FlyingBear
+++ b/resources/profiles/FlyingBear/filament/FlyingBear
@@ -15,8 +15,11 @@
    "slow_down_layer_time": [
        "8"
    ],
+    "enable_pressure_advance": [
+        "1"
+    ],
    "pressure_advance": [
-        "0.084"
+        "0.032"
    ],
    "compatible_printers": [
      "FlyingBear Reborn3 0.4 nozzle",
--- a/resources/profiles/FlyingBear/filament/S1/FlyingBear
+++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear
@@ -15,8 +15,11 @@
    "slow_down_layer_time": [
        "8"
    ],
+    "enable_pressure_advance": [
+        "1"
+    ],
    "pressure_advance": [
-        "0.084"
+        "0.032"
    ],
    "compatible_printers": [
      "FlyingBear S1 0.4 nozzle"
--- a/resources/profiles/FlyingBear/filament/S1/Other
+++ b/resources/profiles/FlyingBear/filament/S1/Other
@@ -15,8 +15,11 @@
    "slow_down_layer_time": [
        "8"
    ],
+    "enable_pressure_advance": [
+        "1"
+    ],
    "pressure_advance": [
-        "0.084"
+        "0.032"
    ],
    "compatible_printers": [
      "FlyingBear S1 0.4 nozzle"
--- a/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla
+++ b/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla_Hyper
+++ b/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla_Hyper
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla_Hyper_other
+++ b/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla_Hyper_other
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla_other
+++ b/resources/profiles/FlyingBear/filament/S1/fdm_filament_pla_other
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/FlyingBear/filament/fdm_filament_pla.json
+++ b/resources/profiles/FlyingBear/filament/fdm_filament_pla.json
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/FlyingBear/filament/fdm_filament_pla_Hyper.json
+++ b/resources/profiles/FlyingBear/filament/fdm_filament_pla_Hyper.json
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/FlyingBear/machine/S1/FlyingBear
+++ b/resources/profiles/FlyingBear/machine/S1/FlyingBear
@@ -207,6 +207,6 @@
      "0.4"
  ],
  "z_hop_types": [
-      "Auto Lift"
+      "Normal Lift"
  ]
 }
--- a/resources/profiles/FlyingBear/machine/fdm_klipper_common.json
+++ b/resources/profiles/FlyingBear/machine/fdm_klipper_common.json
@@ -112,7 +112,7 @@
        "0"
    ],
  "machine_pause_gcode": "PAUSE",
-  "machine_start_gcode": ";V1.1\n\nM140 S[bed_temperature_initial_layer_single] \nM104 S135\nG28\nG4 P200\nZ_TILT_ADJUST\nG90\nG1 X150 Y150 F3000\nG28 Z\nG1 X50 Y-4 F2500\nM109 S[nozzle_temperature_initial_layer]\nM190 S[bed_temperature_initial_layer_single] \nPRINT_START",
+  "machine_start_gcode": ";R3_V1.1.0-20241115\n\nM140 S[bed_temperature_initial_layer_single] \nM104 S135\nG28\nG4 P200\nM190 S[bed_temperature_initial_layer_single] \nZ_TILT_ADJUST\nG90\nG1 X150 Y150 F3000\nG28 Z\nG1 X50 Y-4 F2500\nM109 S[nozzle_temperature_initial_layer]\nM190 S[bed_temperature_initial_layer_single] \nPRINT_START",
  "max_layer_height": [
      "0.28"
  ],
--- a/resources/profiles/FlyingBear/machine/fdm_machine_common.json
+++ b/resources/profiles/FlyingBear/machine/fdm_machine_common.json
@@ -113,7 +113,7 @@
        "0"
    ],
    "machine_pause_gcode": "PAUSE",
-    "machine_start_gcode": ";V1.1\n\nM140 S[bed_temperature_initial_layer_single] \nM104 S135\nG28\nG4 P200\nZ_TILT_ADJUST\nG90\nG1 X150 Y150 F3000\nG28 Z\nG1 X50 Y-4 F2500\nM109 S[nozzle_temperature_initial_layer]\nM190 S[bed_temperature_initial_layer_single] \nPRINT_START",
+    "machine_start_gcode": ";R3_V1.1.0-20241115\n\nM140 S[bed_temperature_initial_layer_single] \nM104 S135\nG28\nG4 P200\nM190 S[bed_temperature_initial_layer_single] \nZ_TILT_ADJUST\nG90\nG1 X150 Y150 F3000\nG28 Z\nG1 X50 Y-4 F2500\nM109 S[nozzle_temperature_initial_layer]\nM190 S[bed_temperature_initial_layer_single] \nPRINT_START",
    "max_layer_height": [
        "0.28"
    ],
@@ -201,6 +201,6 @@
        "0.4"
    ],
    "z_hop_types": [
-        "Auto Lift"
+        "Normal Lift"
    ]
 }
--- a/resources/profiles/FlyingBear/process/0.08mm
+++ b/resources/profiles/FlyingBear/process/0.08mm
@@ -5,7 +5,8 @@
    "from": "system",
    "instantiation": "true",
    "inherits": "fdm_process_common",
-    
+
+    "inner_wall_acceleration": "3000",
    "bottom_shell_layers": "7",
    "overhang_1_4_speed": "60",
    "overhang_2_4_speed": "30",
--- a/resources/profiles/FlyingBear/process/0.12mm
+++ b/resources/profiles/FlyingBear/process/0.12mm
@@ -5,7 +5,8 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_process_common",
-
+	
+    "inner_wall_acceleration": "3000",
    "bottom_shell_layers": "5",
    "overhang_1_4_speed": "50",
    "overhang_2_4_speed": "30",
--- a/resources/profiles/FlyingBear/process/0.16mm
+++ b/resources/profiles/FlyingBear/process/0.16mm
@@ -5,7 +5,8 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_process_common",
-    
+
+    "inner_wall_acceleration": "3000",
    "overhang_2_4_speed": "50",
    "overhang_3_4_speed": "30",
    "top_shell_layers": "6",
--- a/resources/profiles/FlyingBear/process/S1/0.08mm
+++ b/resources/profiles/FlyingBear/process/S1/0.08mm
@@ -6,7 +6,8 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_process_common_S1",
-
+	
+    "inner_wall_acceleration": "3000",
    "bottom_shell_layers": "7",
    "overhang_1_4_speed": "50",
    "overhang_2_4_speed": "30",
--- a/resources/profiles/FlyingBear/process/S1/0.12mm
+++ b/resources/profiles/FlyingBear/process/S1/0.12mm
@@ -6,6 +6,7 @@
 	"instantiation": "true",
 	"inherits": "fdm_process_common_S1",

+    "inner_wall_acceleration": "3000",
    "bottom_shell_layers": "5",
    "overhang_1_4_speed": "50",
    "overhang_2_4_speed": "30",
--- a/resources/profiles/FlyingBear/process/S1/0.16mm
+++ b/resources/profiles/FlyingBear/process/S1/0.16mm
@@ -5,7 +5,8 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_process_common_S1",
-    
+
+    "inner_wall_acceleration": "3000",
    "overhang_2_4_speed": "50",
    "overhang_3_4_speed": "30",
    "top_shell_layers": "6",
--- a/resources/profiles/FlyingBear/process/S1/fdm_process_common_S1.json
+++ b/resources/profiles/FlyingBear/process/S1/fdm_process_common_S1.json
@@ -24,7 +24,7 @@
 	"default_jerk": "0",
 	"detect_narrow_internal_solid_infill": "1",
 	"detect_overhang_wall": "1",
-	"detect_thin_wall": "0",
+	"detect_thin_wall": "1",
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"enable_arc_fitting": "0",
@@ -123,6 +123,7 @@
 	"slice_closing_radius": "0.049",
 	"slicing_mode": "regular",
 	"slow_down_layers": "0",
+	"slowdown_for_curled_perimeters": "0",
 	"small_perimeter_speed": "50%",
 	"small_perimeter_threshold": "0",
 	"solid_infill_filament": "1",
@@ -130,7 +131,7 @@
 	"sparse_infill_density": "15%",
 	"sparse_infill_filament": "1",
 	"sparse_infill_line_width": "0.45",
-	"sparse_infill_pattern": "crosshatch",
+	"sparse_infill_pattern": "grid",

 	"spiral_mode": "0",
 	"staggered_inner_seams": "0",
--- a/resources/profiles/FlyingBear/process/fdm_process_common.json
+++ b/resources/profiles/FlyingBear/process/fdm_process_common.json
@@ -24,7 +24,7 @@
 	"default_jerk": "0",
 	"detect_narrow_internal_solid_infill": "1",
 	"detect_overhang_wall": "1",
-	"detect_thin_wall": "0",
+	"detect_thin_wall": "1",
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"enable_arc_fitting": "0",
@@ -123,6 +123,7 @@
 	"slice_closing_radius": "0.049",
 	"slicing_mode": "regular",
 	"slow_down_layers": "0",
+	"slowdown_for_curled_perimeters": "0",
 	"small_perimeter_speed": "50%",
 	"small_perimeter_threshold": "0",
 	"solid_infill_filament": "1",
@@ -130,7 +131,7 @@
 	"sparse_infill_density": "15%",
 	"sparse_infill_filament": "1",
 	"sparse_infill_line_width": "0.45",
-	"sparse_infill_pattern": "crosshatch",
+	"sparse_infill_pattern": "grid",

 	"spiral_mode": "0",
 	"staggered_inner_seams": "0",
--- a/resources/profiles/InfiMech/filament/InfiMech
+++ b/resources/profiles/InfiMech/filament/InfiMech
@@ -15,8 +15,11 @@
    "slow_down_layer_time": [
        "8"
    ],
+    "enable_pressure_advance": [
+        "1"
+    ],
    "pressure_advance": [
-        "0.084"
+        "0.032"
    ],
    "compatible_printers": [
      "InfiMech TX 0.4 nozzle"
--- a/resources/profiles/InfiMech/filament/Other
+++ b/resources/profiles/InfiMech/filament/Other
@@ -15,8 +15,11 @@
    "slow_down_layer_time": [
        "8"
    ],
+    "enable_pressure_advance": [
+        "1"
+    ],
    "pressure_advance": [
-        "0.084"
+        "0.032"
    ],
    "compatible_printers": [
      "InfiMech TX 0.4 nozzle"
--- a/resources/profiles/InfiMech/filament/fdm_filament_pla.json
+++ b/resources/profiles/InfiMech/filament/fdm_filament_pla.json
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/InfiMech/filament/fdm_filament_pla_Hyper.json
+++ b/resources/profiles/InfiMech/filament/fdm_filament_pla_Hyper.json
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/InfiMech/filament/fdm_filament_pla_Hyper_other.json
+++ b/resources/profiles/InfiMech/filament/fdm_filament_pla_Hyper_other.json
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/InfiMech/filament/fdm_filament_pla_other.json
+++ b/resources/profiles/InfiMech/filament/fdm_filament_pla_other.json
@@ -41,7 +41,7 @@
        "60"
    ],
    "hot_plate_temp_initial_layer" : [
-        "65"
+        "60"
    ],
    "textured_plate_temp_initial_layer" : [
        "60"
--- a/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json
+++ b/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json
@@ -204,7 +204,7 @@
      "0.4"
  ],
  "z_hop_types": [
-      "Auto Lift"
+      "Normal Lift"
  ]

  
--- a/resources/profiles/InfiMech/machine/HSN/fdm_machine_common.json
+++ b/resources/profiles/InfiMech/machine/HSN/fdm_machine_common.json
@@ -201,6 +201,6 @@
        "0.4"
    ],
    "z_hop_types": [
-        "Auto Lift"
+        "Normal Lift"
    ]
 }
--- a/resources/profiles/InfiMech/machine/fdm_klipper_common.json
+++ b/resources/profiles/InfiMech/machine/fdm_klipper_common.json
@@ -204,7 +204,7 @@
      "0.4"
  ],
  "z_hop_types": [
-      "Auto Lift"
+      "Normal Lift"
  ]

  
--- a/resources/profiles/InfiMech/machine/fdm_machine_common.json
+++ b/resources/profiles/InfiMech/machine/fdm_machine_common.json
@@ -201,6 +201,6 @@
        "0.4"
    ],
    "z_hop_types": [
-        "Auto Lift"
+        "Normal Lift"
    ]
 }
--- a/resources/profiles/InfiMech/process/HSN/fdm_process_common_HSN.json
+++ b/resources/profiles/InfiMech/process/HSN/fdm_process_common_HSN.json
@@ -23,7 +23,7 @@
 	"default_jerk": "0",
 	"detect_narrow_internal_solid_infill": "1",
 	"detect_overhang_wall": "1",
-	"detect_thin_wall": "0",
+	"detect_thin_wall": "1",
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"enable_arc_fitting": "0",
@@ -122,6 +122,7 @@
 	"slice_closing_radius": "0.049",
 	"slicing_mode": "regular",
 	"slow_down_layers": "0",
+	"slowdown_for_curled_perimeters": "0",
 	"small_perimeter_speed": "50%",
 	"small_perimeter_threshold": "0",
 	"solid_infill_filament": "1",
@@ -129,7 +130,7 @@
 	"sparse_infill_density": "15%",
 	"sparse_infill_filament": "1",
 	"sparse_infill_line_width": "0.45",
-	"sparse_infill_pattern": "crosshatch",
+	"sparse_infill_pattern": "grid",

 	"spiral_mode": "0",
 	"staggered_inner_seams": "0",
--- a/resources/profiles/InfiMech/process/fdm_process_common.json
+++ b/resources/profiles/InfiMech/process/fdm_process_common.json
@@ -23,7 +23,7 @@
 	"default_jerk": "0",
 	"detect_narrow_internal_solid_infill": "1",
 	"detect_overhang_wall": "1",
-	"detect_thin_wall": "0",
+	"detect_thin_wall": "1",
 	"draft_shield": "disabled",
 	"elefant_foot_compensation": "0.15",
 	"enable_arc_fitting": "0",
@@ -122,6 +122,7 @@
 	"slice_closing_radius": "0.049",
 	"slicing_mode": "regular",
 	"slow_down_layers": "0",
+	"slowdown_for_curled_perimeters": "0",
 	"small_perimeter_speed": "50%",
 	"small_perimeter_threshold": "0",
 	"solid_infill_filament": "1",
@@ -129,7 +130,7 @@
 	"sparse_infill_density": "15%",
 	"sparse_infill_filament": "1",
 	"sparse_infill_line_width": "0.45",
-	"sparse_infill_pattern": "crosshatch",
+	"sparse_infill_pattern": "grid",

 	"spiral_mode": "0",
 	"staggered_inner_seams": "0",