projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7fdddf9
)
propagates new definition of the sensor types
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Fri, 22 Mar 2013 10:17:18 +0000
(10:17 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Fri, 22 Mar 2013 10:17:18 +0000
(10:17 +0000)
www/psensor.js
patch
|
blob
|
history
diff --git
a/www/psensor.js
b/www/psensor.js
index
b002c41
..
5e9d91f
100644
(file)
--- a/
www/psensor.js
+++ b/
www/psensor.js
@@
-46,23
+46,28
@@
function format_mem_size(s) {
function type_to_str(stype) {
var stype_str;
function type_to_str(stype) {
var stype_str;
- stype_str = "N/A";
-
- if (stype & 0x0100)
- stype_str = "Sensor";
- else if (stype & 0x0200)
- stype_str = "NVidia";
- else if (stype & 0x0400)
- stype_str = "HDD";
+ if (stype & 0x0200)
+ stype_str = "NVidia ";
else if (stype & 0x0800)
else if (stype & 0x0800)
- stype_str = "
CPU Usage Percentage
";
- else
if (stype & 0x1000)
-
stype_str = "AMD
";
+ stype_str = "
ATI/AMD
";
+ else
+
stype_str = "
";
- if (stype & 0x0001)
- stype_str += " Temperature";
+ if (stype & 0x04000)
+ stype_str += "HDD ";
+ else if (stype & 0x08000)
+ stype_str += "CPU ";
+ else if (stype & 0x10000)
+ stype_str += "GPU ";
+ else if (stype & 0x20000)
+ stype_str += "Fan ";
+
+ if (stype & 0x0001)
+ stype_str += "Temperature";
else if (stype & 0x0002)
else if (stype & 0x0002)
- stype_str += " Fan";
+ stype_str += "RPM";
+ else if (stype & 0x0004)
+ stype_str += "Load";
return stype_str;
}
return stype_str;
}