From 0defece4bdf330bf0cb47297a5755c48d73d4c70 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 14 Apr 2015 14:31:52 +0200 Subject: [PATCH] Added extensions as a working plugin type --- USBPrinterManager.py | 12 +++++++++--- __init__.py | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/USBPrinterManager.py b/USBPrinterManager.py index ba0db5cfc7..6180ed66e8 100644 --- a/USBPrinterManager.py +++ b/USBPrinterManager.py @@ -1,20 +1,21 @@ from UM.Signal import Signal, SignalEmitter -from UM.PluginObject import PluginObject from . import PrinterConnection from UM.Application import Application from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.SceneNode import SceneNode +from UM.Resources import Resources import threading import platform import glob import time import os import sys +from UM.Extension import Extension from PyQt5.QtQuick import QQuickView from PyQt5.QtCore import QUrl, QObject,pyqtSlot , pyqtProperty,pyqtSignal -class USBPrinterManager(QObject, SignalEmitter,PluginObject): +class USBPrinterManager(QObject, SignalEmitter, Extension): def __init__(self, parent = None): super().__init__(parent) self._serial_port_list = [] @@ -31,6 +32,8 @@ class USBPrinterManager(QObject, SignalEmitter,PluginObject): self._bed_temp = 0 self._error_message = "" + self.addMenuItem("Update firmware", self.updateAllFirmware) + #time.sleep(1) #self.connectAllConnections() #time.sleep(5) @@ -105,7 +108,10 @@ class USBPrinterManager(QObject, SignalEmitter,PluginObject): pass - + def updateAllFirmware(self): + for printer_connection in self._printer_connections: + printer_connection.updateFirmware(Resources.getPath(Resources.FirmwareLocation, self._getDefaultFirmwareName())) + def updateFirmwareBySerial(self, serial_port): printer_connection = self.getConnectionByPort(serial_port) if printer_connection is not None: diff --git a/__init__.py b/__init__.py index ee73863826..c5c0a4733d 100644 --- a/__init__.py +++ b/__init__.py @@ -1,12 +1,12 @@ from . import USBPrinterManager def getMetaData(): return { - 'type': 'storage_device', + 'type': 'extension', 'plugin': { - 'name': 'Local File Storage', + 'name': 'USB printing', 'author': 'Jaime van Kessel', 'version': '1.0', - 'description': 'Accepts G-Code and sends them to a printer. ' + 'description': 'Accepts G-Code and sends them to a printer. Plugin can also update firmware ' } }