-
-
Notifications
You must be signed in to change notification settings - Fork 942
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/update_deps
- Loading branch information
Showing
35 changed files
with
3,536 additions
and
4,349 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
resources/profiles/Voron/machine/Voron Switchwire 250 0.4 nozzle.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "type": "machine", | ||
| "setting_id": "GM001", | ||
| "name": "Voron Switchwire 250 0.4 nozzle", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_klipper_common", | ||
| "printer_model": "Voron Switchwire 250", | ||
| "nozzle_diameter": [ | ||
| "0.4" | ||
| ], | ||
| "printable_area": [ | ||
| "0x0", | ||
| "250x0", | ||
| "250x210", | ||
| "0x210" | ||
| ], | ||
| "printable_height": "240" | ||
| } |
12 changes: 12 additions & 0 deletions
12
resources/profiles/Voron/machine/Voron Switchwire 250.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "type": "machine_model", | ||
| "name": "Voron Switchwire 250", | ||
| "model_id": "Voron_Switchwire_250", | ||
| "nozzle_diameter": "0.4", | ||
| "machine_tech": "FFF", | ||
| "family": "VoronDesign", | ||
| "bed_model": "", | ||
| "bed_texture": "voron_switchwire_logo.png", | ||
| "hotend_model": "", | ||
| "default_materials": "Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| { | ||
| "name": "Wanhao", | ||
| "version": "01.00.01.00", | ||
| "force_update": "0", | ||
| "description": "Wanhao configurations", | ||
| "machine_model_list": [ | ||
| { | ||
| "name": "Wanhao D12-300", | ||
| "sub_path": "machine/Wanhao D12-300.json" | ||
| } | ||
| ], | ||
| "process_list": [ | ||
| { | ||
| "name": "fdm_process_common", | ||
| "sub_path": "process/fdm_process_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_process_wanhao_common", | ||
| "sub_path": "process/fdm_process_wanhao_common.json" | ||
| }, | ||
| { | ||
| "name": "0.12mm Fine @Wanhao D12-300", | ||
| "sub_path": "process/0.12mm Fine @Wanhao D12-300.json" | ||
| }, | ||
| { | ||
| "name": "0.15mm Optimal @Wanhao D12-300", | ||
| "sub_path": "process/0.15mm Optimal @Wanhao D12-300.json" | ||
| }, | ||
| { | ||
| "name": "0.20mm Standard @Wanhao D12-300", | ||
| "sub_path": "process/0.20mm Standard @Wanhao D12-300.json" | ||
| }, | ||
| { | ||
| "name": "0.24mm Draft @Wanhao D12-300", | ||
| "sub_path": "process/0.24mm Draft @Wanhao D12-300.json" | ||
| } | ||
| ], | ||
| "filament_list": [ | ||
| { | ||
| "name": "fdm_filament_common", | ||
| "sub_path": "filament/fdm_filament_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pet", | ||
| "sub_path": "filament/fdm_filament_pet.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_pla", | ||
| "sub_path": "filament/fdm_filament_pla.json" | ||
| }, | ||
| { | ||
| "name": "fdm_filament_tpu", | ||
| "sub_path": "filament/fdm_filament_tpu.json" | ||
| }, | ||
| { | ||
| "name": "Wanhao Generic PETG", | ||
| "sub_path": "filament/Wanhao Generic PETG.json" | ||
| }, | ||
| { | ||
| "name": "Wanhao Generic PLA", | ||
| "sub_path": "filament/Wanhao Generic PLA.json" | ||
| }, | ||
| { | ||
| "name": "Wanhao Generic TPU", | ||
| "sub_path": "filament/Wanhao Generic TPU.json" | ||
| } | ||
| ], | ||
| "machine_list": [ | ||
| { | ||
| "name": "fdm_machine_common", | ||
| "sub_path": "machine/fdm_machine_common.json" | ||
| }, | ||
| { | ||
| "name": "fdm_wanhao_common", | ||
| "sub_path": "machine/fdm_wanhao_common.json" | ||
| }, | ||
| { | ||
| "name": "Wanhao D12-300 0.4 nozzle", | ||
| "sub_path": "machine/Wanhao D12-300 0.4 nozzle.json" | ||
| } | ||
| ] | ||
| } |
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.
48 changes: 48 additions & 0 deletions
48
resources/profiles/Wanhao/filament/Wanhao Generic PETG.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "GFG99", | ||
| "setting_id": "GFSG99", | ||
| "name": "Wanhao Generic PETG", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_pet", | ||
| "reduce_fan_stop_start_freq": [ | ||
| "1" | ||
| ], | ||
| "slow_down_for_layer_cooling": [ | ||
| "1" | ||
| ], | ||
| "fan_cooling_layer_time": [ | ||
| "30" | ||
| ], | ||
| "overhang_fan_speed": [ | ||
| "90" | ||
| ], | ||
| "overhang_fan_threshold": [ | ||
| "25%" | ||
| ], | ||
| "fan_max_speed": [ | ||
| "90" | ||
| ], | ||
| "fan_min_speed": [ | ||
| "40" | ||
| ], | ||
| "slow_down_min_speed": [ | ||
| "10" | ||
| ], | ||
| "slow_down_layer_time": [ | ||
| "8" | ||
| ], | ||
| "filament_flow_ratio": [ | ||
| "0.95" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "10" | ||
| ], | ||
| "filament_start_gcode": [ | ||
| "; filament start gcode\n" | ||
| ], | ||
| "compatible_printers": [ | ||
| "Wanhao D12-300 0.4 nozzle" | ||
| ] | ||
| } |
21 changes: 21 additions & 0 deletions
21
resources/profiles/Wanhao/filament/Wanhao Generic PLA.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "GFL99", | ||
| "setting_id": "GFSL99", | ||
| "name": "Wanhao Generic PLA", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_pla", | ||
| "filament_flow_ratio": [ | ||
| "0.98" | ||
| ], | ||
| "filament_max_volumetric_speed": [ | ||
| "12" | ||
| ], | ||
| "slow_down_layer_time": [ | ||
| "8" | ||
| ], | ||
| "compatible_printers": [ | ||
| "Wanhao D12-300 0.4 nozzle" | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
resources/profiles/Wanhao/filament/Wanhao Generic TPU.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "type": "filament", | ||
| "filament_id": "GFU99", | ||
| "setting_id": "GFSR99", | ||
| "name": "Wanhao Generic TPU", | ||
| "from": "system", | ||
| "instantiation": "true", | ||
| "inherits": "fdm_filament_tpu", | ||
| "filament_max_volumetric_speed": [ | ||
| "3.2" | ||
| ], | ||
| "filament_start_gcode": [ | ||
| "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" | ||
| ], | ||
| "compatible_printers": [ | ||
| "Wanhao D12-300 0.4 nozzle" | ||
| ] | ||
| } |
Oops, something went wrong.