Sensor

From 09c3a371e5e48ea84a9dc3a591564d58cfeaadd6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 12 Sep 2011 20:32:28 +0000 Subject: [PATCH] cleanup --- www/details.html | 84 ++++++++------------------------------ www/psensor.js | 122 ++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 117 insertions(+), 89 deletions(-) diff --git a/www/details.html b/www/details.html index 43c38cc..45bb367 100644 --- a/www/details.html +++ b/www/details.html @@ -3,86 +3,38 @@ Sensor - + - + + - - - - + + + - + -

- +

- + diff --git a/www/psensor.js b/www/psensor.js index 30b7001..925f3d4 100644 --- a/www/psensor.js +++ b/www/psensor.js @@ -1,11 +1,32 @@ +/* + * 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + function format_mem_size(s) { - var mo_bytes = 1024 * 1024; - var go_bytes = 1024 * mo_bytes; + var mo_bytes, go_bytes, o, k, m, g; + + mo_bytes = 1024 * 1024; + go_bytes = 1024 * mo_bytes; - var o = s % 1024; - var k = Math.round((s / 1024) % 1024); - var m = Math.round((s / (1024*1024)) % 1024); - var g = Math.round(s / (1024*1024*1024)); + o = s % 1024; + k = Math.round((s / 1024) % 1024); + m = Math.round((s / (1024*1024)) % 1024); + g = Math.round(s / (1024*1024*1024)); if (g >= 1) return g+"Go "; @@ -23,47 +44,102 @@ function format_mem_size(s) { }; function type_to_str(stype) { - var stype_str = "N/A"; + var stype_str; - if (stype & 0x0100) { + stype_str = "N/A"; + + if (stype & 0x0100) stype_str = "Sensor"; - } else if (stype & 0x0200) { + else if (stype & 0x0200) stype_str = "NVidia"; - } else if (stype & 0x0400) { + else if (stype & 0x0400) stype_str = "HDD"; - } else if (stype & 0x1000) { + else if (stype & 0x1000) stype_str = "AMD"; - } - - if (stype & 0x0001) { + + if (stype & 0x0001) stype_str += " Temperature"; - } else if (stype & 0x0002) { + else if (stype & 0x0002) stype_str += " Fan"; - } return stype_str; }; function type_to_unit(stype) { - if (stype & 0x0001) { + if (stype & 0x0001) unit = " C"; - } else if (stype & 0x0002) { + else if (stype & 0x0002) unit = " RPM"; - } return unit; } function get_url_params() { - var vars = [], hash; - var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); - for(var i = 0; i < hashes.length; i++) - { + var vars, hashes, i; + + vars = []; + hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); + + for(i = 0; i < hashes.length; i++) { hash = hashes[i].split('='); vars.push(hash[0]); vars[hash[0]] = hash[1]; } + return vars; } +function update_chart(chart_id, title, data) { + var min_date, max_date, min, max, value; + var measures, data_chart, date, entry; + var style; + + measures = data["measures"]; + data_chart = []; + + $("h1").append(data["name"]); + $("title").append(data["name"]); + + $.each(measures, function(i, item) { + value = item["value"]; + date = new Date(item["time"]*1000); + entry = [date, item["value"]]; + + data_chart.push(entry); + + if (!max_date || max_date < date) + max_date = date; + if (!min_date || min_date > date) + min_date = date; + + if (!min || value < min) + min = value; + if (!max || value > max) + max = value; + }); + + style = { + title: title, + axes: { + xaxis: { + renderer: $.jqplot.DateAxisRenderer, + tickOptions: { + formatString:'%H:%M:%S' + }, + min: min_date, + max: max_date + }, + yaxis: { + min: min-1, + max: max+1 + } + }, + series: [ { + lineWidth: 1, + showMarker:false + } ] + }; + + $.jqplot (chart_id, [data_chart], style); +} \ No newline at end of file -- 2.7.4