From e741fc6341bcfac03bb66fcd74e6618185a883f9 Mon Sep 17 00:00:00 2001
From: spoony <spoonysonny@163.com>
Date: Tue, 5 May 2020 00:08:40 +0800
Subject: [PATCH] v1.1

---
 README.md               |   4 ++--
 assets/dashboard.js     |   2 +-
 assets/dashboard.min.js |   5 +++--
 assets/logo.png         | Bin 0 -> 4305 bytes
 device.php              |  25 +++++++++++++++----------
 favicon.ico             | Bin 0 -> 5430 bytes
 index.php               |  19 ++++++++-----------
 7 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 assets/logo.png
 create mode 100644 favicon.ico

diff --git a/README.md b/README.md
index 557d413..8ea594f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Pi Dashboard
 A WebUI dashboard for IoT devices likes raspberry pi.
 
-Project details: (http://maker.quwj.com/project/10)
+Project details: (http://make.quwj.com/project/10)
 
-Copyright 2017 NXEZ.com.
+Copyright 2017-2020 NXEZ.com.
 
 Licensed under the GPL v3.0 license.
\ No newline at end of file
diff --git a/assets/dashboard.js b/assets/dashboard.js
index 67bd48e..5b28351 100644
--- a/assets/dashboard.js
+++ b/assets/dashboard.js
@@ -398,7 +398,7 @@ $(document).ready(function() {
                     point.update(Math.round((1.0 - (idle_diff / used_total)) * 100 * Math.pow(10,1))/Math.pow(10,1));
                 }
 
-
+                $("#cpu-freq").text(window.dashboard.cpu.freq / 1000);
                 $("#cpu-stat-idl").text(Math.round(((parseInt(window.dashboard.cpu.stat.idle) - parseInt(window.dashboard_old.cpu.stat.idle)) / used_total) * 100 * Math.pow(10,1))/Math.pow(10,1));
                 $("#cpu-stat-use").text(Math.round(((parseInt(window.dashboard.cpu.stat.user) - parseInt(window.dashboard_old.cpu.stat.user)) / used_total) * 100 * Math.pow(10,1))/Math.pow(10,1));
                 $("#cpu-stat-sys").text(Math.round(((parseInt(window.dashboard.cpu.stat.sys) - parseInt(window.dashboard_old.cpu.stat.sys)) / used_total) * 100 * Math.pow(10,1))/Math.pow(10,1));
diff --git a/assets/dashboard.min.js b/assets/dashboard.min.js
index a10b406..502286a 100644
--- a/assets/dashboard.min.js
+++ b/assets/dashboard.min.js
@@ -3,5 +3,6 @@
  * Copyright 2017 NXEZ.com.
  * Licensed under the GPL v3.0 license.
  */
-$(document).ready(function(){Highcharts.setOptions({global:{useUTC:false},credits:{enabled:false},navigation:{buttonOptions:{enabled:false}}});var j={chart:{type:"solidgauge"},title:null,pane:{center:["50%","85%"],size:"140%",startAngle:-90,endAngle:90,background:{backgroundColor:(Highcharts.theme&&Highcharts.theme.background2)||"#FFFFFF",innerRadius:"60%",outerRadius:"100%",shape:"arc"}},tooltip:{enabled:false},yAxis:{stops:[[0.1,"#55BF3B"],[0.5,"#DDDF0D"],[0.9,"#DF5353"]],lineWidth:0,minorTickInterval:null,tickAmount:2,title:{y:-70},labels:{y:16}},plotOptions:{solidgauge:{dataLabels:{y:5,borderWidth:0,useHTML:true}}}};var f=Highcharts.chart("container-cpu",Highcharts.merge(j,{yAxis:{min:0,max:100,title:{text:""}},series:[{name:"CPU",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:28px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y}</span>'+'<span style="font-size:12px;color:silver">%</span></div>'},tooltip:{valueSuffix:" %"}}]}));var c=Highcharts.chart("container-mem",Highcharts.merge(j,{yAxis:{min:0,max:init_vals.mem.total,title:{text:""}},series:[{name:"MEMORY",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:25px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:12px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var g=Highcharts.chart("container-cache",Highcharts.merge(j,{yAxis:{min:0,max:init_vals.mem.total,title:{text:""}},series:[{name:"CACHE",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var a=Highcharts.chart("container-mem-real",Highcharts.merge(j,{yAxis:{min:0,max:init_vals.mem.total,title:{text:""}},series:[{name:"REAL MEMORY",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var h=Highcharts.chart("container-swap",Highcharts.merge(j,{yAxis:{min:0,max:init_vals.mem.swap.total,title:{text:""}},series:[{name:"SWAP",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var b=Highcharts.chart("container-disk",Highcharts.merge(j,{yAxis:{min:0,max:init_vals.disk.total,title:{text:""}},series:[{name:"DISK",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">GB</span></div>'},tooltip:{valueSuffix:" GB"}}]}));var k=new Array();var e=new Array();var d=new Array();for(i=0;i<init_vals.net.count;i++){var l=Highcharts.chart("container-net-interface-"+(i+1),{title:{text:""},legend:{enabled:false},xAxis:{categories:[],title:{text:""}},yAxis:{title:{text:"",style:{fontWeight:"normal"}}},series:[{name:"IN",data:[0],color:"#093AC9",marker:{enabled:false}},{name:"OUT",data:[0],color:"#3CCB3E",marker:{enabled:false}}]});k[i]=l;e[i]=[0,0,0,0,0,0,0,0,0,0];d[i]=[0,0,0,0,0,0,0,0,0,0]}setInterval(function(){$.getJSON("?ajax=true",function(o){var n=new Date();n.setTime(parseInt(o.time)*1000);$("#time").text(n.format("hh:mm:ss"));$("#date").text(n.format("yyyy-MM-dd"));$("#uptime").text(uptimeFormat(o.uptime));$("#cpu-temp").text(Math.round(o.cpu.temp/1000*Math.pow(10,1))/Math.pow(10,1));$("#mem-percent").text(o.mem.percent);$("#mem-free").text(o.mem.free);$("#mem-cached").text(o.mem.cached);$("#mem-swap-total").text(o.mem.swap.total);$("#mem-cache-percent").text(o.mem.cached_percent);$("#mem-buffers").text(o.mem.buffers);$("#mem-real-percent").text(o.mem.real.percent);$("#mem-real-free").text(o.mem.real.free);$("#mem-swap-percent").text(o.mem.swap.percent);$("#mem-swap-free").text(o.mem.swap.free);$("#disk-percent").text(o.disk.percent);$("#disk-free").text(o.disk.free);$("#loadavg-1m").text(o.load_avg[0]);$("#loadavg-5m").text(o.load_avg[1]);$("#loadavg-10m").text(o.load_avg[2]);$("#loadavg-running").text(o.load_avg[3].split("/")[0]);$("#loadavg-threads").text(o.load_avg[3].split("/")[1]);for(i=0;i<o.net.count;i++){$("#net-interface-"+(i+1)+"-total-in").text(bytesRound(parseInt(o.net.interfaces[i].total_in),2));$("#net-interface-"+(i+1)+"-total-out").text(bytesRound(parseInt(o.net.interfaces[i].total_out),2))}if(window.dashboard!=null){window.dashboard_old=window.dashboard
-}window.dashboard=o});if(window.dashboard!=null){var m;if(c){m=c.series[0].points[0];m.update(window.dashboard.mem.used)}if(g){m=g.series[0].points[0];m.update(window.dashboard.mem.cached)}if(a){m=a.series[0].points[0];m.update(window.dashboard.mem.real.used)}if(h){m=h.series[0].points[0];m.update(window.dashboard.mem.swap.used)}if(b){m=b.series[0].points[0];m.update(window.dashboard.disk.used)}if(window.dashboard_old!=null){if(window.dashboard_old.net.count>0){for(i=0;i<window.dashboard_old.net.count;i++){if(k[i].series[0].data.length>=30){k[i].series[0].addPoint(parseInt(window.dashboard.net.interfaces[i].total_in)-parseInt(window.dashboard_old.net.interfaces[i].total_in),true,true)}else{k[i].series[0].addPoint(parseInt(window.dashboard.net.interfaces[i].total_in)-parseInt(window.dashboard_old.net.interfaces[i].total_in))}if(k[i].series[1].data.length>=30){k[i].series[1].addPoint(parseInt(window.dashboard.net.interfaces[i].total_out)-parseInt(window.dashboard_old.net.interfaces[i].total_out),true,true)}else{k[i].series[1].addPoint(parseInt(window.dashboard.net.interfaces[i].total_out)-parseInt(window.dashboard_old.net.interfaces[i].total_out))}}}idle_diff=parseInt(window.dashboard.cpu.stat.idle)-parseInt(window.dashboard_old.cpu.stat.idle);used_total=parseInt(window.dashboard.cpu.stat.idle)+parseInt(window.dashboard.cpu.stat.user)+parseInt(window.dashboard.cpu.stat.sys)+parseInt(window.dashboard.cpu.stat.nice)+parseInt(window.dashboard.cpu.stat.iowait)+parseInt(window.dashboard.cpu.stat.irq)+parseInt(window.dashboard.cpu.stat.softirq)-parseInt(window.dashboard_old.cpu.stat.idle)-parseInt(window.dashboard_old.cpu.stat.user)-parseInt(window.dashboard_old.cpu.stat.sys)-parseInt(window.dashboard_old.cpu.stat.nice)-parseInt(window.dashboard_old.cpu.stat.iowait)-parseInt(window.dashboard_old.cpu.stat.irq)-parseInt(window.dashboard_old.cpu.stat.softirq);if(f){m=f.series[0].points[0];m.update(Math.round((1-(idle_diff/used_total))*100*Math.pow(10,1))/Math.pow(10,1))}$("#cpu-stat-idl").text(Math.round(((parseInt(window.dashboard.cpu.stat.idle)-parseInt(window.dashboard_old.cpu.stat.idle))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-use").text(Math.round(((parseInt(window.dashboard.cpu.stat.user)-parseInt(window.dashboard_old.cpu.stat.user))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-sys").text(Math.round(((parseInt(window.dashboard.cpu.stat.sys)-parseInt(window.dashboard_old.cpu.stat.sys))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-nic").text(Math.round(((parseInt(window.dashboard.cpu.stat.nice)-parseInt(window.dashboard_old.cpu.stat.nice))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-iow").text(Math.round(((parseInt(window.dashboard.cpu.stat.iowait)-parseInt(window.dashboard_old.cpu.stat.iowait))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-irq").text(Math.round(((parseInt(window.dashboard.cpu.stat.irq)-parseInt(window.dashboard_old.cpu.stat.irq))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-sirq").text(Math.round(((parseInt(window.dashboard.cpu.stat.softirq)-parseInt(window.dashboard_old.cpu.stat.softirq))/used_total)*100*Math.pow(10,1))/Math.pow(10,1))}}},1000)});function bytesRound(c,a){if(c<0){var b=0+"B"}else{if(c<1024){var b=c+"B"}else{if(c<1048576){c=c/1024;var b=Math.round(c*Math.pow(10,a))/Math.pow(10,a)+"K"}else{if(c<1048576000){c=c/1048576;var b=Math.round(c*Math.pow(10,a))/Math.pow(10,a)+"M"}else{c=c/1048576000;var b=Math.round(c*Math.pow(10,a))/Math.pow(10,a)+"G"}}}}return b}Date.prototype.format=function(c){var b={"M+":this.getMonth()+1,"d+":this.getDate(),"h+":this.getHours(),"m+":this.getMinutes(),"s+":this.getSeconds(),"q+":Math.floor((this.getMonth()+3)/3),"S+":this.getMilliseconds()};if(/(y+)/i.test(c)){c=c.replace(RegExp.$1,(this.getFullYear()+"").substr(4-RegExp.$1.length))}for(var a in b){if(new RegExp("("+a+")").test(c)){c=c.replace(RegExp.$1,RegExp.$1.length==1?b[a]:("00"+b[a]).substr((""+b[a]).length))}}return c};function uptimeFormat(d){var c="";var b=parseInt(d)/60;var a=b/60;var e=Math.floor(a/24);var a=Math.floor(a-(e*24));b=Math.floor(b-(e*60*24)-(a*60));if(e!==0){if(e==1){c=e+" day "}else{c=e+" days "}}if(a!==0){c=c+a+":"}return c=c+b};
\ No newline at end of file
+$(document).ready(function(){Highcharts.setOptions({global:{useUTC:false},credits:{enabled:false},navigation:{buttonOptions:{enabled:false}}});var gaugeOptions={chart:{type:"solidgauge"},title:null,pane:{center:["50%","85%"],size:"140%",startAngle:-90,endAngle:90,background:{backgroundColor:(Highcharts.theme&&Highcharts.theme.background2)||"#FFFFFF",innerRadius:"60%",outerRadius:"100%",shape:"arc"}},tooltip:{enabled:false},yAxis:{stops:[[0.1,"#55BF3B"],[0.5,"#DDDF0D"],[0.9,"#DF5353"]],lineWidth:0,minorTickInterval:null,tickAmount:2,title:{y:-70},labels:{y:16}},plotOptions:{solidgauge:{dataLabels:{y:5,borderWidth:0,useHTML:true}}}};var chartCPU=Highcharts.chart("container-cpu",Highcharts.merge(gaugeOptions,{yAxis:{min:0,max:100,title:{text:""}},series:[{name:"CPU",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:28px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y}</span>'+'<span style="font-size:12px;color:silver">%</span></div>'},tooltip:{valueSuffix:" %"}}]}));var chartRAM=Highcharts.chart("container-mem",Highcharts.merge(gaugeOptions,{yAxis:{min:0,max:init_vals.mem.total,title:{text:""}},series:[{name:"MEMORY",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:25px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:12px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var chartCache=Highcharts.chart("container-cache",Highcharts.merge(gaugeOptions,{yAxis:{min:0,max:init_vals.mem.total,title:{text:""}},series:[{name:"CACHE",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var chartRAM_real=Highcharts.chart("container-mem-real",Highcharts.merge(gaugeOptions,{yAxis:{min:0,max:init_vals.mem.total,title:{text:""}},series:[{name:"REAL MEMORY",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var chartSWAP=Highcharts.chart("container-swap",Highcharts.merge(gaugeOptions,{yAxis:{min:0,max:init_vals.mem.swap.total,title:{text:""}},series:[{name:"SWAP",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">MB</span></div>'},tooltip:{valueSuffix:" MB"}}]}));var chartDisk=Highcharts.chart("container-disk",Highcharts.merge(gaugeOptions,{yAxis:{min:0,max:init_vals.disk.total,title:{text:""}},series:[{name:"DISK",data:[0],dataLabels:{format:'<div style="text-align:center"><span style="font-size:12px;color:'+((Highcharts.theme&&Highcharts.theme.contrastTextColor)||"black")+'">{y:.1f}</span><br/>'+'<span style="font-size:10px;color:silver">GB</span></div>'},tooltip:{valueSuffix:" GB"}}]}));var chartNetInterfaces=new Array();var net_In=new Array();var net_Out=new Array();for(i=0;i<init_vals.net.count;i++){var chartNetInterface=Highcharts.chart("container-net-interface-"+(i+1),{title:{text:""},legend:{enabled:false},xAxis:{categories:[],title:{text:""}},yAxis:{title:{text:"",style:{fontWeight:"normal"}}},series:[{name:"IN",data:[0],color:"#093AC9",marker:{enabled:false}},{name:"OUT",data:[0],color:"#3CCB3E",marker:{enabled:false}}]});chartNetInterfaces[i]=chartNetInterface;net_In[i]=[0,0,0,0,0,0,0,0,0,0];net_Out[i]=[0,0,0,0,0,0,0,0,0,0]}setInterval(function(){$.getJSON("?ajax=true",function(data){var newDate=new Date();newDate.setTime(parseInt(data.time)*1000);$("#time").text(newDate.format("hh:mm:ss"));$("#date").text(newDate.format("yyyy-MM-dd"));$("#uptime").text(uptimeFormat(data.uptime));$("#cpu-temp").text(Math.round(data.cpu.temp/1000*Math.pow(10,1))/Math.pow(10,1));$("#mem-percent").text(data.mem.percent);$("#mem-free").text(data.mem.free);$("#mem-cached").text(data.mem.cached);$("#mem-swap-total").text(data.mem.swap.total);$("#mem-cache-percent").text(data.mem.cached_percent);$("#mem-buffers").text(data.mem.buffers);$("#mem-real-percent").text(data.mem.real.percent);$("#mem-real-free").text(data.mem.real.free);$("#mem-swap-percent").text(data.mem.swap.percent);$("#mem-swap-free").text(data.mem.swap.free);$("#disk-percent").text(data.disk.percent);$("#disk-free").text(data.disk.free);$("#loadavg-1m").text(data.load_avg[0]);$("#loadavg-5m").text(data.load_avg[1]);$("#loadavg-10m").text(data.load_avg[2]);$("#loadavg-running").text(data.load_avg[3].split("/")[0]);$("#loadavg-threads").text(data.load_avg[3].split("/")[1]);
+    for(i=0;i<data.net.count;i++){$("#net-interface-"+(i+1)+"-total-in").text(bytesRound(parseInt(data.net.interfaces[i].total_in),2));$("#net-interface-"+(i+1)+"-total-out").text(bytesRound(parseInt(data.net.interfaces[i].total_out),2))}if(window.dashboard!=null){window.dashboard_old=window.dashboard}window.dashboard=data});if(window.dashboard!=null){var point;if(chartRAM){point=chartRAM.series[0].points[0];point.update(window.dashboard.mem.used)}if(chartCache){point=chartCache.series[0].points[0];point.update(window.dashboard.mem.cached)}if(chartRAM_real){point=chartRAM_real.series[0].points[0];point.update(window.dashboard.mem.real.used)}if(chartSWAP){point=chartSWAP.series[0].points[0];point.update(window.dashboard.mem.swap.used)}if(chartDisk){point=chartDisk.series[0].points[0];point.update(window.dashboard.disk.used)}if(window.dashboard_old!=null){if(window.dashboard_old.net.count>0){for(i=0;i<window.dashboard_old.net.count;i++){if(chartNetInterfaces[i].series[0].data.length>=30){chartNetInterfaces[i].series[0].addPoint(parseInt(window.dashboard.net.interfaces[i].total_in)-parseInt(window.dashboard_old.net.interfaces[i].total_in),true,true)}else{chartNetInterfaces[i].series[0].addPoint(parseInt(window.dashboard.net.interfaces[i].total_in)-parseInt(window.dashboard_old.net.interfaces[i].total_in))}if(chartNetInterfaces[i].series[1].data.length>=30){chartNetInterfaces[i].series[1].addPoint(parseInt(window.dashboard.net.interfaces[i].total_out)-parseInt(window.dashboard_old.net.interfaces[i].total_out),true,true)}else{chartNetInterfaces[i].series[1].addPoint(parseInt(window.dashboard.net.interfaces[i].total_out)-parseInt(window.dashboard_old.net.interfaces[i].total_out))}}}idle_diff=parseInt(window.dashboard.cpu.stat.idle)-parseInt(window.dashboard_old.cpu.stat.idle);used_total=parseInt(window.dashboard.cpu.stat.idle)+parseInt(window.dashboard.cpu.stat.user)+parseInt(window.dashboard.cpu.stat.sys)+parseInt(window.dashboard.cpu.stat.nice)+parseInt(window.dashboard.cpu.stat.iowait)+parseInt(window.dashboard.cpu.stat.irq)+parseInt(window.dashboard.cpu.stat.softirq)-parseInt(window.dashboard_old.cpu.stat.idle)-parseInt(window.dashboard_old.cpu.stat.user)-parseInt(window.dashboard_old.cpu.stat.sys)-parseInt(window.dashboard_old.cpu.stat.nice)-parseInt(window.dashboard_old.cpu.stat.iowait)-parseInt(window.dashboard_old.cpu.stat.irq)-parseInt(window.dashboard_old.cpu.stat.softirq);if(chartCPU){point=chartCPU.series[0].points[0];point.update(Math.round((1-(idle_diff/used_total))*100*Math.pow(10,1))/Math.pow(10,1))}$("#cpu-freq").text(window.dashboard.cpu.freq/1000);$("#cpu-stat-idl").text(Math.round(((parseInt(window.dashboard.cpu.stat.idle)-parseInt(window.dashboard_old.cpu.stat.idle))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-use").text(Math.round(((parseInt(window.dashboard.cpu.stat.user)-parseInt(window.dashboard_old.cpu.stat.user))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-sys").text(Math.round(((parseInt(window.dashboard.cpu.stat.sys)-parseInt(window.dashboard_old.cpu.stat.sys))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-nic").text(Math.round(((parseInt(window.dashboard.cpu.stat.nice)-parseInt(window.dashboard_old.cpu.stat.nice))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-iow").text(Math.round(((parseInt(window.dashboard.cpu.stat.iowait)-parseInt(window.dashboard_old.cpu.stat.iowait))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-irq").text(Math.round(((parseInt(window.dashboard.cpu.stat.irq)-parseInt(window.dashboard_old.cpu.stat.irq))/used_total)*100*Math.pow(10,1))/Math.pow(10,1));$("#cpu-stat-sirq").text(Math.round(((parseInt(window.dashboard.cpu.stat.softirq)-parseInt(window.dashboard_old.cpu.stat.softirq))/used_total)*100*Math.pow(10,1))/Math.pow(10,1))}}},1000)});function bytesRound(number,round){if(number<0){var last=0+"B"}else{if(number<1024){var last=number+"B"}else{if(number<1048576){number=number/1024;var last=Math.round(number*Math.pow(10,round))/Math.pow(10,round)+"K"}else{if(number<1048576000){number=number/1048576;var last=Math.round(number*Math.pow(10,round))/Math.pow(10,round)+"M"}else{number=number/1048576000;var last=Math.round(number*Math.pow(10,round))/Math.pow(10,round)+"G"}}}}return last}Date.prototype.format=function(format){var date={"M+":this.getMonth()+1,"d+":this.getDate(),"h+":this.getHours(),"m+":this.getMinutes(),"s+":this.getSeconds(),"q+":Math.floor((this.getMonth()+3)/3),"S+":this.getMilliseconds()};if(/(y+)/i.test(format)){format=format.replace(RegExp.$1,(this.getFullYear()+"").substr(4-RegExp.$1.length))}for(var k in date){if(new RegExp("("+k+")").test(format)){format=format.replace(RegExp.$1,RegExp.$1.length==1?date[k]:("00"+date[k]).substr((""+date[k]).length))}}return format};function uptimeFormat(str){var uptime="";var min=parseInt(str)/60;var hours=min/60;var days=Math.floor(hours/24);var hours=Math.floor(hours-(days*24));min=Math.floor(min-(days*60*24)-(hours*60));if(days!==0){if(days==1){uptime=days+" day "
+}else{uptime=days+" days "}}if(hours!==0){uptime=uptime+hours+":"}return uptime=uptime+min};
\ No newline at end of file
diff --git a/assets/logo.png b/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fd237fe0753dcb563487ad166844cd861168452
GIT binary patch
literal 4305
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

literal 0
HcmV?d00001

diff --git a/device.php b/device.php
index 85a561a..3c7180d 100644
--- a/device.php
+++ b/device.php
@@ -18,7 +18,7 @@ if (isset($_GET['ajax']) && $_GET['ajax'] == "true"){
     exit;
 }
 
-$D['version'] = '1.0.0';
+$D['version'] = '1.1.0';
 $D['model'] = get_device_model();
 $D['user'] = @get_current_user();
 $D['hostname'] = gethostname();
@@ -27,18 +27,11 @@ $D['yourip'] = $_SERVER['REMOTE_ADDR'];
 $D['uname'] = @php_uname();
 $D['os'] = explode(" ", php_uname());
 
-if (($str = @file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq")) !== false){
-    $D['cpu']['freq'] = $str[0];
-}
-else{
-    $D['cpu']['freq'] = 0;
-}
-
-
 if (($str = @file("/proc/cpuinfo")) !== false){
     $str = implode("", $str);
     @preg_match_all("/model\s+name\s{0,}\:+\s{0,}([\w\s\)\(\@.-]+)([\r\n]+)/s", $str, $model);
     @preg_match_all("/BogoMIPS\s{0,}\:+\s{0,}([\d\.]+)[\r\n]+/", $str, $bogomips);
+    @preg_match_all("/Model\s{0,}\:+\s{0,}([\w\s\)\(\@.-]+)([\r\n]+)/s", $str, $pimodel);
 
     if (false !== is_array($model[1])){
         $D['cpu']['count'] = sizeof($model[1]);
@@ -50,10 +43,15 @@ if (($str = @file("/proc/cpuinfo")) !== false){
             $D['cpu']['model'] = $model[1][0].$bogomips[1][0].' ×'.$D['cpu']['count'];
         }
     }
+
+    if (false !== is_array($pimodel[1])){
+        $D['model']['pimodel'] = $pimodel[1][0];
+    }
 }
 else{
     $D['cpu']['count'] = 1;
     $D['cpu']['model'] = '';
+    $D['model']['pimodel'] = '';
 }
 
 function get_device_model(){
@@ -73,6 +71,13 @@ function get_info(){
         $D['uptime'] = 0;
     }
 
+    if (($str = @file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq")) !== false){
+        $D['cpu']['freq'] = $str[0];
+    }
+    else{
+        $D['cpu']['freq'] = 0;
+    }
+
     // CPU Core
     if (($str = @file("/proc/stat")) !== false){
         $str = str_replace("  ", " ", $str);
@@ -175,4 +180,4 @@ function get_info(){
         $D['net']['count'] = 0;
     }
 }
-?>
+?>
\ No newline at end of file
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..852bf7c54fab0fda4c7e8542bdd48c179b077608
GIT binary patch
literal 5430
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
HDeV0pv>(Yi

literal 0
HcmV?d00001

diff --git a/index.php b/index.php
index f1d3824..d587d3b 100644
--- a/index.php
+++ b/index.php
@@ -7,12 +7,7 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'device.php');
     <title>Pi Dashboard</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!--script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
-    <script src="https://code.highcharts.com/highcharts.js"></script>
-    <script src="https://code.highcharts.com/highcharts-more.js"></script>
-    <script src="https://code.highcharts.com/modules/solid-gauge.js"></script>
-    <script src="https://code.highcharts.com/modules/exporting.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script-->
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
     <link href="assets/bootstrap.min.css" rel="stylesheet">
     <script src="assets/jquery-3.1.1.min.js"></script>
     <script src="assets/highcharts.js"></script>
@@ -40,16 +35,17 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'device.php');
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="#">Pi Dashboard</a>
+                <a class="navbar-brand" href="#"><img style="height: 100%; display: inline; margin-right: 10px;" src="assets/logo.png">Pi Dashboard</a>
             </div>
 
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a target="_blank" href="http://shumeipai.nxez.com">树莓派实验室</a></li>
+                    <li><a target="_blank" href="https://shumeipai.nxez.com">树莓派实验室</a></li>
+                    <li><a target="_blank" href="https://talk.quwj.com">趣小组</a></li>
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">About <span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
-                            <li><a target="_blank" href="http://maker.quwj.com/project/10">Pi Dashboard</a></li>
+                            <li><a target="_blank" href="https://make.quwj.com/project/10">Pi Dashboard</a></li>
                             <li><a target="_blank" href="https://github.com/spoonysonny/pi-dashboard">GitHub Source</a></li>
                         </ul>
                     </li>
@@ -63,6 +59,7 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'device.php');
             <div class="col-md-3">
                 <div style="text-align: center; padding: 20px 0;"><img src="assets/devices/<?php echo($D['model']['id']) ?>.png" /></div>
                 <div style="background-color: #E0E0E0; padding: 5px; border-radius: 3px;">
+                    <div class="text-center" style="margin:10px; padding: 10px 0 10px 0; border-radius: 3px;"><div id="pimodel" style="font-size: 90%; font-weight: bolder; text-shadow: 0 1px 0 #fff;"><?php echo($D['model']['pimodel']); ?></div></div>
                     <div class="text-center" style="margin:20px; padding: 10px 0 10px 0; background-color:#CEFCA3; border-radius: 3px;"><div class="label">IP</div><div id="hostip" style="font-size: 150%; font-weight: bolder;"><?php echo($D['hostip']); ?></div></div>
                     <div class="text-center" style="margin:20px; padding: 10px 0 10px 0; background-color:#9DCFFB; border-radius: 3px;"><div class="label">TIME</div><div id="time" style="font-size: 150%; font-weight: bolder;">00:00</div><div id="date">-</div></div>
                     <div class="text-center" style="margin:20px; padding: 10px 0 10px 0; background-color:#FFFECD; border-radius: 3px;"><div class="label">UPTIME</div><div id="uptime" style="font-size: 120%; font-weight: bolder;">0</div></div>
@@ -239,7 +236,7 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'device.php');
             <div class="col-md-12">
                 <div id="footer">
                     <hr style="margin: 20px 0 10px 0;" />
-                    <p class="pull-left" style="font-size: 12px;">Powered by <a target="_blank" href="http://maker.quwj.com/project/10"><strong>Pi Dashboard</strong></a> v<?php echo($D['version']) ?>, <a target="_blank" href="http://www.nxez.com">NXEZ.com</a> all rights reserved.
+                    <p class="pull-left" style="font-size: 12px;">Powered by <a target="_blank" href="https://make.quwj.com/project/10"><strong>Pi Dashboard</strong></a> v<?php echo($D['version']) ?>, <a target="_blank" href="https://www.nxez.com">NXEZ.com</a> all rights reserved.
                     </p>
                 </div>
             </div>
@@ -248,4 +245,4 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'device.php');
 </div>
 <script src="assets/dashboard.min.js"></script>
 </body>
-</html>
+</html>
\ No newline at end of file