Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add & revise FLSun Profile #1045

Merged
merged 2 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 58 additions & 2 deletions resources/profiles/FLSun.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
"force_update": "0",
"description": "FLSun configurations",
"machine_model_list": [
{
"name": "FLSun Q5",
"sub_path": "machine/FLSun Q5.json"
},
{
"name": "FLSun QQ-S Pro",
"sub_path": "machine/FLSun QQ-S Pro.json"
},
{
"name": "FLSun V400",
"sub_path": "machine/FLSun V400.json"
Expand All @@ -13,10 +21,50 @@
{
"name": "fdm_process_common",
"sub_path": "process/fdm_process_common.json"
},
{
"name": "0.08mm Fine @FLSun Q5",
"sub_path": "process/0.08mm Fine @FLSun Q5.json"
},
{
"name": "0.08mm Fine @FLSun QQSPro",
"sub_path": "process/0.08mm Fine @FLSun QQSPro.json"
},
{
"name": "0.16mm Optimal @FLSun Q5",
"sub_path": "process/0.16mm Optimal @FLSun Q5.json"
},
{
"name": "0.16mm Optimal @FLSun QQSPro",
"sub_path": "process/0.16mm Optimal @FLSun QQSPro.json"
},
{
"name": "0.20mm Standard @FLSun Q5",
"sub_path": "process/0.20mm Standard @FLSun Q5.json"
},
{
"name": "0.20mm Standard @FLSun QQSPro",
"sub_path": "process/0.20mm Standard @FLSun QQSPro.json"
},
{
"name": "0.20mm Standard @FLSun",
"sub_path": "process/0.20mm Standard @FLSun.json"
"name": "0.20mm Standard @FLSun V400",
"sub_path": "process/0.20mm Standard @FLSun V400.json"
},
{
"name": "0.24mm Draft @FLSun Q5",
"sub_path": "process/0.24mm Draft @FLSun Q5.json"
},
{
"name": "0.24mm Draft @FLSun QQSPro",
"sub_path": "process/0.24mm Draft @FLSun QQSPro.json"
},
{
"name": "0.30mm Extra Draft @FLSun Q5",
"sub_path": "process/0.30mm Extra Draft @FLSun Q5.json"
},
{
"name": "0.30mm Extra Draft @FLSun QQSPro",
"sub_path": "process/0.30mm Extra Draft @FLSun QQSPro.json"
}
],
"filament_list": [
Expand Down Expand Up @@ -101,6 +149,14 @@
{
"name": "fdm_machine_common",
"sub_path": "machine/fdm_machine_common.json"
},
{
"name": "FLSun Q5 0.4 nozzle",
"sub_path": "machine/FLSun Q5 0.4 nozzle.json"
},
{
"name": "FLSun QQ-S Pro 0.4 nozzle",
"sub_path": "machine/FLSun QQ-S Pro 0.4 nozzle.json"
},
{
"name": "FLSun V400 0.4 nozzle",
Expand Down
Binary file added resources/profiles/FLSun/FLSun Q5_cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/FLSun/FLSun QQ-S Pro_cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/profiles/FLSun/FLSun V400_cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic ABS.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"12"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic ASA.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"12"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PA-CF.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"8"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PA.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"12"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PC.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"0.94"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PETG.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
"; filament start gcode\n"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"7"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PLA.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"8"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic PVA.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"10"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
4 changes: 3 additions & 1 deletion resources/profiles/FLSun/filament/FLSun Generic TPU.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"3.2"
],
"compatible_printers": [
"FLSun V400 0.4 nozzle"
"FLSun Q5 0.4 nozzle",
"FLSun QQ-S Pro 0.4 nozzle",
"FLSun V400 0.4 nozzle"
]
}
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
189 changes: 189 additions & 0 deletions resources/profiles/FLSun/machine/FLSun Q5 0.4 nozzle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "FLSun Q5 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_machine_common",
"printer_model": "FLSun Q5",
"default_print_profile": "0.20mm Standard @FLSun Q5",
"gcode_flavor": "marlin",
"thumbnails": [
"260x260"
],
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"99.6195x8.71557",
"98.4808x17.3648",
"96.5926x25.8819",
"93.9693x34.202",
"90.6308x42.2618",
"86.6025x50",
"81.9152x57.3576",
"76.6044x64.2788",
"70.7107x70.7107",
"64.2788x76.6044",
"57.3576x81.9152",
"50x86.6025",
"42.2618x90.6308",
"34.202x93.9693",
"25.8819x96.5926",
"17.3648x98.4808",
"8.71557x99.6195",
"6.12323e-15x100",
"-8.71557x99.6195",
"-17.3648x98.4808",
"-25.8819x96.5926",
"-34.202x93.9693",
"-42.2618x90.6308",
"-50x86.6025",
"-57.3576x81.9152",
"-64.2788x76.6044",
"-70.7107x70.7107",
"-76.6044x64.2788",
"-81.9152x57.3576",
"-86.6025x50",
"-90.6308x42.2618",
"-93.9693x34.202",
"-96.5926x25.8819",
"-98.4808x17.3648",
"-99.6195x8.71557",
"-100x1.22465e-14",
"-99.6195x-8.71557",
"-98.4808x-17.3648",
"-96.5926x-25.8819",
"-93.9693x-34.202",
"-90.6308x-42.2618",
"-86.6025x-50",
"-81.9152x-57.3576",
"-76.6044x-64.2788",
"-70.7107x-70.7107",
"-64.2788x-76.6044",
"-57.3576x-81.9152",
"-50x-86.6025",
"-42.2618x-90.6308",
"-34.202x-93.9693",
"-25.8819x-96.5926",
"-17.3648x-98.4808",
"-8.71557x-99.6195",
"-1.83697e-14x-100",
"8.71557x-99.6195",
"17.3648x-98.4808",
"25.8819x-96.5926",
"34.202x-93.9693",
"42.2618x-90.6308",
"50x-86.6025",
"57.3576x-81.9152",
"64.2788x-76.6044",
"70.7107x-70.7107",
"76.6044x-64.2788",
"81.9152x-57.3576",
"86.6025x-50",
"90.6308x-42.2618",
"93.9693x-34.202",
"96.5926x-25.8819",
"98.4808x-17.3648",
"99.6195x-8.71557",
"100x-2.44929e-14"
],
"printable_height": "200",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0",
"machine_max_acceleration_e": [
"3000",
"800"
],
"machine_max_acceleration_extruding": [
"1500",
"800"
],
"machine_max_acceleration_retracting": [
"2000",
"800"
],
"machine_max_acceleration_travel": [
"1500",
"800"
],
"machine_max_acceleration_x": [
"1500",
"800"
],
"machine_max_acceleration_y": [
"1500",
"800"
],
"machine_max_acceleration_z": [
"1500",
"800"
],
"machine_max_speed_e": [
"60",
"30"
],
"machine_max_speed_x": [
"200",
"150"
],
"machine_max_speed_y": [
"200",
"150"
],
"machine_max_speed_z": [
"200",
"150"
],
"machine_max_jerk_e": [
"5",
"5"
],
"machine_max_jerk_x": [
"5",
"10"
],
"machine_max_jerk_y": [
"5",
"10"
],
"machine_max_jerk_z": [
"5",
"10"
],
"max_layer_height": [
"0.32"
],
"min_layer_height": [
"0.08"
],
"printer_settings_id": "FLSun",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"70%"
],
"retraction_length": [
"3"
],
"retract_length_toolchange": [
"1"
],
"retraction_speed": [
"30"
],
"deretraction_speed": [
"40"
],
"single_extruder_multi_material": "0",
"change_filament_gcode": "",
"machine_pause_gcode": "M400 U1\n",
"default_filament_profile": [
"FLSun Generic PLA"
],
"machine_start_gcode": ";STARTGCODE\nM117 Initializing\n; G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM107\nG28 ;Home\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\n\nG92 E0\nG1 X-98 Y0 Z0.2 F4000 ; move to arc start\nG3 X0 Y-98 I98 Z0.2 E40 F400 ; lay arc stripe 90deg\nG0 Z1 \nG92 E0.0\n",
"machine_end_gcode": "M107\nM104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\n;M84\nM18 S180 ;disable motors after 180s\n",
"scan_first_layer": "0"
}

12 changes: 12 additions & 0 deletions resources/profiles/FLSun/machine/FLSun Q5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "machine_model",
"name": "FLSun Q5",
"model_id": "FLSun-Q5",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "FLSun",
"bed_model": "flsun_q5_buildplate_model.stl",
"bed_texture": "flsun_q5_buildplate_texture.png",
"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"
}
Loading