|
@@ -56,13 +56,6 @@ function dataFadeIn(){
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//Useful Functions
|
|
|
-function checkDec(n){return/^[0-9]{1,64}$/.test(n);}
|
|
|
-
|
|
|
-//Decimal operations
|
|
|
-function Dec2Bin(n){if(!checkDec(n)||n<0)return 0;return n.toString(2);}
|
|
|
-
|
|
|
-
|
|
|
// Alarm colors
|
|
|
var ALARM_RED = '#ff5050',
|
|
|
ALARM_YELLOW = '#f0ad4e',
|
|
@@ -416,9 +409,8 @@ function getCGI(url) {
|
|
|
}
|
|
|
|
|
|
function Alarm(bitmask, num) {
|
|
|
- var a = bitmask;
|
|
|
- var b = parseInt(a.split('').reverse().join(''), 2);
|
|
|
- var answ = (b & (1 << num)) >> num;
|
|
|
+ // Bit mask format DEC <NUMBER>
|
|
|
+ var answ = (bitmask & (1 << num)) >> num;
|
|
|
return answ;
|
|
|
}
|
|
|
|
|
@@ -438,7 +430,7 @@ function setIcons(containerID, icnName) {
|
|
|
|
|
|
function paramsRefresh() {
|
|
|
getJSON('getJson.cgi'+'?'+Math.random(), function (data) {
|
|
|
- var alrm = Dec2Bin(+data.alarm);
|
|
|
+ var alrm = +data.alarm;
|
|
|
var pstate = [];
|
|
|
var bstate = [];
|
|
|
var ups_bypass = Alarm(alrm, 5),
|