Move files to ks_includes and update references

ks_includes/KlippyWebsocket.py

@@ -13,7 +13,7 @@ logger = logging.getLogger("KlipperScreen.KlipperWebsocket")
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
 
 #f = open("/home/pi/.moonraker_api_key", "r")
 api_key = "" #f.readline()

ks_includes/screen_panel.py

@@ -3,8 +3,8 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
 
 class ScreenPanel:
     def __init__(self, screen):

panels/bed_level.py

@@ -5,9 +5,9 @@ import re
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.BedLevelPanel")
 

panels/example.py

@@ -3,9 +3,9 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 class ExamplePanel(ScreenPanel):
     def initialize(self, panel_name):

panels/extrude.py

@@ -4,9 +4,9 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.ExtrudePanel")
 

panels/fan.py

@@ -4,9 +4,9 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.FanPanel")
 

panels/fine_tune.py

@@ -4,9 +4,9 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.FineTunePanel")
 

panels/job_status.py

@@ -4,8 +4,8 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.JobStatusPanel")
 

panels/main_menu.py

@@ -4,7 +4,7 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
 from panels.menu import MenuPanel
 
 logger = logging.getLogger("KlipperScreen.MainMenu")

panels/menu.py

@@ -4,8 +4,8 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.MenuPanel")
 

panels/move.py

@@ -4,9 +4,9 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.MovePanel")
 

panels/network.py

@@ -5,8 +5,8 @@ import os
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.NetworkPanel")
 

panels/preheat.py

@@ -4,8 +4,8 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.PreheatPanel")
 

panels/print.py

@@ -6,9 +6,9 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango
 from datetime import datetime
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.PrintPanel")
 

panels/splash_screen.py

@@ -5,8 +5,8 @@ import os
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.SplashScreenPanel")
 

panels/system.py

@@ -5,9 +5,9 @@ import os
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.SystemPanel")
 

panels/temperature.py

@@ -4,9 +4,9 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.TemperaturePanel")
 

panels/zcalibrate.py

@@ -3,9 +3,9 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
-from KlippyGcodes import KlippyGcodes
+from ks_includes.KlippyGcodes import KlippyGcodes
-from panels.screen_panel import ScreenPanel
+from ks_includes.screen_panel import ScreenPanel
 
 import logging
 logger = logging.getLogger("KlipperScreen.ZCalibratePanel")

screen.py

@@ -20,13 +20,13 @@ from gi.repository import Gtk, Gdk, GLib
 from ks_includes.KlippyWebsocket import KlippyWebsocket
 from ks_includes.KlippyRest import KlippyRest
 from ks_includes.files import KlippyFiles
-from KlippyGtk import KlippyGtk
+from ks_includes.KlippyGtk import KlippyGtk
 from ks_includes.printer import Printer
 
 from ks_includes.config import KlipperScreenConfig
 
 # Do this better in the future
-from panels.screen_panel import *
+#from ks_includes.screen_panel import *
 from panels.bed_level import *
 from panels.extrude import *
 from panels.fan import *
@@ -345,9 +345,14 @@ class KlipperScreen(Gtk.Window):
             #self.files.add_file()
         elif action == "notify_metadata_update":
             self.files.update_metadata(data['filename'])
-        elif self.shutdown == False and not (action == "notify_gcode_response" and data.startswith("B:")
+        elif self.shutdown == False and action == "notify_gcode response":
-                and re.search(r'B:[0-9\.]+\s/[0-9\.]+\sT[0-9]+:[0-9\.]+', data)):
+            if "Klipper state: Shutdown" in data:
-            logger.debug(json.dumps([action, data], indent=2))
+                self.shutdown == True
+                self.printer_initializing(_("Klipper has shutdown"))
+
+            if not (data.startswith("B:") and
+                re.search(r'B:[0-9\.]+\s/[0-9\.]+\sT[0-9]+:[0-9\.]+', data)):
+                logger.debug(json.dumps([action, data], indent=2))
 
         for sub in self.subscriptions:
             self.panels[sub].process_update(data)