Added settings dialog for internal temperature on Raspberry Pi

Author: imrahil

octoprint_navbartemp/__init__.py

@@ -12,13 +12,19 @@
 
 class NavBarPlugin(octoprint.plugin.StartupPlugin,
                    octoprint.plugin.TemplatePlugin,
-                   octoprint.plugin.AssetPlugin):
+                   octoprint.plugin.AssetPlugin,
+                   octoprint.plugin.SettingsPlugin):
 
     def __init__(self):
         self.isRaspi = False
-        self.debugMode = False      # to simulate temp on Win/Mac
+        self.debugMode = True      # to simulate temp on Win/Mac
+        self.displayRaspiTemp = True
+        self._checkTempTimer = None
 
     def on_after_startup(self):
+        self.displayRaspiTemp = self._settings.get(["displayRaspiTemp"])
+        self._logger.debug("displayRaspiTemp: %s" % self.displayRaspiTemp)
+
         if sys.platform == "linux2":
             with open('/proc/cpuinfo', 'r') as infile:
                     cpuinfo = infile.read()
@@ -35,17 +41,20 @@ def on_after_startup(self):
                 self._logger.debug("Pi 2")
                 self.isRaspi = True
 
-            if self.isRaspi:
+            if self.isRaspi and self.displayRaspiTemp:
                 self._logger.debug("Let's start RepeatedTimer!")
-                t = RepeatedTimer(30.0, self.checkRaspiTemp)
-                t.start()
+                self.startTimer(30.0)
         elif self.debugMode:
             self.isRaspi = True
-            t = RepeatedTimer(5.0, self.checkRaspiTemp)
-            t.start()
+            if self.displayRaspiTemp:
+                self.startTimer(5.0)
 
         self._logger.debug("is Raspberry Pi? - %s" % self.isRaspi)
 
+    def startTimer(self, interval):
+        self._checkTempTimer = RepeatedTimer(interval, self.checkRaspiTemp, None, None, True)
+        self._checkTempTimer.start()
+
     def checkRaspiTemp(self):
         from sarge import run, Capture
 
@@ -54,12 +63,11 @@ def checkRaspiTemp(self):
         if sys.platform == "linux2":
             p = run("/opt/vc/bin/vcgencmd measure_temp", stdout=Capture())
             p = p.stdout.text
+
         elif self.debugMode:
             import random
-
             def randrange_float(start, stop, step):
                 return random.randint(0, int((stop - start) / step)) * step + start
-
             p = "temp=%s'C" % randrange_float(5, 60, 0.1)
 
         self._logger.debug("response from sarge: %s" % p)
@@ -73,8 +81,36 @@ def randrange_float(start, stop, step):
             self._plugin_manager.send_plugin_message(self._identifier, dict(israspi=self.isRaspi, raspitemp=temp))
 
 
+	##~~ SettingsPlugin
+    def get_settings_defaults(self):
+        return dict(displayRaspiTemp = self.displayRaspiTemp)
+
+    def on_settings_save(self, data):
+        octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
+
+        self.displayRaspiTemp = self._settings.get(["displayRaspiTemp"])
+
+        if self.displayRaspiTemp:
+            interval = 5.0 if self.debugMode else 30.0
+            self.startTimer(interval)
+        else:
+            if self._checkTempTimer is not None:
+                try:
+                    self._checkTempTimer.cancel()
+                except:
+                    pass
+            self._plugin_manager.send_plugin_message(self._identifier, dict())
+
+	##~~ TemplatePlugin API
+    def get_template_configs(self):
+        if self.isRaspi:
+            return [
+                dict(type="settings", template="navbartemp_settings_raspi.jinja2")
+            ]
+        else:
+            return []
+
     ##~~ AssetPlugin API
-    
     def get_assets(self):
         return {
             "js": ["js/navbartemp.js"],

octoprint_navbartemp/static/js/navbartemp.js

@@ -3,9 +3,14 @@ $(function() {
         var self = this;
 
         self.navBarTempModel = parameters[0];
+        self.global_settings = parameters[1];
         self.raspiTemp = ko.observable();
         self.isRaspi = ko.observable(false);
 
+        self.onBeforeBinding = function () {
+            self.settings = self.global_settings.settings.plugins.navbartemp;
+        };
+
         self.onDataUpdaterPluginMessage = function(plugin, data) {
             if (plugin != "navbartemp") {
                 return;
@@ -24,8 +29,8 @@ $(function() {
 
     ADDITIONAL_VIEWMODELS.push([
         NavbarTempViewModel, 
-        ["temperatureViewModel"], 
-        ["#navbar_plugin_navbartemp"]
+        ["temperatureViewModel", "settingsViewModel"],
+        ["#navbar_plugin_navbartemp", "#settings_plugin_navbartemp"]
     ]);
 });
 

octoprint_navbartemp/templates/navbartemp_settings_raspi.jinja2

@@ -0,0 +1,12 @@
+<h4>Configuration for Raspberry Pi</h4>
+
+<form class="form-horizontal">
+    <div class="control-group">
+        <label class="control-label" for="settings-navbartemp-display"></label>
+        <div class="controls">
+            <label class="checkbox">
+                <input type="checkbox" data-bind="checked: settings.displayRaspiTemp"> Display internal temperature
+            </label>
+        </div>
+    </div>
+</form>

setup.py

@@ -6,7 +6,7 @@
 plugin_identifier = "navbartemp"
 plugin_package = "octoprint_%s" % plugin_identifier
 plugin_name = "OctoPrint-NavbarTemp"
-plugin_version = "0.6.1"
+plugin_version = "0.7"
 plugin_description = "Displays temperatures on navbar"
 plugin_author = "Jarek Szczepanski"
 plugin_author_email = "imrahil@imrahil.com"