Merge remote-tracking branch 'origin/main' into CURA-10972_fix_hang_serial

.github/workflows/installers.yml

@@ -24,59 +24,292 @@ on:
                 default: false
                 required: true
                 type: boolean
+            nightly:
+                description: 'Upload to nightly release'
+                default: false
+                required: true
+                type: boolean
+            os_list:
+                description: 'List of OS(-variant)s to build for'
+                default: "windows, linux-modern, linux-legacy, macos-x64, macos-arm64"
+                required: true
+                type: string
+    schedule:
+        # Daily at 5:20 CET
+        -   cron: '20 4 * * *'
+
+env:
+    CURA_CONAN_VERSION: ${{ inputs.cura_conan_version || 'cura/latest@ultimaker/testing' }}
+    CONAN_ARGS: ${{ inputs.conan_args || '' }}
+    ENTERPRISE: ${{ inputs.enterprise || false }}
+    STAGING: ${{ inputs.staging || false }}
+    OS_LIST: ${{ inputs.os_list || 'windows, linux-modern, linux-legacy, macos-x64, macos-arm64' }}
 
 jobs:
     windows-installer:
+        if: ${{ contains(github.event.inputs.os_list, 'windows') || github.event_name == 'schedule' }}
         uses: ./.github/workflows/windows.yml
         with:
-            cura_conan_version: ${{ inputs.cura_conan_version }}
-            conan_args: ${{ inputs.conan_args }}
-            enterprise: ${{ inputs.enterprise }}
-            staging: ${{ inputs.staging }}
+            cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }}
+            conan_args: ${{ github.event.inputs.conan_args }}
+            enterprise: ${{ github.event.inputs.enterprise == 'true' }}
+            staging: ${{ github.event.inputs.staging == 'true' }}
             architecture: X64
             operating_system: windows-2022
         secrets: inherit
 
     linux-modern-installer:
+        if: ${{ contains(github.event.inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }}
         uses: ./.github/workflows/linux.yml
         with:
-            cura_conan_version: ${{ inputs.cura_conan_version }}
-            conan_args: ${{ inputs.conan_args }}
-            enterprise: ${{ inputs.enterprise }}
-            staging: ${{ inputs.staging }}
+            cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }}
+            conan_args: ${{ github.event.inputs.conan_args }}
+            enterprise: ${{ github.event.inputs.enterprise == 'true' }}
+            staging: ${{ github.event.inputs.staging == 'true' }}
             architecture: X64
             operating_system: ubuntu-22.04
         secrets: inherit
 
     linux-legacy-installer:
+        if: ${{ contains(github.event.inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }}
         uses: ./.github/workflows/linux.yml
         with:
-            cura_conan_version: ${{ inputs.cura_conan_version }}
-            conan_args: ${{ inputs.conan_args }}
-            enterprise: ${{ inputs.enterprise }}
-            staging: ${{ inputs.staging }}
+            cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }}
+            conan_args: ${{ github.event.inputs.conan_args }}
+            enterprise: ${{ github.event.inputs.enterprise == 'true' }}
+            staging: ${{ github.event.inputs.staging == 'true' }}
             architecture: X64
             operating_system: ubuntu-20.04
         secrets: inherit
 
     macos-installer:
+        if: ${{ contains(github.event.inputs.os_list, 'macos-x64') || github.event_name == 'schedule' }}
         uses: ./.github/workflows/macos.yml
         with:
-            cura_conan_version: ${{ inputs.cura_conan_version }}
-            conan_args: ${{ inputs.conan_args }}
-            enterprise: ${{ inputs.enterprise }}
-            staging: ${{ inputs.staging }}
+            cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }}
+            conan_args: ${{ github.event.inputs.conan_args }}
+            enterprise: ${{ github.event.inputs.enterprise == 'true' }}
+            staging: ${{ github.event.inputs.staging == 'true' }}
             architecture: X64
             operating_system: macos-11.0
         secrets: inherit
 
     macos-arm-installer:
+        if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') || github.event_name == 'schedule' }}
         uses: ./.github/workflows/macos.yml
         with:
