Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.0.1.7 #64

Merged
merged 5 commits into from
Oct 25, 2021
Merged

0.0.1.7 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
698b6ff
Fixed missing inline help for digits - comment in #56
LazeMSS Sep 27, 2021
9faf99b
Merge pull request #60 from LazeMSS/main
LazeMSS Oct 1, 2021
77f9875
Removed brainfart - i hope
LazeMSS Oct 11, 2021
09afe5a
Fixed broken data- entries in selector. Fixed psutil fans not returin…
LazeMSS Oct 25, 2021
29845eb
0.0.1.7 release
LazeMSS Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions octoprint_toptemp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions octoprint_toptemp/static/css/TopTemp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,4 @@ body.TopTemPreviewON div#settings_dialog {
color: #333;
}

#navbar_plugin_toptemp > div:not(.IconsLeft) .navbar-text{
line-height: 15px;
}

/* TopTemp END */
6 changes: 3 additions & 3 deletions octoprint_toptemp/static/js/TopTemp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ $(function() {
if (val[2] == null){
return;
}
var item = $('<li><a href="#" data->'+val[1]+'</a></li>');
var item = $('<li><a href="#">'+val[1]+'</a></li>');
item.on('click',function(){
$(this).closest('div.input-append').find('input').val(val[0]).trigger('change');
});
Expand All @@ -571,7 +571,7 @@ $(function() {
$('#'+newId).find('.toptempTestCMDOutContainer').hide();
if (self.customPSUs != null){
$.each(self.customPSUs,function(idx,val){
var item = $('<li><a href="#" data->'+val[0]+'</a></li>');
var item = $('<li><a href="#">'+val[0]+'</a></li>');
item.on('click',function(){
$('#'+newId).find('.topTempPSUtilView').html(val[0]);
$(this).closest('div.input-append').find('input').val(idx).trigger('change');
Expand All @@ -584,7 +584,7 @@ $(function() {
$('#'+newId).find('.topTempShowPS,.topTempShowCMD,.toptempTestCMDOutContainer').hide();
$('#'+newId).find('.topTempShowGC').show();
$.each(self.GcodePred[newVal],function(idx,val){
var item = $('<li><a href="#" data->'+idx+'</a></li>');
var item = $('<li><a href="#">'+idx+'</a></li>');
item.on('click',function(){
$(this).closest('div.input-append').find('input').val(val).trigger('change');
});
Expand Down
3 changes: 3 additions & 0 deletions octoprint_toptemp/templates/toptemp_settings.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@
<label class="control-label">Number of digits</label>
<div class="controls">
<input type="number" min="0" max="2" step="any" data-bind="value: settings.plugins.toptemp.chamber.noDigits">
<span class="help-inline">-1 = return all digits</span>
</div>
</div>
<div class="control-group" title="Decimal seperator">
Expand Down Expand Up @@ -460,6 +461,7 @@
<label class="control-label">Number of digits</label>
<div class="controls">
<input type="number" min="0" max="2" step="any" data-bind="value: $parent.settings.plugins.toptemp['tool'+$index()].noDigits">
<span class="help-inline">-1 = return all digits</span>
</div>
</div>
<div class="control-group" title="Decimal seperator">
Expand Down Expand Up @@ -667,6 +669,7 @@
<label class="control-label">Number of digits</label>
<div class="controls">
<input type="number" min="-1" step="1" data-settings="noDigits">
<span class="help-inline">-1 = return all digits</span>
</div>
</div>
<div class="control-group" title="Decimal seperator">
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down