X-Git-Url: http://wpitchoune.net/gitweb/?a=blobdiff_plain;f=www%2Fpsensor.js;h=3e902853faa99053eb469f835de90d936cdcdd7c;hb=cf12deca248d26a9577c634c9f37703c74f7358f;hp=5870b2b86cc9f4547c4b4bba5741f5e56c37bf2c;hpb=f055e7507526592d3a74c652f5f053701614c9c0;p=psensor-pkg-debian.git
diff --git a/www/psensor.js b/www/psensor.js
index 5870b2b..3e90285 100644
--- a/www/psensor.js
+++ b/www/psensor.js
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2011 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -46,23 +46,28 @@ function format_mem_size(s) {
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)
- 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)
- stype_str += " Fan";
+ stype_str += "RPM";
+ else if (stype & 0x0004)
+ stype_str += "Load";
return stype_str;
}
@@ -163,23 +168,25 @@ function update_menu() {
str = "";
- $.getJSON("/api/1.0/sensors", function(data) {
- str += "
Sensors\n";
+ $.getJSON("/api/1.1/sensors", function(data) {
+ str += "- CPU
";
+ url = "details.html?id="+escape("/api/1.1/cpu/usage");
+ link = "usage";
+ str += "- "+link+"
";
+ str += "
";
+
+ str += "Network";
+ str += "Memory";
+
+ str += "Sensors\n";
$.each(data, function(i, item) {
name = item["name"];
- url = "details.html?id="+escape("/api/1.0/sensors/"+item["id"]);
+ url = "details.html?id="+escape("/api/1.1/sensors/"+item["id"]);
link = ""+name+"";
str += "- "+link+"
";
});
str += "
";
-
- str += "CPU";
- url = "details.html?id="+escape("/api/1.0/cpu/usage");
- link = "usage";
- str += "- "+link+"
";
-
- str += "
";
$("#menu-list").append(str);
@@ -190,7 +197,7 @@ function update_menu() {
function update_summary_sensors() {
var name, value_str, min_str, max_str, type, type_str, url;
- $.getJSON("/api/1.0/sensors", function(data) {
+ $.getJSON("/api/1.1/sensors", function(data) {
$("#sensors tbody").html("");
$.each(data, function(i, item) {
@@ -200,7 +207,7 @@ function update_summary_sensors() {
min_str = value_to_str(item["min"], type);
max_str = value_to_str(item["max"], type);
type_str = type_to_str(type);
- url = "details.html?id="+escape("/api/1.0/sensors/"+item["id"]);
+ url = "details.html?id="+escape("/api/1.1/sensors/"+item["id"]);
$("#sensors tbody").append(""
+""+name+" | "
@@ -214,7 +221,7 @@ function update_summary_sensors() {
}
function update_summary_sysinfo() {
- $.getJSON("/api/1.0/sysinfo", function(data) {
+ $.getJSON("/api/1.1/sysinfo", function(data) {
$("#uptime").html("");
$("#cpu tbody").html("");
$("#memory").html("");
@@ -231,7 +238,7 @@ function update_summary_sysinfo() {
var uptime_h = Math.floor((uptime / (60*60)) % 24);
var uptime_d = Math.floor(uptime / (60*60*24));
- $("#cpu").append("
"+load+"% | "
+ $("#cpu").append(" |
"+load+"% | "
+load_1+" | "
+load_5+" | "
+load_15+" |
");