Merge branch 'develop'

Author: jbatonnet

build/4-apps/40-moonraker/get-moonraker.sh

@@ -7,7 +7,7 @@ set -e
 mkdir /work
 cd /work
 
-MOONRAKER_COMMIT=ebaa6645b2bcaa593d99e863530c52a84c69b470
+MOONRAKER_COMMIT=3c1f31874ac0beba35747059637583e5d2c383c0
 MOONRAKER_DIRECTORY=/files/4-apps/home/rinkhals/apps/40-moonraker
 
 echo "Downloading Moonraker..."

files/3-rinkhals/tools.sh

@@ -83,7 +83,7 @@ is_verified_firmware() {
 }
 
 install_swu() {
-    SWU_FILE=$1
+    SWU_FILE=$(realpath $1)
     shift
 
     echo "> Extracting $SWU_FILE ..."

files/4-apps/home/rinkhals/apps/40-moonraker/app.json

@@ -3,7 +3,7 @@
 
     "name": "Moonraker",
     "description": "Web server that exposes APIs with which client applications may use to interact with the 3D printing firmware Klipper.",
-    "version": "ebaa664",
+    "version": "6ff9a7c",
 
     "properties": {
         "mqtt_print_auto_leveling": {

files/4-apps/home/rinkhals/apps/40-moonraker/kobra.py

@@ -507,9 +507,12 @@ async def _request_standard(me, web_request, timeout = None):
                 if self.is_goklipper_running():
                     if 'objects' in args and ('bed_mesh' in args['objects'] or 'bed_mesh default' in args['objects'] or 'bed_mesh \"default\"' in args['objects']):
                         want_bed_mesh = True
-                        del args['objects']['bed_mesh']
-                        del args['objects']['bed_mesh default']
-                        del args['objects']['bed_mesh \"default\"']
+                        if 'bed_mesh' in args['objects']:
+                            del args['objects']['bed_mesh']
+                        if 'bed_mesh default' in args['objects']:
+                            del args['objects']['bed_mesh default']
+                        if 'bed_mesh \"default\"' in args['objects']:
+                            del args['objects']['bed_mesh \"default\"']
 
                 result = await original__request_standard(me, web_request, timeout)