From 29df0d7700fbdfe0528b65ba535ed8354e910712 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 29 Nov 2020 16:05:04 +0100 Subject: [PATCH] #730 remove G92 from layer change --- resources/profiles/Basic.ini | 4 ++-- resources/profiles/Creality.idx | 1 + resources/profiles/Creality.ini | 4 ++-- resources/profiles/PrusaResearch.idx | 1 + resources/profiles/PrusaResearch.ini | 4 ++-- resources/profiles/TriLAB.idx | 1 + resources/profiles/TriLAB.ini | 4 ++-- src/slic3r/GUI/ConfigWizard.cpp | 4 ++-- src/slic3r/GUI/Preferences.cpp | 8 ++++---- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/resources/profiles/Basic.ini b/resources/profiles/Basic.ini index 4db48508a..5288639ef 100644 --- a/resources/profiles/Basic.ini +++ b/resources/profiles/Basic.ini @@ -5,7 +5,7 @@ name = Custom # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the Slic3r configuration to be downgraded. -config_version = 0.1.2 +config_version = 0.1.3 # Where to get the updates from? config_update_url = @@ -35,7 +35,7 @@ thumbnail = Basic_thumbnail.png end_gcode = G1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X195 Y1\nG1 X190 E4\nG1 F4000\nG1 X180 E2.7 \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3 \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0 ; home X axis\nM84 ; disable motors\n\n extruder_offset = 0x0 gcode_flavor = marlin -before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n +before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\n\n layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z] pressure_advance = 0 retract_before_travel = 1 diff --git a/resources/profiles/Creality.idx b/resources/profiles/Creality.idx index 066a84bc3..7ee9c0b98 100644 --- a/resources/profiles/Creality.idx +++ b/resources/profiles/Creality.idx @@ -1,4 +1,5 @@ min_slic3r_version = 2.3.0-alpha2 +0.1.8 Fix G92 that mess up not-relative printer. 0.1.7 Updated start g-code for Creality printers 0.0.6 Added filament profiles, adjusted temperatures, updated start g-code for some models. 0.0.5 Added 0.08mm SUPERDETAIL and 0.28mm SUPERDRAFT print profiles. Updated OPTIMAL print profile. diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 7b8c63be9..f23e21b7a 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -5,7 +5,7 @@ name = Creality # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 0.1.7 +config_version = 0.1.8 # Where to get the updates from? config_update_url = # https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/ @@ -584,7 +584,7 @@ filament_colour = #FFE200 # Common printer preset [printer:*common*] printer_technology = FFF -before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n +before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\n\n between_objects_gcode = pause_print_gcode = deretract_speed = 0 diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index 9ab1dee33..379a32d65 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,4 +1,5 @@ min_slic3r_version = 2.3.0-beta0 +1.2.1-beta0 remove G92 in layer change, as it's not understand by the slicer. 1.2.0-beta0 Adjusted infill anchor limits. Added filament spool weights. min_slic3r_version = 2.3.0-alpha4 1.2.0-alpha1 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles. diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini index 838df7021..4e967ed2d 100644 --- a/resources/profiles/PrusaResearch.ini +++ b/resources/profiles/PrusaResearch.ini @@ -9,7 +9,7 @@ technologies = FFF; SLA # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 1.2.0-beta0 +config_version = 1.2.1-beta0 # Where to get the updates from? config_update_url = changelog_url = @@ -4966,7 +4966,7 @@ material_vendor = Made for Prusa [printer:*common*] printer_technology = FFF bed_shape = 0x0,250x0,250x210,0x210 -before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n +before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z]\n\n between_objects_gcode = deretract_speed = 0 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM900 K0 ; reset LA\nM84 ; disable motors diff --git a/resources/profiles/TriLAB.idx b/resources/profiles/TriLAB.idx index 1cf505da2..f714a2a39 100644 --- a/resources/profiles/TriLAB.idx +++ b/resources/profiles/TriLAB.idx @@ -1,4 +1,5 @@ min_slic3r_version = 2.3.0-alpha3 +0.0.4-1 remove g92 0.0.4 Added PLA, PETG profiles for 0.8 nozzle, update print materials 0.0.3 Added DeltiQ 2, DeltiQ 2 Plus printers, 0.10mm, 0.20mm FLEX print profiles, updated print materials, flexprint extension support min_slic3r_version = 2.3.0-alpha0 diff --git a/resources/profiles/TriLAB.ini b/resources/profiles/TriLAB.ini index 959190e35..cfb42151b 100644 --- a/resources/profiles/TriLAB.ini +++ b/resources/profiles/TriLAB.ini @@ -6,7 +6,7 @@ name = TriLAB # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 0.0.4 +config_version = 0.0.4-1 # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/TriLAB/ # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -701,7 +701,7 @@ filament_type = TPU98A [printer:*DeltiQ*] inherits = bed_shape = 124.315x13.0661,122.268x25.989,118.882x38.6271,114.193x50.8421,108.253x62.5,101.127x73.4732,92.8931x83.6413,83.6413x92.8931,73.4732x101.127,62.5x108.253,50.8421x114.193,38.6271x118.882,25.989x122.268,13.0661x124.315,3.54096e-014x125,-13.0661x124.315,-25.989x122.268,-38.6271x118.882,-50.8421x114.193,-62.5x108.253,-73.4732x101.127,-83.6413x92.8931,-92.8931x83.6413,-101.127x73.4732,-108.253x62.5,-114.193x50.8421,-118.882x38.6271,-122.268x25.989,-124.315x13.0661,-125x7.08192e-014,-124.315x-13.0661,-122.268x-25.989,-118.882x-38.6271,-114.193x-50.8421,-108.253x-62.5,-101.127x-73.4732,-92.8931x-83.6413,-83.6413x-92.8931,-73.4732x-101.127,-62.5x-108.253,-50.8421x-114.193,-38.6271x-118.882,-25.989x-122.268,-13.0661x-124.315,-2.29621e-014x-125,13.0661x-124.315,25.989x-122.268,38.6271x-118.882,50.8421x-114.193,62.5x-108.253,73.4732x-101.127,83.6413x-92.8931,92.8931x-83.6413,101.127x-73.4732,108.253x-62.5,114.193x-50.8421,118.882x-38.6271,122.268x-25.989,124.315x-13.0661,125x-1.41638e-013 -before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z] +before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;[layer_z] between_objects_gcode = cooling_tube_length = 5 cooling_tube_retraction = 91.5 diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 66c3e9421..862bc6ef3 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1190,8 +1190,8 @@ PageReloadFromDisk::PageReloadFromDisk(ConfigWizard* parent) PageFilesAssociation::PageFilesAssociation(ConfigWizard* parent) : ConfigWizardPage(parent, _L("Files association"), _L("Files association")) { - cb_3mf = new wxCheckBox(this, wxID_ANY, _L("Associate .3mf files to PrusaSlicer")); - cb_stl = new wxCheckBox(this, wxID_ANY, _L("Associate .stl files to PrusaSlicer")); + cb_3mf = new wxCheckBox(this, wxID_ANY, _L("Associate .3mf files to SuperSlicer")); + cb_stl = new wxCheckBox(this, wxID_ANY, _L("Associate .stl files to SuperSlicer")); // cb_gcode = new wxCheckBox(this, wxID_ANY, _L("Associate .gcode files to PrusaSlicer G-code Viewer")); append(cb_3mf); diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 9b8148a51..5e706a48e 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -88,16 +88,16 @@ void PreferencesDialog::build() #if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN #ifdef _WIN32 // Please keep in sync with ConfigWizard - def.label = L("Associate .3mf files to PrusaSlicer"); + def.label = L("Associate .3mf files to SuperSlicer"); def.type = coBool; - def.tooltip = L("If enabled, sets PrusaSlicer as default application to open .3mf files."); + def.tooltip = L("If enabled, sets SuperSlicer as default application to open .3mf files."); def.set_default_value(new ConfigOptionBool(app_config->get("associate_3mf") == "1")); option = Option(def, "associate_3mf"); m_optgroup_general->append_single_option_line(option); - def.label = L("Associate .stl files to PrusaSlicer"); + def.label = L("Associate .stl files to SuperSlicer"); def.type = coBool; - def.tooltip = L("If enabled, sets PrusaSlicer as default application to open .stl files."); + def.tooltip = L("If enabled, sets SuperSlicer as default application to open .stl files."); def.set_default_value(new ConfigOptionBool(app_config->get("associate_stl") == "1")); option = Option(def, "associate_stl"); m_optgroup_general->append_single_option_line(option);