Merge branch 'master' into alpha5

prusa3d · May 15, 2024 · 3e7f848 · 3e7f848
2 parents 6649ec8 + de66aff
commit 3e7f848
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/image_builder/image_builder.py b/image_builder/image_builder.py
@@ -18,7 +18,7 @@
 
 
 KERNEL_URL = ("http://security.debian.org/debian-security/pool/updates/main/l/"
-              "linux/linux-image-6.1.0-17-armmp-lpae_6.1.69-1_armhf.deb")
+              "linux/linux-image-6.1.0-21-armmp-lpae_6.1.90-1_armhf.deb")
 match = KERNEL_URL_REGEX.match(KERNEL_URL)
 
 if match is None:
@@ -31,8 +31,8 @@
 VMLINUZ_NAME = f"vmlinuz-{KERNEL_VERSION_NAME}"
 
 IMAGE_URL = ("https://downloads.raspberrypi.org/raspios_lite_armhf/images/"
-             "raspios_lite_armhf-2023-12-11/"
-             "2023-12-11-raspios-bookworm-armhf-lite.img.xz")
+             "raspios_lite_armhf-2024-03-15/"
+             "2024-03-15-raspios-bookworm-armhf-lite.img.xz")
 
 DATA_FILE = "data.json"
 COMPRESSED_IMAGE_NAME = "source_image.img.xz"

diff --git a/prusa/link/const.py b/prusa/link/const.py
@@ -100,7 +100,7 @@
 PRINT_END_TIMEOUT = 11
 KEEPALIVE_INTERVAL = 12
 
-PP_MOVES_DELAY = 45
+PP_MOVES_DELAY = 20
 
 # --- Lcd queue ---
 LCD_QUEUE_SIZE = 30

diff --git a/prusa/link/data/image_builder/manager-start-script.sh b/prusa/link/data/image_builder/manager-start-script.sh
@@ -5,11 +5,11 @@ iptables -t nat -I OUTPUT -p tcp -o lo -d localhost --dport 80 -j REDIRECT --to-
 
 set_up_port () {
    # Sets the baudrate and cancels the hangup at the end of a connection
-   stty -F "$1" 115200 -hupcl;
+   stty -F "$1" 115200 -hupcl || true
 }
 
 message() {
-   printf "M117 $2\n" > "$1"
+   printf "M117 $2\n" > "$1" || true
 }
 
 wifi_nic_name=$(find /sys/class/net -follow -maxdepth 2 -name wireless 2> /dev/null | cut -d / -f 5)

diff --git a/prusa/link/data/image_builder/prusalink-start-script.sh b/prusa/link/data/image_builder/prusalink-start-script.sh
@@ -5,11 +5,11 @@ iptables -t nat -I OUTPUT -p tcp -o lo -d localhost --dport 80 -j REDIRECT --to-
 
 set_up_port () {
    # Sets the baudrate and cancels the hangup at the end of a connection
-   stty -F "$1" 115200 -hupcl;
+   stty -F "$1" 115200 -hupcl || true
 }
 
 message() {
-   printf "M117 $2\n" > "$1"
+   printf "M117 $2\n" > "$1" || true
 }
 
 wifi_nic_name=$(find /sys/class/net -follow -maxdepth 2 -name wireless 2> /dev/null | cut -d / -f 5)

diff --git a/prusa/link/printer_adapter/prusa_link.py b/prusa/link/printer_adapter/prusa_link.py
@@ -19,6 +19,7 @@
 from prusa.connect.printer.files import File
 from prusa.connect.printer.models import Sheet as SDKSheet
 
+from .. import __version__
 from ..camera_governor import CameraGovernor
 from ..cameras.picamera_driver import PiCameraDriver
 from ..cameras.v4l2_driver import V4L2Driver
@@ -167,6 +168,7 @@ def __init__(self, cfg: Config, settings: Settings) -> None:
         self.keepalive.set_use_connect(self.settings.use_connect())
 
         self.printer = MyPrinter()
+        self.printer.software = __version__
 
         drivers: List[Type[CameraDriver]] = [V4L2Driver]
         if PiCameraDriver.supported: