[Feature] Added possibility to configure displaynames of temperatures

octoprint_navbartemp/__init__.py

@@ -19,6 +19,9 @@ def __init__(self):
         self.isRaspi = False
         self.debugMode = False      # to simulate temp on Win/Mac
         self.displayRaspiTemp = True
+        self.bedTempDisplayName = "Bed:"
+        self.hotendTempDisplayName = "Hotend:"
+        self.raspiTempDisplayName = "Raspi:"
         self._checkTempTimer = None
 
     def on_after_startup(self):
@@ -40,17 +43,17 @@ def on_after_startup(self):
             elif match.group(1) == 'BCM2709':
                 self._logger.debug("Pi 2")
                 self.isRaspi = True
-	    elif match.group(1) == 'BCM2835':
-		self._logger.debug("Pi 3")
-		self.isRaspi = True
+            elif match.group(1) == 'BCM2835':
+                self._logger.debug("Pi 3")
+                self.isRaspi = True
 
             if self.isRaspi and self.displayRaspiTemp:
                 self._logger.debug("Let's start RepeatedTimer!")
                 self.startTimer(30.0)
-        elif self.debugMode:
-            self.isRaspi = True
-            if self.displayRaspiTemp:
-                self.startTimer(5.0)
+            elif self.debugMode:
+                self.isRaspi = True
+                if self.displayRaspiTemp:
+                    self.startTimer(5.0)
 
         self._logger.debug("is Raspberry Pi? - %s" % self.isRaspi)
 
@@ -86,12 +89,20 @@ def randrange_float(start, stop, step):
 
 	##~~ SettingsPlugin
     def get_settings_defaults(self):
-        return dict(displayRaspiTemp = self.displayRaspiTemp)
+        return dict(displayRaspiTemp = self.displayRaspiTemp, displayNames = dict(
+                bed = self.bedTempDisplayName,
+                hotend = self.hotendTempDisplayName,
+                raspi = self.raspiTempDisplayName
+            )
+        )
 
     def on_settings_save(self, data):
         octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
 
         self.displayRaspiTemp = self._settings.get(["displayRaspiTemp"])
+        self.bedTempDisplayName = self._settings.get(["displayNames.bedTempDisplayName"])
+        self.hotendTempDisplayName = self._settings.get(["displayNames.hotendTempDisplayName"])
+        self.raspiTempDisplayName = self._settings.get(["displayNames.raspiTempDisplayName"])
 
         if self.displayRaspiTemp:
             interval = 5.0 if self.debugMode else 30.0
@@ -106,12 +117,9 @@ def on_settings_save(self, data):
 
 	##~~ TemplatePlugin API
     def get_template_configs(self):
-        if self.isRaspi:
-            return [
-                dict(type="settings", template="navbartemp_settings_raspi.jinja2")
-            ]
-        else:
-            return []
+        return [
+            dict(type="settings", template="navbartemp_settings.jinja2")
+        ]
 
     ##~~ AssetPlugin API
     def get_assets(self):

octoprint_navbartemp/static/js/navbartemp.js

@@ -8,7 +8,17 @@ $(function() {
         self.isRaspi = ko.observable(false);
 
         self.formatBarTemperature = function(toolName, actual, target) {
-            var output = toolName + ": " + _.sprintf("%.1f°C", actual);
+            var displayName = "";
+
+            if (toolName == "Tool" || toolName == "End" || toolName == "Hotend" || toolName == "Hot End") {
+                displayName = self.settings.displayNames.hotend;
+            } else if (toolName == "Bett" || toolName == "Bed") {
+                displayName = self.settings.displayNames.bed;
+            } else {
+               displayName = toolName + ":";
+            }
+
+            var output = _.sprintf("%s %.1f°C", displayName, actual);
 
             if (target) {
                 var sign = (target >= actual) ? " \u21D7 " : " \u21D8 ";
@@ -34,7 +44,7 @@ $(function() {
                 self.isRaspi(true);
             }
 
-            self.raspiTemp(_.sprintf("Raspi: %.1f°C", data.raspitemp));
+            self.raspiTemp(_.sprintf("%s %.1f°C", self.settings.displayNames.raspi, data.raspitemp));
         };
     }
 

octoprint_navbartemp/templates/navbartemp_settings.jinja2

@@ -0,0 +1,30 @@
+<h4>Configuration</h4>
+
+<form class="form-horizontal">
+    <div class="control-group">
+        <label class="control-label" for="settings-navbartemp-bedtemp-displayname">Bed Temp Displayname:</label>
+        <div class="controls">
+            <input type="text" name="settings-navbartemp-bedtemp-displayname" data-bind="value: settings.displayNames.bed"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label" for="settings-navbartemp-hotendtemp-displayname">Hotend Displayname:</label>
+        <div class="controls">
+            <input type="text" name="settings-navbartemp-hotendtemp-displayname" data-bind="value: settings.displayNames.hotend"/>
+        </div>
+    </div>
+    <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>
+    <div class="control-group" data-bind="visible: settings.displayRaspiTemp">
+        <label class="control-label" for="settings-navbartemp-raspitemp-displayname">RasPi Displayname:</label>
+        <div class="controls">
+            <input type="text" name="settings-navbartemp-raspitemp-displayname" data-bind="value: settings.displayNames.raspi"/>
+        </div>
+    </div>
+</form>