From 47df4137956095515477585d5d86d87dcc2b5c5a Mon Sep 17 00:00:00 2001
From: Jordan Ruthe <jordan.ruthe@gmail.com>
Date: Fri, 13 Nov 2020 16:28:37 -0500
Subject: [PATCH] Updates for latest moonraker version

---
 files.py  |  6 +++---
 screen.py | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/files.py b/files.py
index 77c61555..01cfb6d5 100644
--- a/files.py
+++ b/files.py
@@ -22,7 +22,7 @@ class KlippyFiles:
 
         if not os.path.exists('/tmp/.KS-thumbnails'):
             os.makedirs('/tmp/.KS-thumbnails')
-        GLib.idle_add(self.ret_files)
+        GLib.idle_add(self.ret_files, False)
 
 
     def _callback(self, result, method, params):
@@ -81,9 +81,9 @@ class KlippyFiles:
     def add_file_callback(self, callback):
         self.callbacks.append(callback)
 
-    def ret_files(self):
+    def ret_files(self, retval=True):
         self._screen._ws.klippy.get_file_list(self._callback)
-        return True
+        return retval
 
     def ret_file_data (self, filename):
         print("Getting file info for %s" % (filename))
diff --git a/screen.py b/screen.py
index 98e4006d..d5cacc39 100644
--- a/screen.py
+++ b/screen.py
@@ -165,12 +165,14 @@ class KlipperScreen(Gtk.Window):
 
     def ws_subscribe(self):
         requested_updates = {
-            "toolhead": [],
-            "virtual_sdcard": [],
-            "print_stats": [],
-            "heater_bed": [],
-            "extruder": [],
-            "configfile": []
+            "objects": {
+                "toolhead": ["homed_axes","estimated_print_time","print_time","position","extruder"],
+                "virtual_sdcard": ["file_position","is_active","progress"],
+                "print_stats": ["print_duration","total_duration","filament_used","filename","state","message"],
+                "heater_bed": ["target","temperature"],
+                "extruder": ["target","temperature","pressure_advance","smooth_time"],
+                "configfile": ["config"]
+            }
         }
         self._ws.klippy.object_subscription(requested_updates)