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 a new model named S1 and fix some parameters of previous files #4267

Merged
merged 40 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0189589
Update fdm_klipper_common.json
FlyingbearOfficial Feb 13, 2024
47a41c7
Update fdm_filament_abs.json
FlyingbearOfficial Feb 13, 2024
3ca2cc4
Update fdm_filament_pa.json
FlyingbearOfficial Feb 19, 2024
edf282a
Merge branch 'main' into main
FlyingbearOfficial Feb 19, 2024
e553601
Merge branch 'main' into main
FlyingbearOfficial Feb 20, 2024
3ec057f
Update fdm_filament_abs.json
FlyingbearOfficial Feb 20, 2024
b6cdb2a
Update FlyingBear Generic ABS.json
FlyingbearOfficial Feb 20, 2024
e0f0e87
Update fdm_klipper_common.json
FlyingbearOfficial Feb 20, 2024
17244bf
Update FlyingBear Generic PA-CF.json
FlyingbearOfficial Feb 24, 2024
1bfde3f
Update fdm_filament_pa.json
FlyingbearOfficial Feb 24, 2024
2ec08f7
Update fdm_filament_pc.json
FlyingbearOfficial Feb 24, 2024
c649795
Update FlyingBear Generic PC.json
FlyingbearOfficial Feb 24, 2024
465585b
Update fdm_filament_pet.json
FlyingbearOfficial Feb 24, 2024
44613f8
Update FlyingBear Generic PETG.json
FlyingbearOfficial Feb 24, 2024
6c89b7a
Update FlyingBear Generic PLA.json
FlyingbearOfficial Feb 24, 2024
4132eb9
Update fdm_filament_pla.json
FlyingbearOfficial Feb 24, 2024
568d3b6
Update FlyingBear Generic TPU.json
FlyingbearOfficial Feb 24, 2024
da0c09b
Update fdm_filament_tpu.json
FlyingbearOfficial Feb 24, 2024
d0ae004
Update fdm_filament_common.json
FlyingbearOfficial Feb 24, 2024
b9bc742
Add a new filament named pla_Hyper
FlyingbearOfficial Feb 24, 2024
0802f2f
Merge branch 'main' into main
FlyingbearOfficial Feb 25, 2024
d7abd49
Update FlyingBear Reborn3 0.4 nozzle.json
FlyingbearOfficial Feb 28, 2024
bb3e596
Update fdm_machine_common.json
FlyingbearOfficial Feb 28, 2024
3ed47cb
Update 0.08mm Extra Fine @FlyingBear Reborn3.json
FlyingbearOfficial Feb 28, 2024
f4a4cf8
Update 0.12mm Fine @FlyingBear Reborn3.json
FlyingbearOfficial Feb 28, 2024
bc1401b
Update 0.20mm Standard @FlyingBear Reborn3.json
FlyingbearOfficial Feb 28, 2024
54157f0
Update 0.24mm Draft @FlyingBear Reborn3.json
FlyingbearOfficial Feb 28, 2024
b6b553a
Update fdm_process_common.json
FlyingbearOfficial Feb 28, 2024
2486697
Merge branch 'main' into main
SoftFever Feb 28, 2024
08139cd
Add new a Model named S1
FlyingbearOfficial Feb 29, 2024
e4b1dfb
Add a new model named S1 for machine
FlyingbearOfficial Feb 29, 2024
0714c78
Add a new model named S1 for process
FlyingbearOfficial Feb 29, 2024
eff1412
Rename lyingBear Reborn3-texture.png to FlyingBear Reborn3-texture.pn…
FlyingbearOfficial Feb 29, 2024
90f4eaa
Rename FlyingBear Reborn3-texture.png.png to FlyingBear Reborn3-textu…
FlyingbearOfficial Feb 29, 2024
dcb284d
Add a new model named S1 for img
FlyingbearOfficial Feb 29, 2024
bf7f2df
Update FlyingBear.json
FlyingbearOfficial Feb 29, 2024
ef5b010
Add a new layer hieght
FlyingbearOfficial Feb 29, 2024
aa5bb77
Update FlyingBear.json
FlyingbearOfficial Feb 29, 2024
e801aa2
Merge branch 'main' into main
SoftFever Mar 1, 2024
81cabfc
Merge branch 'main' into main
SoftFever Mar 2, 2024
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
176 changes: 176 additions & 0 deletions resources/profiles/FlyingBear.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
{
"name": "FlyingBear Reborn3",
"sub_path": "machine/FlyingBear Reborn3.json"
},
{
"name": "FlyingBear S1",
"sub_path": "machine/S1/FlyingBear S1.json"
}

],
"process_list": [
{
Expand All @@ -22,14 +27,46 @@
"name": "0.12mm Fine @FlyingBear Reborn3",
"sub_path": "process/0.12mm Fine @FlyingBear Reborn3.json"
},
{
"name": "0.16mm Optimal @FlyingBear Reborn3",
"sub_path": "process/0.16mm Optimal @FlyingBear Reborn3.json"
},
{
"name": "0.20mm Standard @FlyingBear Reborn3",
"sub_path": "process/0.20mm Standard @FlyingBear Reborn3.json"
},
{
"name": "0.24mm Draft @FlyingBear Reborn3",
"sub_path": "process/0.24mm Draft @FlyingBear Reborn3.json"
},



{
"name": "fdm_process_common_S1",
"sub_path": "process/S1/fdm_process_common_S1.json"
},
{
"name": "0.20mm Standard @FlyingBear S1",
"sub_path": "process/S1/0.20mm Standard @FlyingBear S1.json"
},
{
"name": "0.08mm Extra Fine @FlyingBear S1",
"sub_path": "process/S1/0.08mm Extra Fine @FlyingBear S1.json"
},
{
"name": "0.12mm Fine @FlyingBear S1",
"sub_path": "process/S1/0.12mm Fine @FlyingBear S1.json"
},
{
"name": "0.16mm Optimal @FlyingBear S1",
"sub_path": "process/S1/0.16mm Optimal @FlyingBear S1.json"
},
{
"name": "0.24mm Draft @FlyingBear S1",
"sub_path": "process/S1/0.24mm Draft @FlyingBear S1.json"
}

],
"filament_list": [
{
Expand Down Expand Up @@ -83,7 +120,138 @@
{
"name": "FlyingBear Generic PA-CF",
"sub_path": "filament/FlyingBear Generic PA-CF.json"
},

{
"name": "fdm_filament_pla_Hyper",
"sub_path": "filament/fdm_filament_pla_Hyper.json"
},
{
"name": "FlyingBear PLA Hyper",
"sub_path": "filament/FlyingBear PLA Hyper.json"
},


{
"name": "fdm_filament_common_S1",
"sub_path": "filament/S1/fdm_filament_common_S1.json"
},
{
"name": "fdm_filament_abs @S1",
"sub_path": "filament/S1/fdm_filament_abs @S1.json"
},
{
"name": "FlyingBear ABS @S1",
"sub_path": "filament/S1/FlyingBear ABS @S1.json"
},
{
"name": "fdm_filament_pa @S1",
"sub_path": "filament/S1/fdm_filament_pa @S1.json"
},
{
"name": "FlyingBear PA-CF @S1",
"sub_path": "filament/S1/FlyingBear PA-CF @S1.json"
},
{
"name": "fdm_filament_pc @S1",
"sub_path": "filament/S1/fdm_filament_pc @S1.json"
},
{
"name": "FlyingBear PC @S1",
"sub_path": "filament/S1/FlyingBear PC @S1.json"
},
{
"name": "fdm_filament_pet @S1",
"sub_path": "filament/S1/fdm_filament_pet @S1.json"
},
{
"name": "FlyingBear PETG @S1",
"sub_path": "filament/S1/FlyingBear PETG @S1.json"
},
{
"name": "fdm_filament_pla @S1",
"sub_path": "filament/S1/fdm_filament_pla @S1.json"
},
{
"name": "FlyingBear PLA @S1",
"sub_path": "filament/S1/FlyingBear PLA @S1.json"
},
{
"name": "fdm_filament_pla_Hyper @S1",
"sub_path": "filament/S1/fdm_filament_pla_Hyper @S1.json"
},
{
"name": "FlyingBear PLA Hyper @S1",
"sub_path": "filament/S1/FlyingBear PLA Hyper @S1.json"
},
{
"name": "fdm_filament_tpu @S1",
"sub_path": "filament/S1/fdm_filament_tpu @S1.json"
},
{
"name": "FlyingBear TPU @S1",
"sub_path": "filament/S1/FlyingBear TPU @S1.json"
},
{
"name": "fdm_filament_abs_other @S1",
"sub_path": "filament/S1/fdm_filament_abs_other @S1.json"
},
{
"name": "Other ABS @S1",
"sub_path": "filament/S1/Other ABS @S1.json"
},
{
"name": "fdm_filament_pa_other @S1",
"sub_path": "filament/S1/fdm_filament_pa_other @S1.json"
},
{
"name": "Other PA-CF @S1",
"sub_path": "filament/S1/Other PA-CF @S1.json"
},
{
"name": "fdm_filament_pc_other @S1",
"sub_path": "filament/S1/fdm_filament_pc_other @S1.json"
},
{
"name": "Other PC @S1",
"sub_path": "filament/S1/Other PC @S1.json"
},
{
"name": "fdm_filament_pet_other @S1",
"sub_path": "filament/S1/fdm_filament_pet_other @S1.json"
},
{
"name": "Other PETG @S1",
"sub_path": "filament/S1/Other PETG @S1.json"
},
{
"name": "fdm_filament_pla_other @S1",
"sub_path": "filament/S1/fdm_filament_pla_other @S1.json"
},
{
"name": "Other PLA @S1",
"sub_path": "filament/S1/Other PLA @S1.json"
},
{
"name": "fdm_filament_pla_Hyper_other @S1",
"sub_path": "filament/S1/fdm_filament_pla_Hyper_other @S1.json"
},
{
"name": "Other PLA Hyper @S1",
"sub_path": "filament/S1/Other PLA Hyper @S1.json"
},
{
"name": "fdm_filament_tpu_other @S1",
"sub_path": "filament/S1/fdm_filament_tpu_other @S1.json"
},
{
"name": "Other TPU @S1",
"sub_path": "filament/S1/Other TPU @S1.json"
}




],
"machine_list": [
{
Expand All @@ -97,6 +265,14 @@
{
"name": "FlyingBear Reborn3 0.4 nozzle",
"sub_path": "machine/FlyingBear Reborn3 0.4 nozzle.json"
},


{
"name": "FlyingBear S1 0.4 nozzle",
"sub_path": "machine/S1/FlyingBear S1 0.4 nozzle.json"
}


]
}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"type": "filament",
"filament_id": "GFB99",
"setting_id": "GFSA04",
"name": "FlyingBear ABS @S1",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs @S1",
"filament_flow_ratio": [
"0.94"
],
"filament_max_volumetric_speed": [
"15"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.058"
],
"filament_retraction_length": [
"0.8"
],
"compatible_printers": [
"FlyingBear S1 0.4 nozzle"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "filament",
"filament_id": "GFN98",
"setting_id": "GFSA04",
"name": "FlyingBear PA-CF @S1",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pa @S1",
"filament_type": [
"PA-CF"
],
"filament_max_volumetric_speed": [
"8"
],
"filament_flow_ratio": [
"0.96"
],
"filament_wipe": [
"1"
],
"filament_wipe_distance": [
"4"
],
"filament_retract_before_wipe": [
"0%"
],
"filament_retraction_length": [
"0.8"
],
"compatible_printers": [
"FlyingBear S1 0.4 nozzle"

]
}
24 changes: 24 additions & 0 deletions resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "filament",
"filament_id": "GFC99",
"setting_id": "GFSA04",
"name": "FlyingBear PC @S1",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pc @S1",
"filament_max_volumetric_speed": [
"12"
],
"filament_flow_ratio": [
"0.94"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.058"
],
"compatible_printers": [
"FlyingBear S1 0.4 nozzle"
]
}
54 changes: 54 additions & 0 deletions resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSA04",
"name": "FlyingBear PETG @S1",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet @S1",
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"fan_cooling_layer_time": [
"30"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"slow_down_min_speed": [
"20"
],
"slow_down_layer_time": [
"8"
],
"filament_flow_ratio": [
"0.94"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_start_gcode": [
"; filament start gcode\n"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.084"
],
"compatible_printers": [
"FlyingBear S1 0.4 nozzle"
]
}
24 changes: 24 additions & 0 deletions resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "filament",
"filament_id": "GFL99",
"setting_id": "GFSA04",
"name": "FlyingBear PLA @S1",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla @S1",
"filament_flow_ratio": [
"0.94"
],
"filament_max_volumetric_speed": [
"12"
],
"slow_down_layer_time": [
"8"
],
"pressure_advance": [
"0.084"
],
"compatible_printers": [
"FlyingBear S1 0.4 nozzle"
]
}
Loading
Loading