Skip to content

Commit

Permalink
Update the orca slicer templates
Browse files Browse the repository at this point in the history 
Inherit the right material in the default template.
Remove the PLA template.
Set the pressure advance settings from extra.pressure_advance.
Fix some formatting.
  • Loading branch information
@bofh69
bofh69 committed Oct 17, 2024
1 parent 8420f2b commit 6bf5995
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 105 deletions.
26 changes: 17 additions & 9 deletions templates-orcaslicer/ABS+.json.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,16 @@
"{{id}}"
],
"filament_start_gcode": [
"SET_PRESSURE_ADVANCE ADVANCE={{extra.pressure_advance|default(0)|float}}\nASSERT_ACTIVE_FILAMENT ID={{id}}"
"ASSERT_ACTIVE_FILAMENT ID={{id}}"
],
{% if extra.pressure_advance %}
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"{{extra.pressure_advance|default(0)|float}}"
],
{% endif %}
"filament_vendor": [
"{{vendor.name}}"
],
Expand All @@ -40,28 +48,28 @@
"nozzle_temperature_initial_layer": [
"{{settings_extruder_temp|int + 5}}"
],
"cool_plate_temp" : [
"cool_plate_temp": [
"{{settings_bed_temp|int}}"
],
"eng_plate_temp" : [
"eng_plate_temp": [
"{{settings_bed_temp|int}}"
],
"hot_plate_temp" : [
"hot_plate_temp": [
"{{settings_bed_temp|int}}"
],
"textured_plate_temp" : [
"textured_plate_temp": [
"{{settings_bed_temp|int}}"
],
"cool_plate_temp_initial_layer" : [
"cool_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"eng_plate_temp_initial_layer" : [
"eng_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"hot_plate_temp_initial_layer" : [
"hot_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"textured_plate_temp_initial_layer" : [
"textured_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"version": "2.1.1.0"
Expand Down
26 changes: 17 additions & 9 deletions templates-orcaslicer/ASA.json.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,16 @@
"{{id}}"
],
"filament_start_gcode": [
"SET_PRESSURE_ADVANCE ADVANCE={{extra.pressure_advance|default(0)|float}}\nASSERT_ACTIVE_FILAMENT ID={{id}}"
"ASSERT_ACTIVE_FILAMENT ID={{id}}"
],
{% if extra.pressure_advance %}
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"{{extra.pressure_advance|default(0)|float}}"
],
{% endif %}
"filament_vendor": [
"{{vendor.name}}"
],
Expand All @@ -40,28 +48,28 @@
"nozzle_temperature_initial_layer": [
"{{settings_extruder_temp|int + 5}}"
],
"cool_plate_temp" : [
"cool_plate_temp": [
"{{settings_bed_temp|int}}"
],
"eng_plate_temp" : [
"eng_plate_temp": [
"{{settings_bed_temp|int}}"
],
"hot_plate_temp" : [
"hot_plate_temp": [
"{{settings_bed_temp|int}}"
],
"textured_plate_temp" : [
"textured_plate_temp": [
"{{settings_bed_temp|int}}"
],
"cool_plate_temp_initial_layer" : [
"cool_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"eng_plate_temp_initial_layer" : [
"eng_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"hot_plate_temp_initial_layer" : [
"hot_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"textured_plate_temp_initial_layer" : [
"textured_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"version": "2.1.1.0"
Expand Down
68 changes: 0 additions & 68 deletions templates-orcaslicer/PLA.json.template
View file

This file was deleted.

26 changes: 17 additions & 9 deletions templates-orcaslicer/TPU.json.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,16 @@
"{{id}}"
],
"filament_start_gcode": [
"SET_PRESSURE_ADVANCE ADVANCE={{extra.pressure_advance|default(0)|float}}\nASSERT_ACTIVE_FILAMENT ID={{id}}"
"ASSERT_ACTIVE_FILAMENT ID={{id}}"
],
{% if extra.pressure_advance %}
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"{{extra.pressure_advance|default(0)|float}}"
],
{% endif %}
"filament_vendor": [
"{{vendor.name}}"
],
Expand All @@ -40,28 +48,28 @@
"nozzle_temperature_initial_layer": [
"{{settings_extruder_temp|int + 10}}"
],
"cool_plate_temp" : [
"cool_plate_temp": [
"{{settings_bed_temp|int}}"
],
"eng_plate_temp" : [
"eng_plate_temp": [
"{{settings_bed_temp|int}}"
],
"hot_plate_temp" : [
"hot_plate_temp": [
"{{settings_bed_temp|int}}"
],
"textured_plate_temp" : [
"textured_plate_temp": [
"{{settings_bed_temp|int}}"
],
"cool_plate_temp_initial_layer" : [
"cool_plate_temp_initial_layer": [
"{{settings_bed_temp|int}}"
],
"eng_plate_temp_initial_layer" : [
"eng_plate_temp_initial_layer": [
"{{settings_bed_temp|int}}"
],
"hot_plate_temp_initial_layer" : [
"hot_plate_temp_initial_layer": [
"{{settings_bed_temp|int}}"
],
"textured_plate_temp_initial_layer" : [
"textured_plate_temp_initial_layer": [
"{{settings_bed_temp|int}}"
],
"version": "2.1.1.0"
Expand Down
28 changes: 18 additions & 10 deletions templates-orcaslicer/default.json.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,21 @@
"{{id}}"
],
"filament_start_gcode": [
"SET_PRESSURE_ADVANCE ADVANCE={{extra.pressure_advance|default(0)|float}}\nASSERT_ACTIVE_FILAMENT ID={{id}}"
"ASSERT_ACTIVE_FILAMENT ID={{id}}"
],
{% if extra.pressure_advance %}
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"{{extra.pressure_advance|default(0)|float}}"
],
{% endif %}
"filament_vendor": [
"{{vendor.name}}"
],
"from": "User",
"inherits": "Voron Generic PLA",
"inherits": "Voron Generic {{material}}",
"is_custom_defined": "0",
"name": "{{name}}",
"nozzle_temperature": [
Expand All @@ -40,28 +48,28 @@
"nozzle_temperature_initial_layer": [
"{{settings_extruder_temp|int + 10}}"
],
"cool_plate_temp" : [
"cool_plate_temp": [
"{{settings_bed_temp|int}}"
],
"eng_plate_temp" : [
"eng_plate_temp": [
"{{settings_bed_temp|int}}"
],
"hot_plate_temp" : [
"hot_plate_temp": [
"{{settings_bed_temp|int}}"
],
"textured_plate_temp" : [
"textured_plate_temp": [
"{{settings_bed_temp|int}}"
],
"cool_plate_temp_initial_layer" : [
"cool_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"eng_plate_temp_initial_layer" : [
"eng_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"hot_plate_temp_initial_layer" : [
"hot_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"textured_plate_temp_initial_layer" : [
"textured_plate_temp_initial_layer": [
"{{settings_bed_temp|int + 10}}"
],
"version": "2.1.1.0"
Expand Down

0 comments on commit 6bf5995

Please sign in to comment.