-            cura_conan_version: ${{ inputs.cura_conan_version }}
-            conan_args: ${{ inputs.conan_args }}
-            enterprise: ${{ inputs.enterprise }}
-            staging: ${{ inputs.staging }}
+            cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }}
+            conan_args: ${{ github.event.inputs.conan_args }}
+            enterprise: ${{ github.event.inputs.enterprise == 'true' }}
+            staging: ${{ github.event.inputs.staging == 'true' }}
             architecture: ARM64
             operating_system: self-hosted
-        secrets: inherit
+        secrets: inherit
+
+    # Run and update nightly release when the nightly input is set to true or if the schedule is triggered
+    update-nightly-release:
+        if: ${{ always() && (! cancelled()) && contains(needs.*.result, 'success') && (! contains(needs.*.result, 'failure')) && (inputs.nightly || github.event_name == 'schedule') }}
+        runs-on: ubuntu-latest
+        needs: [ windows-installer, linux-modern-installer, linux-legacy-installer, macos-installer, macos-arm-installer ]
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3
+
+            # It's not necessary to download all three, but it does make sure we have at least one if an OS is skipped.
+
+            -   name: Download the run info
+                if: ${{ contains(github.event.inputs.os_list, 'macos-x64') || contains(inputs.os_list, 'macos-arm64') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: macos-run-info
+
+            -   name: Download the run info II
+                if: ${{ contains(github.event.inputs.os_list, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: linux-run-info
+
+            -   name: Download the run info III
+                if: ${{ contains(github.event.inputs.os_list, 'windows') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: windows-run-info
+
+            -   name: Set the run info as environment variables
+                run: |
+                    . run_info.sh 
+
+            -   name: Output the name file name and extension
+                id: filename
+                shell: python
+                run: |
+                    import os
+                    import datetime
+                    enterprise = "-Enterprise" if "${{ env.ENTERPRISE }}" == "true" else ""
+                    os_list = [x.strip() for x in "${{ env.OS_LIST }}".split(",")]
+                    scheduled = "${{ github.event_name == 'schedule' }}" == "true"
+                    if 'linux-modern' in os_list or scheduled:
+                        linux_modern = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-X64"
+                    if 'linux-legacy' in os_list or scheduled:
+                        linux_legacy = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-X64"
+                    if 'macos-x64' in os_list:
+                        mac_x64_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64"
+                        mac_x64_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64"
+                    if 'macos-arm64' in os_list:
+                        mac_arm_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64"
+                        mac_arm_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64"
+                    if 'windows' in os_list or scheduled:
+                        win_msi = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64"
+                        win_exe = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64"
+                    nightly_name = "UltiMaker-Cura-" + os.getenv('CURA_VERSION_FULL').split("+")[0]
+                    nightly_creation_time = str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+                    output_env = os.environ["GITHUB_OUTPUT"]
+                    content = ""
+                    if os.path.exists(output_env):
+                        with open(output_env, "r") as f:
+                            content = f.read()
+                    with open(output_env, "w") as f:
+                        f.write(content)
+                        if 'linux-modern' in os_list or scheduled:
+                            f.writelines(f"LINUX_MODERN={linux_modern}\n")
+                        if 'linux-legacy' in os_list or scheduled:
+                            f.writelines(f"LINUX_LEGACY={linux_legacy}\n")
+                        if 'macos-x64' in os_list:
+                            f.writelines(f"MAC_X64_DMG={mac_x64_dmg}\n")
+                            f.writelines(f"MAC_X64_PKG={mac_x64_pkg}\n")
+                        if 'macos-arm64' in os_list:
+                            f.writelines(f"MAC_ARM_DMG={mac_arm_dmg}\n")
+                            f.writelines(f"MAC_ARM_PKG={mac_arm_pkg}\n")
+                        if 'windows' in os_list or scheduled:
+                            f.writelines(f"WIN_MSI={win_msi}\n")
+                            f.writelines(f"WIN_EXE={win_exe}\n")
+                        f.writelines(f"NIGHTLY_NAME={nightly_name}\n")
+                        f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n")
+
+            -   name: Download linux modern installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'linux-modern') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.LINUX_MODERN }}-AppImage
+                    path: installers
+
+            -   name: Download linux legacy installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'linux-legacy') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.LINUX_LEGACY }}-AppImage
+                    path: installers
+
+            -   name: Download mac x64 dmg installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'macos-x64') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg
+                    path: installers
+
+            -   name: Download mac x64 pkg installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'macos-x64') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg
+                    path: installers
+
+            -   name: Download mac arm dmg installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg
+                    path: installers
+
+            -   name: Download mac arm pkg installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg
+                    path: installers
+
+            -   name: Download win msi installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'windows') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.WIN_MSI }}-msi
+                    path: installers
+
+            -   name: Download win exe installer jobs artifacts
+                if: ${{ contains(github.event.inputs.os_list, 'windows') }}
+                uses: actions/download-artifact@v2
+                with:
+                    name: ${{ steps.filename.outputs.WIN_EXE }}-exe
+                    path: installers
+
+            -   name: Rename Linux (modern) installer to nightlies
+                if: ${{ contains(github.event.inputs.os_list, 'linux-modern') }}
+                run: |
+                    mv installers/${{ steps.filename.outputs.LINUX_MODERN }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage
+
+            -   name: Rename Linux (legacy) installer to nightlies
+                if: ${{ contains(github.event.inputs.os_list, 'linux-legacy') }}
+                run: |
+                    mv installers/${{ steps.filename.outputs.LINUX_LEGACY }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage
+
+            -   name: Rename MacOS (X64) installers to nightlies
+                if: ${{ contains(github.event.inputs.os_list, 'macos-x64') }}
+                run: |
+                    mv installers/${{ steps.filename.outputs.MAC_X64_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg
+                    mv installers/${{ steps.filename.outputs.MAC_X64_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg
+
+            -   name: Rename MacOS (ARM-64) installers to nightlies
+                if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') }}
+                run: |
+                    mv installers/${{ steps.filename.outputs.MAC_ARM_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg
+                    mv installers/${{ steps.filename.outputs.MAC_ARM_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg
+
+            -   name: Rename Windows installers to nightlies
+                if: ${{ contains(github.event.inputs.os_list, 'windows') }}
+                run: |
+                    mv installers/${{ steps.filename.outputs.WIN_MSI }}.msi installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi
+                    mv installers/${{ steps.filename.outputs.WIN_EXE }}.exe installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe
+
+            -   name: Update nightly release for Linux (modern)
+                if: ${{ contains(github.event.inputs.os_list, 'linux-modern') }}
+                run: |
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage --clobber
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            -   name: Update nightly release for Linux (legacy)
+                if: ${{ contains(github.event.inputs.os_list, 'linux-legacy') }}
+                run: |
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            -   name: Update nightly release for MacOS (X64)
+                if: ${{ contains(github.event.inputs.os_list, 'macos-x64') }}
+                run: |
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            -   name: Update nightly release for MacOS (ARM-64)
+                if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') }}
+                run: |
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            -   name: Update nightly release for Windows
+                if: ${{ contains(github.event.inputs.os_list, 'windows') }}
+                run: |
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
+                    gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            -   name: Update nightly release description (with date)
+                run: |
+                    gh release edit nightly --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes "Nightly release created on: ${{ steps.filename.outputs.NIGHTLY_TIME }}"
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux.yml

@@ -250,6 +250,20 @@ jobs:
             dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage
           retention-days: 5
 
+      -   name: Write the run info
+          shell: python
+          run: |
+              import os
+              with open("run_info.sh", "w") as f:
+                  f.writelines(f'echo "CURA_VERSION_FULL={os.environ["CURA_VERSION_FULL"]}" >> $GITHUB_ENV\n')
+      -   name: Upload the run info
+          uses: actions/upload-artifact@v3
+          with:
+              name: linux-run-info
+              path: |
+                  run_info.sh
+              retention-days: 5
+
   notify-export:
     if: ${{ always() }}
     needs: [ cura-installer-create ]

.github/workflows/macos.yml

@@ -264,6 +264,21 @@ jobs:
                         dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.pkg
                     retention-days: 5
 
+            -   name: Write the run info
+                shell: python
+                run: |
+                    import os
+                    with open("run_info.sh", "w") as f:
+                        f.writelines(f'echo "CURA_VERSION_FULL={os.environ["CURA_VERSION_FULL"]}" >> $GITHUB_ENV\n')
+
+            -   name: Upload the run info
+                uses: actions/upload-artifact@v3
+                with:
+                    name: macos-run-info
+                    path: |
+                        run_info.sh
+                    retention-days: 5
+
 
     notify-export:
         if: ${{ always() }}

.github/workflows/windows.yml

@@ -256,6 +256,23 @@ jobs:
                         dist/${{steps.filename.outputs.INSTALLER_FILENAME }}.exe
                     retention-days: 5
 
+            # NOTE: The extension is .sh, since this isn't going to build-environment, so not on the Win build image.
+            -   name: Write the run info
+                shell: python
+                run: |
+                    import os
+                    with open("run_info.sh", "w") as f:
+                        f.writelines(f'echo "CURA_VERSION_FULL={os.environ["CURA_VERSION_FULL"]}" >> $GITHUB_ENV\n')
+
+            # NOTE: The extension is .sh, since this isn't going to build-environment, so not on the Win build image.
+            -   name: Upload the run info
+                uses: actions/upload-artifact@v3
+                with:
+                    name: windows-run-info
+                    path: |
+                        run_info.sh
+                    retention-days: 5
+
     notify-export:
         if: ${{ always() }}
         needs: [ cura-installer-create ]

cura/CuraApplication.py

@@ -50,6 +50,7 @@ from UM.Settings.Validator import Validator
 from UM.View.SelectionPass import SelectionPass  # For typing.
 from UM.Workspace.WorkspaceReader import WorkspaceReader
 from UM.i18n import i18nCatalog
+from UM.Version import Version
 from cura import ApplicationMetadata
 from cura.API import CuraAPI
 from cura.API.Account import Account
@@ -616,6 +617,16 @@ class CuraApplication(QtApplication):
 
     def _onEngineCreated(self):
         self._qml_engine.addImageProvider("print_job_preview", PrintJobPreviewImageProvider.PrintJobPreviewImageProvider())
+        version = Version(self.getVersion())
+        if hasattr(sys, "frozen") and version.hasPostFix() and "beta" not in version.getPostfixType():
+            self._qml_engine.rootObjects()[0].setTitle(f"{ApplicationMetadata.CuraAppDisplayName} {ApplicationMetadata.CuraVersion}")
+            message = Message(
+                self._i18n_catalog.i18nc("@info:warning",
+                                         f"This version is not intended for production use. If you encounter any issues, please report them on our GitHub page, mentioning the full version {self.getVersion()}"),
+                lifetime = 0,
+                title = self._i18n_catalog.i18nc("@info:title", "Nightly build"),
+                message_type = Message.MessageType.WARNING)
+            message.show()
 
     @pyqtProperty(bool)
     def needToShowUserAgreement(self) -> bool:

plugins/PostProcessingPlugin/scripts/LimitXYAccelJerk.py

@@ -0,0 +1,326 @@
+# Limit XY Accel:  Authored by: Greg Foresi (GregValiant)
+# July 2023
+# Sometimes bed-slinger printers need different Accel and Jerk values for the Y but Cura always makes them the same.
+# This script changes the Accel and/or Jerk from the beginning of the 'Start Layer' to the end of the 'End Layer'.
+# The existing M201 Max Accel will be changed to limit the Y (and/or X) accel at the printer.  If you have Accel enabled in Cura and the XY Accel is set to 3000 then setting the Y limit to 1000 will result in the printer limiting the Y to 1000.  This can keep tall skinny prints from breaking loose of the bed and failing.  The script was not tested with Junction Deviation.
+# If enabled - the Jerk setting is changed line-by-line within the gcode as there is no "limit" on Jerk.
+# if 'Gradual ACCEL change' is enabled then the Accel is changed gradually from the Start to the End layer and that will be the final Accel setting in the file.  If 'Gradual' is enabled then the Jerk settings will continue to be changed to the end of the file (rather than ending at the End layer).
+# This post is intended for printers with moving beds (bed slingers) so UltiMaker printers are excluded.
+# When setting an accel limit on multi-extruder printers ALL extruders are effected.
+# This post does not distinguish between Print Accel and Travel Accel.  The limit is the limit for all regardless.  Example: Skin Accel = 1000 and Outer Wall accel = 500.  If the limit is set to 300 then both Skin and Outer Wall will be Accel = 300.
+
+from ..Script import Script
+from cura.CuraApplication import CuraApplication
+import re
+from UM.Message import Message
+
+class LimitXYAccelJerk(Script):
+        
+    def initialize(self) -> None:
+        super().initialize()
+        # Get the Accel and Jerk and set the values in the setting boxes--
+        mycura = CuraApplication.getInstance().getGlobalContainerStack()
+        extruder = mycura.extruderList
+        accel_print = extruder[0].getProperty("acceleration_print", "value")
+        accel_travel = extruder[0].getProperty("acceleration_travel", "value")
+        jerk_print_old = extruder[0].getProperty("jerk_print", "value")
+        jerk_travel_old = extruder[0].getProperty("jerk_travel", "value")
+        self._instance.setProperty("x_accel_limit", "value", round(accel_print))
+        self._instance.setProperty("y_accel_limit", "value", round(accel_print))
+        self._instance.setProperty("x_jerk", "value", jerk_print_old)
+        self._instance.setProperty("y_jerk", "value", jerk_print_old)
+        ext_count = int(mycura.getProperty("machine_extruder_count", "value"))
+        machine_name = str(mycura.getProperty("machine_name", "value"))
+                
+        # Warn the user if the printer is an Ultimaker-------------------------
+        if "Ultimaker" in machine_name:
+            Message(text = "<NOTICE> [Limit the X-Y Accel/Jerk] DID NOT RUN because Ultimaker printers don't have sliding beds.").show()
+        
+        # Warn the user if the printer is multi-extruder------------------
+        if ext_count > 1:
+            Message(text = "<NOTICE> 'Limit the X-Y Accel/Jerk': The post processor treats all extruders the same.  If you have multiple extruders they will all be subject to the same Accel and Jerk limits imposed.  If you have different Travel and Print Accel they will also be subject to the same limits.  If that is not acceptable then you should not use this Post Processor.").show()
+ 
+    def getSettingDataString(self):
+            return """{
+            "name": "Limit the X-Y Accel/Jerk (all extruders equal)",
+            "key": "LimitXYAccelJerk",
+            "metadata": {},
+            "version": 2,
+            "settings":
+            {
+                "type_of_change":
+                {
+                    "label": "Immediate or Gradual change",
+                    "description": "An 'Immediate' change will insert the new numbers immediately at the Start Layer.  A 'Gradual' change will transition from the starting Accel to the new Accel limit across a range of layers.",
+                    "type": "enum",
+                    "options": {
+                        "immediate_change": "Immediate",
+                        "gradual_change": "Gradual"},
+                    "default_value": "immediate_change"
+                },
+                "x_accel_limit":
+                {
+                    "label": "X MAX Acceleration",
+                    "description": "If this number is lower than the 'X Print Accel' in Cura then this will limit the Accel on the X axis.  Enter the Maximum Acceleration value for the X axis.  This will affect both Print and Travel Accel.  If you enable an End Layer then at the end of that layer the Accel Limit will be reset (unless you choose 'Gradual' in which case the new limit goes to the top layer).",
+                    "type": "int",
+                    "enabled": true,
+                    "minimum_value": 50,
+                    "unit": "mm/sec² ",
+                    "default_value": 500
+                },
+                "y_accel_limit":
+                {
+                    "label": "Y MAX Acceleration",
+                    "description": "If this number is lower than the Y accel in Cura then this will limit the Accel on the Y axis.  Enter the Maximum Acceleration value for the Y axis.  This will affect both Print and Travel Accel.  If you enable an End Layer then at the end of that layer the Accel Limit will be reset (unless you choose 'Gradual' in which case the new limit goes to the top layer).",
+                    "type": "int",
+                    "enabled": true,
+                    "minimum_value": 50,
+                    "unit": "mm/sec² ",
+                    "default_value": 500
+                },
+                "jerk_enable":
+                {
+                    "label": "Change the Jerk",
+                    "description": "Whether to change the Jerk values.",
+                    "type": "bool",
+                    "enabled": true,
+                    "default_value": false
+                },
+                "x_jerk":
+                {
+                    "label": "    X jerk",
+                    "description": "Enter the Jerk value for the X axis.  Enter '0' to use the existing X Jerk.  This setting will affect both the Print and Travel jerk.",
+                    "type": "int",
+                    "enabled": "jerk_enable",
+                    "unit": "mm/sec ",
+                    "default_value": 8
+                },
+                "y_jerk":
+                {
+                    "label": "    Y jerk",
+                    "description": "Enter the Jerk value for the Y axis. Enter '0' to use the existing Y Jerk.    This setting will affect both the Print and Travel jerk.",
+                    "type": "int",
+                    "enabled": "jerk_enable",
+                    "unit": "mm/sec ",
+                    "default_value": 8
+                },
+                "start_layer":
+                {
+                    "label": "From Start of Layer:",
+                    "description": "Use the Cura Preview numbers. Enter the Layer to start the changes at. The minimum is Layer 1.",
+                    "type": "int",
+                    "default_value": 1,
+                    "minimum_value": 1,
+                    "unit": "Lay# ",
+                    "enabled": "type_of_change == 'immediate_change'"
+                },
+                "end_layer":
+                {
+                    "label": "To End of Layer",
+                    "description": "Use the Cura Preview numbers. Enter '-1' for the entire file or enter a layer number.  The changes will end at your 'End Layer' and revert back to the original numbers.",
+                    "type": "int",
+                    "default_value": -1,
+                    "minimum_value": -1,
+                    "unit": "Lay# ",
+                    "enabled": "type_of_change == 'immediate_change'"
+                },
+                "gradient_start_layer":
+                {
+                    "label": "     Gradual From Layer:",
+                    "description": "Use the Cura Preview numbers. Enter the Layer to start the changes at. The minimum is Layer 1.",
+                    "type": "int",
+                    "default_value": 1,
+                    "minimum_value": 1,
+                    "unit": "Lay# ",
+                    "enabled": "type_of_change == 'gradual_change'"
+                },
+                "gradient_end_layer":
+                {
+                    "label": "     Gradual To Layer",
+                    "description": "Use the Cura Preview numbers. Enter '-1' for the top layer or enter a layer number.  The last 'Gradual' change will continue to the end of the file.",
+                    "type": "int",
+                    "default_value": -1,
+                    "minimum_value": -1,
+                    "unit": "Lay# ",
+                    "enabled": "type_of_change == 'gradual_change'"
+                }
+            }
+        }"""
+
+    def execute(self, data):
+        mycura = CuraApplication.getInstance().getGlobalContainerStack()
+        extruder = mycura.extruderList
+        machine_name = str(mycura.getProperty("machine_name", "value"))
+        print_sequence = str(mycura.getProperty("print_sequence", "value"))
+        
+        # Exit if 'one_at_a_time' is enabled-------------------------
+        if print_sequence == "one_at_a_time":
+            Message(text = "<NOTICE> [Limit the X-Y Accel/Jerk]  DID NOT RUN.  This post processor is not compatible with 'One-at-a-Time' mode.").show()
+            data[0] += ";  [LimitXYAccelJerk] DID NOT RUN because Cura is set to 'One-at-a-Time' mode.\n"
+            return data
+                
+        # Exit if the printer is an Ultimaker-------------------------
+        if "Ultimaker" in machine_name:
+            Message(text = "<NOTICE> [Limit the X-Y Accel/Jerk]  DID NOT RUN.  This post processor is for bed slinger printers only.").show()
+            data[0] += ";  [LimitXYAccelJerk] DID NOT RUN because the printer doesn't have a sliding bed.\n"
+            return data
+            
+        type_of_change = str(self.getSettingValueByKey("type_of_change"))
+        accel_print_enabled = bool(extruder[0].getProperty("acceleration_enabled", "value"))
+        accel_travel_enabled = bool(extruder[0].getProperty("acceleration_travel_enabled", "value"))
+        accel_print = extruder[0].getProperty("acceleration_print", "value")
+        accel_travel = extruder[0].getProperty("acceleration_travel", "value")
+        jerk_print_enabled = str(extruder[0].getProperty("jerk_enabled", "value"))
+        jerk_travel_enabled = str(extruder[0].getProperty("jerk_travel_enabled", "value"))
+        jerk_print_old = extruder[0].getProperty("jerk_print", "value")
+        jerk_travel_old = extruder[0].getProperty("jerk_travel", "value")
+        
+        if int(accel_print) >= int(accel_travel):
+            accel_old = accel_print
+        else:
+            accel_old = accel_travel
+        jerk_travel = str(extruder[0].getProperty("jerk_travel", "value"))
+        if int(jerk_print_old) >= int(jerk_travel_old):
+            jerk_old = jerk_print_old
+        else:
+            jerk_old = jerk_travel_old
+
+        #Set the new Accel values----------------------------------------------------------
+        x_accel = str(self.getSettingValueByKey("x_accel_limit"))
+        y_accel = str(self.getSettingValueByKey("y_accel_limit"))
+        x_jerk = int(self.getSettingValueByKey("x_jerk"))  
+        y_jerk = int(self.getSettingValueByKey("y_jerk"))
+        
+        # Put the strings together-------------------------------------------
+        m201_limit_new = "M201 X" + x_accel + " Y" + y_accel
+        m201_limit_old = "M201 X" + str(round(accel_old)) + " Y" + str(round(accel_old))
+        if x_jerk == 0:
+            m205_jerk_pattern = "Y(\d*)"
+            m205_jerk_new = "Y" + str(y_jerk)
+        if y_jerk == 0:
+            m205_jerk_pattern = "X(\d*)"
+            m205_jerk_new = "X" + str(x_jerk)
+        if x_jerk != 0 and y_jerk != 0:
+            m205_jerk_pattern = "M205 X(\d*) Y(\d*)"
+            m205_jerk_new = "M205 X" + str(x_jerk) + " Y" + str(y_jerk)
+        m205_jerk_old = "M205 X" + str(jerk_old) + " Y" + str(jerk_old)
+        type_of_change = self.getSettingValueByKey("type_of_change") 
+        
+        #Get the indexes of the start and end layers----------------------------------------
+        if type_of_change == 'immediate_change':
+            start_layer = int(self.getSettingValueByKey("start_layer"))-1
+            end_layer = int(self.getSettingValueByKey("end_layer"))
+        else:
+            start_layer = int(self.getSettingValueByKey("gradient_start_layer"))-1
+            end_layer = int(self.getSettingValueByKey("gradient_end_layer"))
+        start_index = 2
+        end_index = len(data)-2
+        for num in range(2,len(data)-1):
+            if ";LAYER:" + str(start_layer) + "\n" in data[num]:
+                start_index = num
+                break
+        if int(end_layer) > 0:
+            for num in range(3,len(data)-1):
+                try:
+                    if ";LAYER:" + str(end_layer) + "\n" in data[num]:
+                        end_index = num
+                        break
+                except:
+                    end_index = len(data)-2      
+
+        #Add Accel limit and new Jerk at start layer-----------------------------------------------------
+        if type_of_change == "immediate_change":
+            layer = data[start_index]
+            lines = layer.split("\n")
+            for index, line in enumerate(lines):
+                if lines[index].startswith(";LAYER:"):
+                    lines.insert(index+1,m201_limit_new)
+                    if self.getSettingValueByKey("jerk_enable"):
+                        lines.insert(index+2,m205_jerk_new)
+                    data[start_index] = "\n".join(lines)
+                    break
+            
+            #Alter any existing jerk lines.  Accel lines can be ignored-----------------------------------  
+            for num in range(start_index,end_index,1):
+                layer = data[num]
+                lines = layer.split("\n")
+                for index, line in enumerate(lines):
+                    if line.startswith("M205"):
+                        lines[index] = re.sub(m205_jerk_pattern, m205_jerk_new, line)
+                data[num] = "\n".join(lines)
+            if end_layer != -1:
+                try:
+                    layer = data[end_index-1]
+                    lines = layer.split("\n")
+                    lines.insert(len(lines)-2,m201_limit_old)
+                    lines.insert(len(lines)-2,m205_jerk_old)
+                    data[end_index-1] = "\n".join(lines)
+                except:
+                    pass
+            else:
+                data[len(data)-1] = m201_limit_old + "\n" + m205_jerk_old + "\n" + data[len(data)-1]
+            return data        
+        
+        elif type_of_change == "gradual_change":
+            layer_spread = end_index - start_index
+            if accel_old >= int(x_accel):
+                x_accel_hyst = round((accel_old - int(x_accel)) / layer_spread)
+            else:
+                x_accel_hyst = round((int(x_accel) - accel_old) / layer_spread)
+            if accel_old >= int(y_accel):
+                y_accel_hyst = round((accel_old - int(y_accel)) / layer_spread)
+            else:                
+                y_accel_hyst = round((int(y_accel) - accel_old) / layer_spread)
+            
+            if accel_old >= int(x_accel):
+                x_accel_start = round(round((accel_old - x_accel_hyst)/25)*25)
+            else:
+                x_accel_start = round(round((x_accel_hyst + accel_old)/25)*25)
+            if accel_old >= int(y_accel):
+                y_accel_start = round(round((accel_old - y_accel_hyst)/25)*25)
+            else:
+                y_accel_start = round(round((y_accel_hyst + accel_old)/25)*25)
+            m201_limit_new = "M201 X" + str(x_accel_start) + " Y" + str(y_accel_start)
+            #Add Accel limit and new Jerk at start layer-------------------------------------------------------------
+            layer = data[start_index]
+            lines = layer.split("\n")
+            for index, line in enumerate(lines):
+                if lines[index].startswith(";LAYER:"):
+                    lines.insert(index+1,m201_limit_new)
+                    if self.getSettingValueByKey("jerk_enable"):
+                        lines.insert(index+2,m205_jerk_new)
+                    data[start_index] = "\n".join(lines)
+                    break
+            for num in range(start_index + 1, end_index,1):
+                layer = data[num]
+                lines = layer.split("\n")
+                if accel_old >= int(x_accel):
+                    x_accel_start -= x_accel_hyst
+                    if x_accel_start < int(x_accel): x_accel_start = int(x_accel)
+                else:
+                    x_accel_start += x_accel_hyst                
+                    if x_accel_start > int(x_accel): x_accel_start = int(x_accel)
+                if accel_old >= int(y_accel):
+                    y_accel_start -= y_accel_hyst
+                    if y_accel_start < int(y_accel): y_accel_start = int(y_accel)
+                else:
+                    y_accel_start += y_accel_hyst
+                    if y_accel_start > int(y_accel): y_accel_start = int(y_accel)
+                m201_limit_new = "M201 X" + str(round(round(x_accel_start/25)*25)) + " Y" + str(round(round(y_accel_start/25)*25))
+                for index, line in enumerate(lines):
+                    if line.startswith(";LAYER:"):
+                        lines.insert(index+1, m201_limit_new)
+                        continue
+                data[num] = "\n".join(lines)
+            
+            #Alter any existing jerk lines.  Accel lines can be ignored---------------
+            if self.getSettingValueByKey("jerk_enable"):
+                for num in range(start_index,len(data)-1,1):
+                    layer = data[num]
+                    lines = layer.split("\n")
+                    for index, line in enumerate(lines):
+                        if line.startswith("M205"):
+                            lines[index] = re.sub(m205_jerk_pattern, m205_jerk_new, line)
+                    data[num] = "\n".join(lines)
+                data[len(data)-1] = m201_limit_old + "\n" + m205_jerk_old + "\n" + data[len(data)-1]
+            return data