diff --git a/octoprint_toptemp/__init__.py b/octoprint_toptemp/__init__.py index 5a16a24..1e9e41c 100644 --- a/octoprint_toptemp/__init__.py +++ b/octoprint_toptemp/__init__.py @@ -397,7 +397,7 @@ def buildPsuUtil(self): label = entry.label else: label = name + "-" +str(count) - self.psutilList['fanspeed_'+str(count)] = ["Fanspeed " + label + " RPM",[name,entryno]] + self.psutilList['fanspeed_'+str(count)] = ["Fanspeed \"" + label + "\" RPM",[name,entryno]] count += 1 entryno += 1 @@ -691,7 +691,7 @@ def runPSUtil(self,indx,cmd,returnData = False): fanEntry = self.psutilList[cmd][1][1] fans = psutil.sensors_fans() if fans and fanName in fans: - fans[fanName][fanEntry].current + returnVal = fans[fanName][fanEntry].current if returnVal: self.debugOut("psutil " + cmd + " returned: " + str(returnVal) + " for index :"+indx) diff --git a/octoprint_toptemp/static/css/TopTemp.css b/octoprint_toptemp/static/css/TopTemp.css index 5eaf301..5283945 100644 --- a/octoprint_toptemp/static/css/TopTemp.css +++ b/octoprint_toptemp/static/css/TopTemp.css @@ -232,8 +232,4 @@ body.TopTemPreviewON div#settings_dialog { color: #333; } -#navbar_plugin_toptemp > div:not(.IconsLeft) .navbar-text{ - line-height: 15px; -} - /* TopTemp END */ \ No newline at end of file diff --git a/octoprint_toptemp/static/js/TopTemp.js b/octoprint_toptemp/static/js/TopTemp.js index e8da448..e701606 100644 --- a/octoprint_toptemp/static/js/TopTemp.js +++ b/octoprint_toptemp/static/js/TopTemp.js @@ -558,7 +558,7 @@ $(function() { if (val[2] == null){ return; } - var item = $('
  • '+val[1]+'
  • '); + var item = $('
  • '+val[1]+'
  • '); item.on('click',function(){ $(this).closest('div.input-append').find('input').val(val[0]).trigger('change'); }); @@ -571,7 +571,7 @@ $(function() { $('#'+newId).find('.toptempTestCMDOutContainer').hide(); if (self.customPSUs != null){ $.each(self.customPSUs,function(idx,val){ - var item = $('
  • '+val[0]+'
  • '); + var item = $('
  • '+val[0]+'
  • '); item.on('click',function(){ $('#'+newId).find('.topTempPSUtilView').html(val[0]); $(this).closest('div.input-append').find('input').val(idx).trigger('change'); @@ -584,7 +584,7 @@ $(function() { $('#'+newId).find('.topTempShowPS,.topTempShowCMD,.toptempTestCMDOutContainer').hide(); $('#'+newId).find('.topTempShowGC').show(); $.each(self.GcodePred[newVal],function(idx,val){ - var item = $('
  • '+idx+'
  • '); + var item = $('
  • '+idx+'
  • '); item.on('click',function(){ $(this).closest('div.input-append').find('input').val(val).trigger('change'); }); diff --git a/octoprint_toptemp/templates/toptemp_settings.jinja2 b/octoprint_toptemp/templates/toptemp_settings.jinja2 index a474db3..3087282 100644 --- a/octoprint_toptemp/templates/toptemp_settings.jinja2 +++ b/octoprint_toptemp/templates/toptemp_settings.jinja2 @@ -307,6 +307,7 @@
    + -1 = return all digits
    @@ -460,6 +461,7 @@
    + -1 = return all digits
    @@ -667,6 +669,7 @@
    + -1 = return all digits
    diff --git a/setup.py b/setup.py index f6746ad..8a52a91 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_name = "Top Temp" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "0.0.1.6" +plugin_version = "0.0.1.7" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module