From 3b624399393e77aec21f994de14d7e6b564263d4 Mon Sep 17 00:00:00 2001 From: jordanruthe <31575189+jordanruthe@users.noreply.github.com> Date: Wed, 18 Nov 2020 17:15:05 -0500 Subject: [PATCH] Move files to ks_includes and update references --- KlippyGcodes.py => ks_includes/KlippyGcodes.py | 0 KlippyGtk.py => ks_includes/KlippyGtk.py | 0 ks_includes/KlippyWebsocket.py | 2 +- {panels => ks_includes}/screen_panel.py | 4 ++-- panels/bed_level.py | 6 +++--- panels/example.py | 6 +++--- panels/extrude.py | 6 +++--- panels/fan.py | 6 +++--- panels/fine_tune.py | 6 +++--- panels/job_status.py | 4 ++-- panels/main_menu.py | 2 +- panels/menu.py | 4 ++-- panels/move.py | 6 +++--- panels/network.py | 4 ++-- panels/preheat.py | 4 ++-- panels/print.py | 6 +++--- panels/splash_screen.py | 4 ++-- panels/system.py | 6 +++--- panels/temperature.py | 6 +++--- panels/zcalibrate.py | 6 +++--- screen.py | 15 ++++++++++----- 21 files changed, 54 insertions(+), 49 deletions(-) rename KlippyGcodes.py => ks_includes/KlippyGcodes.py (100%) rename KlippyGtk.py => ks_includes/KlippyGtk.py (100%) rename {panels => ks_includes}/screen_panel.py (93%) diff --git a/KlippyGcodes.py b/ks_includes/KlippyGcodes.py similarity index 100% rename from KlippyGcodes.py rename to ks_includes/KlippyGcodes.py diff --git a/KlippyGtk.py b/ks_includes/KlippyGtk.py similarity index 100% rename from KlippyGtk.py rename to ks_includes/KlippyGtk.py diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py index 77d7b89b..87e4845e 100644 --- a/ks_includes/KlippyWebsocket.py +++ b/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() diff --git a/panels/screen_panel.py b/ks_includes/screen_panel.py similarity index 93% rename from panels/screen_panel.py rename to ks_includes/screen_panel.py index f24f91c3..74703c83 100644 --- a/panels/screen_panel.py +++ b/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 KlippyGcodes import KlippyGcodes +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes class ScreenPanel: def __init__(self, screen): diff --git a/panels/bed_level.py b/panels/bed_level.py index 66bda61f..2922afce 100644 --- a/panels/bed_level.py +++ b/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 KlippyGtk import KlippyGtk -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.BedLevelPanel") diff --git a/panels/example.py b/panels/example.py index d78285d7..084575c1 100644 --- a/panels/example.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel class ExamplePanel(ScreenPanel): def initialize(self, panel_name): diff --git a/panels/extrude.py b/panels/extrude.py index 278bc4d3..b6a6ebec 100644 --- a/panels/extrude.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.ExtrudePanel") diff --git a/panels/fan.py b/panels/fan.py index 720c5bb0..3d2f7ebd 100644 --- a/panels/fan.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.FanPanel") diff --git a/panels/fine_tune.py b/panels/fine_tune.py index e6b765f1..954d9f8e 100644 --- a/panels/fine_tune.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.FineTunePanel") diff --git a/panels/job_status.py b/panels/job_status.py index bb51871c..86937740 100644 --- a/panels/job_status.py +++ b/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 panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.JobStatusPanel") diff --git a/panels/main_menu.py b/panels/main_menu.py index b901780a..8065a7ca 100644 --- a/panels/main_menu.py +++ b/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") diff --git a/panels/menu.py b/panels/menu.py index 1bb5a0a6..f6c7a068 100644 --- a/panels/menu.py +++ b/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 panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.MenuPanel") diff --git a/panels/move.py b/panels/move.py index 73aff2b1..02ef61e1 100644 --- a/panels/move.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.MovePanel") diff --git a/panels/network.py b/panels/network.py index 2a071800..eec0e3e7 100644 --- a/panels/network.py +++ b/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 panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.NetworkPanel") diff --git a/panels/preheat.py b/panels/preheat.py index 8039dafa..4badf4fc 100644 --- a/panels/preheat.py +++ b/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 panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.PreheatPanel") diff --git a/panels/print.py b/panels/print.py index 6a9f89fc..d0e3dba8 100644 --- a/panels/print.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.PrintPanel") diff --git a/panels/splash_screen.py b/panels/splash_screen.py index a84d4aaa..87121e0d 100644 --- a/panels/splash_screen.py +++ b/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 panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.SplashScreenPanel") diff --git a/panels/system.py b/panels/system.py index aa16fa7c..583dd4d2 100644 --- a/panels/system.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.SystemPanel") diff --git a/panels/temperature.py b/panels/temperature.py index 1f813b68..7b67f2a5 100644 --- a/panels/temperature.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel logger = logging.getLogger("KlipperScreen.TemperaturePanel") diff --git a/panels/zcalibrate.py b/panels/zcalibrate.py index 6798a50a..9d3207d7 100644 --- a/panels/zcalibrate.py +++ b/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 KlippyGcodes import KlippyGcodes -from panels.screen_panel import ScreenPanel +from ks_includes.KlippyGtk import KlippyGtk +from ks_includes.KlippyGcodes import KlippyGcodes +from ks_includes.screen_panel import ScreenPanel import logging logger = logging.getLogger("KlipperScreen.ZCalibratePanel") diff --git a/screen.py b/screen.py index 1494587b..a4185ca9 100644 --- a/screen.py +++ b/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:") - and re.search(r'B:[0-9\.]+\s/[0-9\.]+\sT[0-9]+:[0-9\.]+', data)): - logger.debug(json.dumps([action, data], indent=2)) + elif self.shutdown == False and action == "notify_gcode response": + if "Klipper state: Shutdown" in data: + 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)