From 139af504091df2fe7a227021df743bffddbecef1 Mon Sep 17 00:00:00 2001 From: Sebastian Andersson Date: Thu, 17 Oct 2024 19:43:37 +0200 Subject: [PATCH] Update the orca slicer templates Inherit the right material in the default template. Remove the PLA template. Set the pressure advance settings from extra.pressure_advance. Fix some formatting. --- templates-orcaslicer/ABS+.json.template | 26 ++++++--- templates-orcaslicer/ASA.json.template | 26 ++++++--- templates-orcaslicer/PLA.json.template | 68 ---------------------- templates-orcaslicer/TPU.json.template | 26 ++++++--- templates-orcaslicer/default.json.template | 28 +++++---- 5 files changed, 69 insertions(+), 105 deletions(-) delete mode 100644 templates-orcaslicer/PLA.json.template diff --git a/templates-orcaslicer/ABS+.json.template b/templates-orcaslicer/ABS+.json.template index 0e73414..f736a49 100644 --- a/templates-orcaslicer/ABS+.json.template +++ b/templates-orcaslicer/ABS+.json.template @@ -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}}" ], @@ -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" diff --git a/templates-orcaslicer/ASA.json.template b/templates-orcaslicer/ASA.json.template index bab008a..3613760 100644 --- a/templates-orcaslicer/ASA.json.template +++ b/templates-orcaslicer/ASA.json.template @@ -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}}" ], @@ -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" diff --git a/templates-orcaslicer/PLA.json.template b/templates-orcaslicer/PLA.json.template deleted file mode 100644 index 1b42f62..0000000 --- a/templates-orcaslicer/PLA.json.template +++ /dev/null @@ -1,68 +0,0 @@ -{ - "_comment": "Generated by {{sm2s.name}} {{sm2s.version}}", - "default_filament_colour": [ - "#{{color_hex}}" - ], - "filament_cost": [ - "{{price}}" - ], - "filament_spool_weight": [ - "{{spool_weight}}" - ], - "filament_type": [ - "{{material}}" - ], - "filament_diameter": [ - "{{diameter}}" - ], - "filament_density": [ - "{{density}}" - ], - "filament_flow_ratio": [ - "0.94" - ], - "filament_settings_id": [ - "{{id}}" - ], - "filament_start_gcode": [ - "SET_PRESSURE_ADVANCE ADVANCE={{extra.pressure_advance|default(0)|float}}\nASSERT_ACTIVE_FILAMENT ID={{id}}" - ], - "filament_vendor": [ - "{{vendor.name}}" - ], - "from": "User", - "inherits": "Voron Generic PLA", - "is_custom_defined": "0", - "name": "{{name}}", - "nozzle_temperature": [ - "{{settings_extruder_temp|int}}" - ], - "nozzle_temperature_initial_layer": [ - "{{settings_extruder_temp|int + 10}}" - ], - "cool_plate_temp" : [ - "{{settings_bed_temp|int}}" - ], - "eng_plate_temp" : [ - "{{settings_bed_temp|int}}" - ], - "hot_plate_temp" : [ - "{{settings_bed_temp|int}}" - ], - "textured_plate_temp" : [ - "{{settings_bed_temp|int}}" - ], - "cool_plate_temp_initial_layer" : [ - "{{settings_bed_temp|int + 10}}" - ], - "eng_plate_temp_initial_layer" : [ - "{{settings_bed_temp|int + 10}}" - ], - "hot_plate_temp_initial_layer" : [ - "{{settings_bed_temp|int + 10}}" - ], - "textured_plate_temp_initial_layer" : [ - "{{settings_bed_temp|int + 10}}" - ], - "version": "2.1.1.0" -} diff --git a/templates-orcaslicer/TPU.json.template b/templates-orcaslicer/TPU.json.template index bd7214e..ac215d1 100644 --- a/templates-orcaslicer/TPU.json.template +++ b/templates-orcaslicer/TPU.json.template @@ -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}}" ], @@ -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" diff --git a/templates-orcaslicer/default.json.template b/templates-orcaslicer/default.json.template index 1b42f62..6aa9ee7 100644 --- a/templates-orcaslicer/default.json.template +++ b/templates-orcaslicer/default.json.template @@ -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": [ @@ -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"