Merge branch 'main' into feature/merge_upstream

This commit is contained in:
SoftFever 2023-04-23 22:54:41 +08:00
commit adae24a847
13 changed files with 46 additions and 40 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "FLSun", "name": "FLSun",
"version": "01.06.00.00", "version": "01.06.00.02",
"force_update": "0", "force_update": "0",
"description": "FLSun configurations", "description": "FLSun configurations",
"machine_model_list": [ "machine_model_list": [

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

View file

@ -5,7 +5,7 @@
"nozzle_diameter": "0.4", "nozzle_diameter": "0.4",
"machine_tech": "FFF", "machine_tech": "FFF",
"family": "FLSun", "family": "FLSun",
"bed_model": "", "bed_model": "V400_bed.stl",
"bed_texture": "V400.svg", "bed_texture": "V400.svg",
"hotend_model": "", "hotend_model": "",
"default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF"

View file

@ -17,56 +17,56 @@
"5000" "5000"
], ],
"machine_max_acceleration_extruding": [ "machine_max_acceleration_extruding": [
"2000", "20000",
"2000" "20000"
], ],
"machine_max_acceleration_retracting": [ "machine_max_acceleration_retracting": [
"5000", "5000",
"5000" "5000"
], ],
"machine_max_acceleration_travel": [ "machine_max_acceleration_travel": [
"3000", "20000",
"3000" "20000"
], ],
"machine_max_acceleration_x": [ "machine_max_acceleration_x": [
"2000", "20000",
"2000" "20000"
], ],
"machine_max_acceleration_y": [ "machine_max_acceleration_y": [
"2000", "20000",
"2000" "20000"
], ],
"machine_max_acceleration_z": [ "machine_max_acceleration_z": [
"300", "500",
"200" "500"
], ],
"machine_max_speed_e": [ "machine_max_speed_e": [
"25", "30",
"25" "30"
], ],
"machine_max_speed_x": [ "machine_max_speed_x": [
"300", "1000",
"200" "1000"
], ],
"machine_max_speed_y": [ "machine_max_speed_y": [
"300", "1000",
"200" "1000"
], ],
"machine_max_speed_z": [ "machine_max_speed_z": [
"12", "20",
"12" "20"
], ],
"machine_max_jerk_e": [ "machine_max_jerk_e": [
"2.5", "2.5",
"2.5" "2.5"
], ],
"machine_max_jerk_x": [ "machine_max_jerk_x": [
"9", "12",
"9" "12"
], ],
"machine_max_jerk_y": [ "machine_max_jerk_y": [
"9", "12",
"9" "12"
], ],
"machine_max_jerk_z": [ "machine_max_jerk_z": [
"0.2", "0.2",

View file

@ -5,15 +5,24 @@
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_common", "inherits": "fdm_process_common",
"initial_layer_speed": "40", "outer_wall_speed": "120",
"initial_layer_infill_speed": "50", "inner_wall_speed": "200",
"outer_wall_speed": "35", "sparse_infill_speed": "250",
"inner_wall_speed": "60",
"sparse_infill_speed": "200",
"internal_solid_infill_speed": "200", "internal_solid_infill_speed": "200",
"top_surface_speed": "50", "default_acceleration": "7000",
"gap_infill_speed": "40", "default_jerk": "9",
"travel_speed": "180", "gap_infill_speed": "200",
"initial_layer_acceleration": "1000",
"initial_layer_infill_speed": "100",
"initial_layer_speed": "50",
"inner_wall_acceleration": "7000",
"is_custom_defined": "0",
"outer_wall_acceleration": "4000",
"overhang_1_4_speed": "80",
"top_surface_acceleration": "3000",
"top_surface_speed": "200",
"travel_acceleration": "7000",
"travel_speed": "400",
"compatible_printers": [ "compatible_printers": [
"FLSun V400 0.4 nozzle" "FLSun V400 0.4 nozzle"
] ]

View file

@ -1,6 +1,6 @@
{ {
"name": "Vzbot", "name": "Vzbot",
"version": "01.00.00.00", "version": "01.06.00.00",
"force_update": "0", "force_update": "0",
"description": "Vzbot configurations", "description": "Vzbot configurations",
"machine_model_list": [ "machine_model_list": [

View file

@ -6,7 +6,6 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_Vzbot_common_0.5_nozzle", "inherits": "fdm_process_Vzbot_common_0.5_nozzle",
"layer_height": "0.24", "layer_height": "0.24",
"top_surface_line_width": "0.45",
"bottom_shell_layers": "3", "bottom_shell_layers": "3",
"top_shell_layers": "4" "top_shell_layers": "4"
} }

View file

@ -6,7 +6,6 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_Vzbot_common_0.6_nozzle", "inherits": "fdm_process_Vzbot_common_0.6_nozzle",
"layer_height": "0.24", "layer_height": "0.24",
"top_surface_line_width": "0.45",
"bottom_shell_layers": "3", "bottom_shell_layers": "3",
"top_shell_layers": "4" "top_shell_layers": "4"
} }

View file

@ -6,7 +6,7 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_Vzbot_common", "inherits": "fdm_process_Vzbot_common",
"layer_height": "0.28", "layer_height": "0.28",
"top_surface_line_width": "0.45", "top_surface_line_width": "0.52",
"bottom_shell_layers": "3", "bottom_shell_layers": "3",
"top_shell_layers": "4" "top_shell_layers": "4"
} }

View file

@ -6,7 +6,6 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_process_Vzbot_common", "inherits": "fdm_process_Vzbot_common",
"layer_height": "0.28", "layer_height": "0.28",
"top_surface_line_width": "0.45",
"bottom_shell_layers": "3", "bottom_shell_layers": "3",
"top_shell_layers": "4" "top_shell_layers": "4"
} }

View file

@ -85,7 +85,7 @@
"tree_support_wall_count": "0", "tree_support_wall_count": "0",
"detect_thin_wall": "0", "detect_thin_wall": "0",
"top_surface_pattern": "monotonic", "top_surface_pattern": "monotonic",
"top_surface_line_width": "0.55", "top_surface_line_width": "0.52",
"top_shell_layers": "3", "top_shell_layers": "3",
"top_shell_thickness": "0.8", "top_shell_thickness": "0.8",
"initial_layer_speed": "120", "initial_layer_speed": "120",

View file

@ -61,7 +61,7 @@
"support_threshold_angle": "40", "support_threshold_angle": "40",
"support_object_xy_distance": "0.5", "support_object_xy_distance": "0.5",
"detect_thin_wall": "0", "detect_thin_wall": "0",
"top_surface_line_width": "0.55", "top_surface_line_width": "0.52",
"top_surface_speed": "30", "top_surface_speed": "30",
"travel_speed": "400", "travel_speed": "400",
"enable_prime_tower": "0", "enable_prime_tower": "0",