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 new machines #8274

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ src/OrcaSlicer-doc/
**/.flatpak-builder/
resources/profiles/user/default
*.code-workspace
resources/profiles/Volumic/Thumbs.db
102 changes: 102 additions & 0 deletions resources/profiles/Volumic.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
"description": "VOLUMIC configurations",
"machine_model_list": [
{
"name": "EXO42 Performance",
"sub_path": "machine/EXO42 Performance.json"
},
{
"name": "EXO65 Performance",
"sub_path": "machine/EXO65 Performance.json"
},
{
"name": "SH65 Performance",
"sub_path": "machine/SH65 Performance.json"
},
{
"name": "EXO42",
"sub_path": "machine/EXO42.json"
},
Expand All @@ -21,6 +33,14 @@
"sub_path": "machine/VS30SC2.json"
},
{
"name": "VS30SC",
"sub_path": "machine/VS30SC.json"
},
{
"name": "VS30ULTRA",
"sub_path": "machine/VS30ULTRA.json"
},
{
"name": "VS30MK3",
"sub_path": "machine/VS30MK3.json"
},
Expand Down Expand Up @@ -117,7 +137,69 @@
{
"name": "Very high speed - 0.30mm",
"sub_path": "process/Very high speed - 0.30mm.json"
},

{
"name": "Normal performance - 0.10mm",
"sub_path": "process/Normal performance - 0.10mm.json"
},
{
"name": "Normal performance - 0.15mm",
"sub_path": "process/Normal performance - 0.15mm.json"
},
{
"name": "Normal performance - 0.20mm",
"sub_path": "process/Normal performance - 0.20mm.json"
},
{
"name": "Normal performance - 0.25mm",
"sub_path": "process/Normal performance - 0.25mm.json"
},
{
"name": "Normal performance - 0.30mm",
"sub_path": "process/Normal performance - 0.30mm.json"
},
{
"name": "High performance - 0.10mm",
"sub_path": "process/High performance - 0.10mm.json"
},
{
"name": "High performance - 0.15mm",
"sub_path": "process/High performance - 0.15mm.json"
},
{
"name": "High performance - 0.20mm",
"sub_path": "process/High performance - 0.20mm.json"
},
{
"name": "High performance - 0.25mm",
"sub_path": "process/High performance - 0.25mm.json"
},
{
"name": "High performance - 0.30mm",
"sub_path": "process/High performance - 0.30mm.json"
},
{
"name": "Full performance - 0.10mm",
"sub_path": "process/Full performance - 0.10mm.json"
},
{
"name": "Full performance - 0.15mm",
"sub_path": "process/Full performance - 0.15mm.json"
},
{
"name": "Full performance - 0.20mm",
"sub_path": "process/Full performance - 0.20mm.json"
},
{
"name": "Full performance - 0.25mm",
"sub_path": "process/Full performance - 0.25mm.json"
},
{
"name": "Full performance - 0.30mm",
"sub_path": "process/Full performance - 0.30mm.json"
}

],
"filament_list": [
{
Expand Down Expand Up @@ -202,6 +284,18 @@
"name": "fdm_volumic_common",
"sub_path": "machine/fdm_volumic_common.json"
},
{
"name": "EXO42 Performance (0.4 nozzle)",
"sub_path": "machine/EXO42 Performance (0.4 nozzle).json"
},
{
"name": "EXO65 Performance (0.6 nozzle)",
"sub_path": "machine/EXO65 Performance (0.6 nozzle).json"
},
{
"name": "SH65 Performance (0.4 nozzle)",
"sub_path": "machine/SH65 Performance (0.4 nozzle).json"
},
{
"name": "EXO42 (0.4 nozzle)",
"sub_path": "machine/EXO42 (0.4 nozzle).json"
Expand All @@ -218,6 +312,14 @@
"name": "VS30SC2 (0.4 nozzle)",
"sub_path": "machine/VS30SC2 (0.4 nozzle).json"
},
{
"name": "VS30SC (0.4 nozzle)",
"sub_path": "machine/VS30SC (0.4 nozzle).json"
},
{
"name": "VS30ULTRA (0.4 nozzle)",
"sub_path": "machine/VS30ULTRA (0.4 nozzle).json"
},
{
"name": "VS30MK3 (0.4 nozzle)",
"sub_path": "machine/VS30MK3 (0.4 nozzle).json"
Expand Down
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.
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/Volumic/VS20MK2_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/Volumic/VS30MK2_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/Volumic/VS30SC_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/Volumic/VS30ULTRA_cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic ABS Ultra.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic ASA Ultra.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic NYLON Ultra.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic PC.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic PETG Ultra.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic PLA Ultra.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
5 changes: 5 additions & 0 deletions resources/profiles/Volumic/filament/Volumic PVA.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
"EXO42 (0.4 nozzle)",
"EXO65 (0.6 nozzle)",
"SH65 (0.4 nozzle)",
"EXO42 Performance (0.4 nozzle)",
"EXO65 Performance (0.6 nozzle)",
"SH65 Performance (0.4 nozzle)",
"VS30MK3 (0.4 nozzle)",
"VS30SC2 (0.4 nozzle)",
"VS30SC (0.4 nozzle)",
"VS30ULTRA (0.4 nozzle)",
"VS30MK2 (0.4 nozzle)",
"VS20MK2 (0.4 nozzle)"
]
Expand Down
9 changes: 9 additions & 0 deletions resources/profiles/Volumic/machine/EXO42 (0.4 nozzle).json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
"machine_max_jerk_x": ["0"],
"machine_max_jerk_y": ["0"],
"machine_max_jerk_z": ["0"],
"default_acceleration": ["0"],
"outer_wall_acceleration": ["0"],
"inner_wall_acceleration": ["0"],
"bridge_acceleration": ["0"],
"sparse_infill_acceleration": ["0"],
"internal_solid_infill_acceleration": ["0"],
"initial_layer_acceleration": ["0"],
"top_surface_acceleration": ["0"],
"travel_acceleration": ["0"],

"machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y419 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression",
"before_layer_change_gcode": "G92 E0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "EXO42 Performance (0.4 nozzle)",
"from": "system",
"instantiation": "true",
"inherits": "fdm_volumic_common",
"printer_model": "EXO42 Performance",
"default_print_profile": "Performance 150 - 0.15mm",
"host_type": "octoprint",
"print_host": "192.168.0.60",
"nozzle_diameter": ["0.4"],
"printable_area": ["0x0","420x0","420x420","0x420"],
"printable_height": "420",
"nozzle_type": "undefine",
"auxiliary_fan": "0",
"gcode_flavor": "klipper",
"max_layer_height": ["0.3"],
"min_layer_height": ["0.025"],
"printer_variant": "0.4",
"retraction_minimum_travel": ["1"],
"retraction_length": ["2.4"],
"retraction_speed": ["30"],
"deretraction_speed": ["30"],

"machine_max_acceleration_e": ["0"],
"machine_max_acceleration_extruding": ["0"],
"machine_max_acceleration_retracting": ["0"],
"machine_max_acceleration_x": ["0"],
"machine_max_acceleration_y": ["0"],
"machine_max_acceleration_z": ["0"],
"machine_max_speed_e": ["0"],
"machine_max_speed_x": ["0"],
"machine_max_speed_y": ["0"],
"machine_max_speed_z": ["0"],
"machine_max_jerk_e": ["0"],
"machine_max_jerk_x": ["0"],
"machine_max_jerk_y": ["0"],
"machine_max_jerk_z": ["0"],
"default_acceleration": ["0"],
"outer_wall_acceleration": ["0"],
"inner_wall_acceleration": ["0"],
"bridge_acceleration": ["0"],
"sparse_infill_acceleration": ["0"],
"internal_solid_infill_acceleration": ["0"],
"initial_layer_acceleration": ["0"],
"top_surface_acceleration": ["0"],
"travel_acceleration": ["0"],

"machine_start_gcode": "START_PRINT BED=[first_layer_bed_temperature] EXTRUDER=[first_layer_temperature]",
"before_layer_change_gcode": "G92 E0",
"machine_end_gcode": "END_PRINT"
}
10 changes: 10 additions & 0 deletions resources/profiles/Volumic/machine/EXO42 Performance.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "machine_model",
"name": "EXO42 Performance",
"model_id": "V420K",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VOLUMIC",
"bed_model": "EXO42_bed.STL",
"default_materials": "Volumic PLA Ultra"
}
9 changes: 9 additions & 0 deletions resources/profiles/Volumic/machine/EXO65 (0.6 nozzle).json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
"machine_max_jerk_x": ["0"],
"machine_max_jerk_y": ["0"],
"machine_max_jerk_z": ["0"],
"default_acceleration": ["0"],
"outer_wall_acceleration": ["0"],
"inner_wall_acceleration": ["0"],
"bridge_acceleration": ["0"],
"sparse_infill_acceleration": ["0"],
"internal_solid_infill_acceleration": ["0"],
"initial_layer_acceleration": ["0"],
"top_surface_acceleration": ["0"],
"travel_acceleration": ["0"],

"machine_start_gcode": "M117 Demarrage\nM106 S0\nM140 S[first_layer_bed_temperature]\nM104 T0 S[first_layer_temperature]\nG28\nG90\nM82\nG92 E0\nG1 Z5 F600\nG1 X1 Y649 F6000\nM109 T0 S[first_layer_temperature]\nM300 P350\nG92 E0\nM117 Impression",
"before_layer_change_gcode": "G92 E0",
Expand Down
Loading
Loading