v3.14.2

- **PrusaSlicer printers:** - (Add) Elegoo Mars 4 Ultra - (Add) Elegoo Saturn 3 - (Add) Elegoo Saturn 3 Ultra - (Fix) AnyCubic file format: Retract speed (slow/fast) variables was swapped (#722)
sn4k3 · Jun 7, 2023 · 92fb2bc · 92fb2bc
1 parent 32ccf55
commit 92fb2bc
Show file tree

Hide file tree

Showing 15 changed files with 284 additions and 158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 07/06/2023 - v3.14.2
+
+- **PrusaSlicer printers:**
+  - (Add) Elegoo Mars 4 Ultra
+  - (Add) Elegoo Saturn 3
+  - (Add) Elegoo Saturn 3 Ultra
+- (Fix) AnyCubic file format: Retract speed (slow/fast) variables was swapped (#722)
+
 ## 03/06/2023 - v3.14.1
 
 - (Improvement) File formats: When full encoding make sure thumbnails are all set according to file, otherwise clone/create them

diff --git a/CREDITS.md b/CREDITS.md
@@ -76,4 +76,5 @@
 - Steven Woodward
 - Piotr Czerkasow
 - Kevin Bullmann
-- Robert Redden
+- Robert Redden
+- Nick Spirov
diff --git a/PrusaSlicer/printer/Elegoo Mars 4 Ultra.ini b/PrusaSlicer/printer/Elegoo Mars 4 Ultra.ini
@@ -0,0 +1,42 @@
+# generated by PrusaSlicer 2.5.2+win64 on 2023-06-06 at 16:47:15 UTC
+absolute_correction = 0
+area_fill = 50
+bed_custom_model = 
+bed_custom_texture = 
+bed_shape = 0x0,153.36x0,153.36x77.76,0x77.76
+default_sla_material_profile = Prusa Orange Tough 0.05
+default_sla_print_profile = 0.05 Normal
+display_height = 77.76
+display_mirror_x = 1
+display_mirror_y = 0
+display_orientation = landscape
+display_pixels_x = 8520
+display_pixels_y = 4320
+display_width = 153.36
+elefant_foot_compensation = 0.2
+elefant_foot_min_width = 0.2
+fast_tilt_time = 5
+gamma_correction = 1
+high_viscosity_tilt_time = 10
+host_type = octoprint
+inherits = Original Prusa SL1
+max_exposure_time = 120
+max_initial_exposure_time = 300
+max_print_height = 165
+min_exposure_time = 1
+min_initial_exposure_time = 1
+print_host = 
+printer_model = SL1
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ELEGOO\nPRINTER_MODEL_MARS4_ULTRA\nFILEFORMAT_GOO\n\nSTART_CUSTOM_VALUES\nBottomWaitTimeBeforeCure_3\nWaitTimeBeforeCure_2.5\nBottomWaitTimeAfterCure_3\nWaitTimeAfterCure_1\nBottomLiftHeight_7\nLiftHeight_5\nBottomLiftSpeed_80\nLiftSpeed_100\nBottomWaitTimeAfterLift_0\nWaitTimeAfterLift_0\nRetractSpeed_150\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES
+printer_settings_id = 
+printer_technology = SLA
+printer_variant = default
+printer_vendor = 
+printhost_apikey = 
+printhost_cafile = 
+relative_correction = 1,1
+relative_correction_x = 1
+relative_correction_y = 1
+relative_correction_z = 1
+slow_tilt_time = 8
+thumbnails = 290x290,116x116
diff --git a/PrusaSlicer/printer/Elegoo Saturn 2.ini b/PrusaSlicer/printer/Elegoo Saturn 2.ini
@@ -1,4 +1,4 @@
-# generated by PrusaSlicer 2.5.0+win64 on 2022-10-12 at 19:38:31 UTC
+# generated by PrusaSlicer 2.5.2+win64 on 2023-06-06 at 17:10:18 UTC
 absolute_correction = 0
 area_fill = 50
 bed_custom_model = 
@@ -27,7 +27,7 @@ min_exposure_time = 1
 min_initial_exposure_time = 1
 print_host = 
 printer_model = SL1
-printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ELEGOO\nPRINTER_MODEL_SATURN_2\nFILEFORMAT_ENCRYPTED.CTB\n\nSTART_CUSTOM_VALUES\nLightOffDelay_0\nBottomLightOffDelay_0\nBottomLiftHeight_7\nLiftHeight_7\nBottomLiftSpeed_70\nLiftSpeed_70\nRetractSpeed_210\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ELEGOO\nPRINTER_MODEL_SATURN2\nFILEFORMAT_ENCRYPTED.CTB\n\nSTART_CUSTOM_VALUES\nLightOffDelay_0\nBottomLightOffDelay_0\nBottomLiftHeight_7\nLiftHeight_7\nBottomLiftSpeed_70\nLiftSpeed_70\nRetractSpeed_210\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES
 printer_settings_id = 
 printer_technology = SLA
 printer_variant = default

diff --git a/PrusaSlicer/printer/Elegoo Saturn 3 Ultra.ini b/PrusaSlicer/printer/Elegoo Saturn 3 Ultra.ini
@@ -0,0 +1,42 @@
+# generated by PrusaSlicer 2.5.2+win64 on 2023-06-06 at 17:10:08 UTC
+absolute_correction = 0
+area_fill = 50
+bed_custom_model = 
+bed_custom_texture = 
+bed_shape = 0x0,218.88x0,218.88x122.88,0x122.88
+default_sla_material_profile = Prusa Orange Tough 0.05
+default_sla_print_profile = 0.05 Normal
+display_height = 122.88
+display_mirror_x = 1
+display_mirror_y = 0
+display_orientation = landscape
+display_pixels_x = 11520
+display_pixels_y = 5120
+display_width = 218.88
+elefant_foot_compensation = 0.2
+elefant_foot_min_width = 0.2
+fast_tilt_time = 5
+gamma_correction = 1
+high_viscosity_tilt_time = 10
+host_type = octoprint
+inherits = Original Prusa SL1
+max_exposure_time = 120
+max_initial_exposure_time = 300
+max_print_height = 260
+min_exposure_time = 1
+min_initial_exposure_time = 1
+print_host = 
+printer_model = SL1
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ELEGOO\nPRINTER_MODEL_SATURN3_ULTRA\nFILEFORMAT_GOO\n\nSTART_CUSTOM_VALUES\nLightOffDelay_0\nBottomLightOffDelay_0\nBottomLiftHeight_7\nLiftHeight_7\nBottomLiftSpeed_70\nLiftSpeed_70\nRetractSpeed_210\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES
+printer_settings_id = 
+printer_technology = SLA
+printer_variant = default
+printer_vendor = 
+printhost_apikey = 
+printhost_cafile = 
+relative_correction = 1,1
+relative_correction_x = 1
+relative_correction_y = 1
+relative_correction_z = 1
+slow_tilt_time = 8
+thumbnails = 290x290,116x116
diff --git a/PrusaSlicer/printer/Elegoo Saturn 3.ini b/PrusaSlicer/printer/Elegoo Saturn 3.ini
@@ -0,0 +1,42 @@
+# generated by PrusaSlicer 2.5.2+win64 on 2023-06-06 at 17:10:13 UTC
+absolute_correction = 0
+area_fill = 50
+bed_custom_model = 
+bed_custom_texture = 
+bed_shape = 0x0,218.88x0,218.88x122.88,0x122.88
+default_sla_material_profile = Prusa Orange Tough 0.05
+default_sla_print_profile = 0.05 Normal
+display_height = 122.88
+display_mirror_x = 1
+display_mirror_y = 0
+display_orientation = landscape
+display_pixels_x = 11520
+display_pixels_y = 5120
+display_width = 218.88
+elefant_foot_compensation = 0.2
+elefant_foot_min_width = 0.2
+fast_tilt_time = 5
+gamma_correction = 1
+high_viscosity_tilt_time = 10
+host_type = octoprint
+inherits = Original Prusa SL1
+max_exposure_time = 120
+max_initial_exposure_time = 300
+max_print_height = 249.7
+min_exposure_time = 1
+min_initial_exposure_time = 1
+print_host = 
+printer_model = SL1
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ELEGOO\nPRINTER_MODEL_SATURN3\nFILEFORMAT_GOO\n\nSTART_CUSTOM_VALUES\nLightOffDelay_0\nBottomLightOffDelay_0\nBottomLiftHeight_7\nLiftHeight_7\nBottomLiftSpeed_70\nLiftSpeed_70\nRetractSpeed_210\nBottomLightPWM_255\nLightPWM_255\nEND_CUSTOM_VALUES
+printer_settings_id = 
+printer_technology = SLA
+printer_variant = default
+printer_vendor = 
+printhost_apikey = 
+printhost_cafile = 
+relative_correction = 1,1
+relative_correction_x = 1
+relative_correction_y = 1
+relative_correction_z = 1
+slow_tilt_time = 8
+thumbnails = 290x290,116x116
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
-- (Improvement) File formats: When full encoding make sure thumbnails are all set according to file, otherwise clone/create them
-- (Fix) Encrypted CTB: Files are getting read/write without thumbnails making invalid files
+- **PrusaSlicer printers:**
+  - (Add) Elegoo Mars 4 Ultra
+  - (Add) Elegoo Saturn 3
+  - (Add) Elegoo Saturn 3 Ultra
+- (Fix) AnyCubic file format: Retract speed (slow/fast) variables was swapped (#722)
 
diff --git a/Scripts/010 Editor/PhotonWorkshop.bt b/Scripts/010 Editor/PhotonWorkshop.bt
@@ -191,20 +191,20 @@ if(fileMark.Version >= 516 && fileMark.ExtraAddress > 0){
     FSeek(fileMark.ExtraAddress);
     struct EXTRA {
         SECTION section;
-        uint BottomStateNumber <fgcolor=cBlack, bgcolor=cRed>; // 2
-        float BottomLiftHeight0 <fgcolor=cBlack, bgcolor=cGreen>;
-        float BottomLiftSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;
-        float BottomRetractSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;
-        float BottomLiftHeight1 <fgcolor=cBlack, bgcolor=cGreen>;
-        float BottomLiftSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;
-        float BottomRetractSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;
-        uint StateNumber <fgcolor=cBlack, bgcolor=cGreen>; // 2
-        float LiftHeight0 <fgcolor=cBlack, bgcolor=cGreen>;
-        float LiftSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;
-        float RetractSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;
-        float LiftHeight1 <fgcolor=cBlack, bgcolor=cGreen>;
-        float LiftSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;
-        float RetractSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;
+        uint BottomLiftCount <fgcolor=cBlack, bgcolor=cRed>; // 2
+        float BottomLiftHeight0 <fgcolor=cBlack, bgcolor=cGreen>;   // Slow
+        float BottomLiftSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;    // Slow
+        float BottomRetractSpeed0 <fgcolor=cBlack, bgcolor=cGreen>; // Slow
+        float BottomLiftHeight1 <fgcolor=cBlack, bgcolor=cGreen>;   // Fast
+        float BottomLiftSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;    // Fast
+        float BottomRetractSpeed1 <fgcolor=cBlack, bgcolor=cGreen>; // Fast
+        uint NormalLiftCount <fgcolor=cBlack, bgcolor=cGreen>; // 2
+        float LiftHeight0 <fgcolor=cBlack, bgcolor=cGreen>;     // Slow
+        float LiftSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;      // Slow
+        float RetractSpeed0 <fgcolor=cBlack, bgcolor=cGreen>;   // Slow
+        float LiftHeight1 <fgcolor=cBlack, bgcolor=cGreen>;     // Fast
+        float LiftSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;      // Fast
+        float RetractSpeed1 <fgcolor=cBlack, bgcolor=cGreen>;   // Fast
     } extra;
 }
 

diff --git a/UVtools.Core/FileFormats/FileFormat.cs b/UVtools.Core/FileFormats/FileFormat.cs
@@ -2670,8 +2670,8 @@ public string RetractRepresentation
         {
             var str = string.Empty;
 
-            var haveBottomRetractHeight = CanUseLiftHeight;
-            var haveRetractHeight = CanUseBottomLiftHeight;
+            var haveBottomRetractHeight = CanUseBottomLiftHeight;
+            var haveRetractHeight = CanUseLiftHeight;
             var haveBottomRetractSpeed = CanUseBottomRetractSpeed;
             var haveRetractSpeed = CanUseRetractSpeed;
             var haveBottomRetractHeight2 = CanUseBottomRetractHeight2;
@@ -2724,34 +2724,7 @@ public string RetractRepresentation
             }
 
             str += "mm/min";
-
-            // Sequence 2
-            /*if (haveBottomRetractHeight2)
-            {
-                str += $"\n2th: {BottomRetractHeight2.ToString(CultureInfo.InvariantCulture)}";
-            }
-            if (haveRetractHeight2)
-            {
-                str += str.EndsWith("mm/min") ? "\n2th: " : '/';
-                str += RetractHeight2.ToString(CultureInfo.InvariantCulture);
-            }
-
-            if (str.EndsWith("mm/min")) return str;
-
-            str += "mm @ ";
-
-            if (haveBottomRetractSpeed2)
-            {
-                str += BottomRetractSpeed2.ToString(CultureInfo.InvariantCulture);
-            }
-            if (haveRetractSpeed2)
-            {
-                if (haveBottomRetractSpeed2) str += '/';
-                str += RetractSpeed2.ToString(CultureInfo.InvariantCulture);
-            }
-
-            str += "mm/min";*/
-
+
             return str;
         }
     }

diff --git a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
@@ -521,20 +521,20 @@ public class Extra : AnycubicNamedTable
     {
         protected override string DefaultTableName => "EXTRA";
 
-        [FieldOrder(2)] public uint BottomStateNumber { get; set; } = 2;
-        [FieldOrder(3)] public float BottomLiftHeight1 { get; set; }
-        [FieldOrder(4)] public float BottomLiftSpeed1 { get; set; } = SpeedConverter.Convert(DefaultBottomLiftSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(5)] public float BottomRetractSpeed1 { get; set; } = SpeedConverter.Convert(DefaultBottomRetractSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(6)] public float BottomLiftHeight2 { get; set; }
-        [FieldOrder(7)] public float BottomLiftSpeed2 { get; set; } = SpeedConverter.Convert(DefaultBottomLiftSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(8)] public float BottomRetractSpeed2 { get; set; } = SpeedConverter.Convert(DefaultBottomRetractSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(9)] public uint StateNumber { get; set; } = 2;
-        [FieldOrder(10)] public float LiftHeight1 { get; set; }
-        [FieldOrder(11)] public float LiftSpeed1 { get; set; } = SpeedConverter.Convert(DefaultLiftSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(12)] public float RetractSpeed1 { get; set; } = SpeedConverter.Convert(DefaultRetractSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(13)] public float LiftHeight2 { get; set; }
-        [FieldOrder(14)] public float LiftSpeed2 { get; set; } = SpeedConverter.Convert(DefaultLiftSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
-        [FieldOrder(15)] public float RetractSpeed2 { get; set; } = SpeedConverter.Convert(DefaultRetractSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(0)] public uint BottomLiftCount { get; set; } = 2;
+        [FieldOrder(1)] public float BottomLiftHeight1 { get; set; }
+        [FieldOrder(2)] public float BottomLiftSpeed1 { get; set; } = SpeedConverter.Convert(DefaultBottomLiftSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(3)] public float BottomRetractSpeed2 { get; set; } = SpeedConverter.Convert(DefaultBottomRetractSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(4)] public float BottomLiftHeight2 { get; set; }
+        [FieldOrder(5)] public float BottomLiftSpeed2 { get; set; } = SpeedConverter.Convert(DefaultBottomLiftSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(6)] public float BottomRetractSpeed1 { get; set; } = SpeedConverter.Convert(DefaultBottomRetractSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(7)] public uint NormalLiftCount { get; set; } = 2;
+        [FieldOrder(8)] public float LiftHeight1 { get; set; }
+        [FieldOrder(9)] public float LiftSpeed1 { get; set; } = SpeedConverter.Convert(DefaultLiftSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(10)] public float RetractSpeed2 { get; set; } = SpeedConverter.Convert(DefaultRetractSpeed, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(11)] public float LiftHeight2 { get; set; }
+        [FieldOrder(12)] public float LiftSpeed2 { get; set; } = SpeedConverter.Convert(DefaultLiftSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
+        [FieldOrder(13)] public float RetractSpeed1 { get; set; } = SpeedConverter.Convert(DefaultRetractSpeed2, CoreSpeedUnit, SpeedUnit.MillimetersPerSecond);
 
         public Extra()
         {
@@ -543,7 +543,7 @@ public Extra()
 
         public override string ToString()
         {
-            return $"{base.ToString()}, {nameof(BottomStateNumber)}: {BottomStateNumber}, {nameof(BottomLiftHeight1)}: {BottomLiftHeight1}, {nameof(BottomLiftSpeed1)}: {BottomLiftSpeed1}, {nameof(BottomRetractSpeed1)}: {BottomRetractSpeed1}, {nameof(BottomLiftHeight2)}: {BottomLiftHeight2}, {nameof(BottomLiftSpeed2)}: {BottomLiftSpeed2}, {nameof(BottomRetractSpeed2)}: {BottomRetractSpeed2}, {nameof(StateNumber)}: {StateNumber}, {nameof(LiftHeight1)}: {LiftHeight1}, {nameof(LiftSpeed1)}: {LiftSpeed1}, {nameof(RetractSpeed1)}: {RetractSpeed1}, {nameof(LiftHeight2)}: {LiftHeight2}, {nameof(LiftSpeed2)}: {LiftSpeed2}, {nameof(RetractSpeed2)}: {RetractSpeed2}";
+            return $"{base.ToString()}, {nameof(BottomLiftCount)}: {BottomLiftCount}, {nameof(BottomLiftHeight1)}: {BottomLiftHeight1}, {nameof(BottomLiftSpeed1)}: {BottomLiftSpeed1}, {nameof(BottomRetractSpeed1)}: {BottomRetractSpeed1}, {nameof(BottomLiftHeight2)}: {BottomLiftHeight2}, {nameof(BottomLiftSpeed2)}: {BottomLiftSpeed2}, {nameof(BottomRetractSpeed2)}: {BottomRetractSpeed2}, {nameof(NormalLiftCount)}: {NormalLiftCount}, {nameof(LiftHeight1)}: {LiftHeight1}, {nameof(LiftSpeed1)}: {LiftSpeed1}, {nameof(RetractSpeed1)}: {RetractSpeed1}, {nameof(LiftHeight2)}: {LiftHeight2}, {nameof(LiftSpeed2)}: {LiftSpeed2}, {nameof(RetractSpeed2)}: {RetractSpeed2}";
         }
     }
     #endregion