|
|
@@ -27,9 +27,14 @@ const SUB_TYPE=function(){
|
|
|
SUB_TYPE_POWER_THRESHOLD:len++, //power_ch_t
|
|
|
SUB_TYPE_POWER_START_DELAY:len++, //power_total_t
|
|
|
SUB_TYPE_POWER_STOP_DELAY:len++,
|
|
|
+
|
|
|
+ SUB_TYPE_PARAS_MODBUS:len++,
|
|
|
+ SUB_TYPE_PARAS_MISC:len++,
|
|
|
+ SUB_TYPE_PARAS_PROD:len++,
|
|
|
+ SUB_TYPE_PARAS_SERV:len++,
|
|
|
+ SUB_TYPE_PARAS_NETWORK:len++,
|
|
|
}
|
|
|
}();
|
|
|
-
|
|
|
const PDU_TYPE=function(){
|
|
|
var len = 0;
|
|
|
return {
|
|
|
@@ -40,7 +45,6 @@ const PDU_TYPE=function(){
|
|
|
PDU_AC_I3O1_H:len++,
|
|
|
}
|
|
|
}();
|
|
|
-
|
|
|
const ALARM_ACT=function(){
|
|
|
var len = 1;
|
|
|
return {
|
|
|
@@ -49,7 +53,42 @@ const ALARM_ACT=function(){
|
|
|
ALARM_ACT_CLOSE_CHALL:len++,
|
|
|
}
|
|
|
}();
|
|
|
-
|
|
|
+const IP_MODE=function(){
|
|
|
+ var len = 0;
|
|
|
+ return {
|
|
|
+ IP_MODE_DHCP:len++,
|
|
|
+ IP_MODE_STATIC:len++,
|
|
|
+ }
|
|
|
+}();
|
|
|
+const IP_VER=function(){
|
|
|
+ var len = 0;
|
|
|
+ return {
|
|
|
+ IP_VER_ERR:len++,
|
|
|
+ IP_VER_V4:len++,
|
|
|
+ IP_VER_V6:len++,
|
|
|
+ }
|
|
|
+}();
|
|
|
+const MODBUS_MODE=function(){
|
|
|
+ var len = 0;
|
|
|
+ return {
|
|
|
+ MODBUS_MASTER:len++,
|
|
|
+ MODBUS_SLAVE:len++,
|
|
|
+ }
|
|
|
+}();
|
|
|
+const LANG_ID=function(){
|
|
|
+ var len = 0;
|
|
|
+ return {
|
|
|
+ LANG_ID_CHINESE:len++,
|
|
|
+ LANG_ID_ENGLISH:len++,
|
|
|
+ LANG_ID_RUSSIAN:len++,
|
|
|
+ LANG_ID_SPANISH:len++,
|
|
|
+ LANG_ID_PORTYGYESE:len++,
|
|
|
+ LANG_ID_GERMAN:len++,
|
|
|
+ LANG_ID_FRENCH:len++,
|
|
|
+ LANG_ID_ITALIAN:len++,
|
|
|
+ LANG_ID_JAPANESE:len++,
|
|
|
+ }
|
|
|
+}();
|
|
|
|
|
|
///////////////////////////////////////////////////////
|
|
|
function array_to_string(data){
|
|
|
@@ -57,6 +96,13 @@ function array_to_string(data){
|
|
|
return decoder.decode(new Uint8Array(data));
|
|
|
}
|
|
|
|
|
|
+function array_set(array,str,offset){
|
|
|
+ const encoder = new TextEncoder(); // ĬÈÏ'utf-8'±àÂë
|
|
|
+ const buffer = encoder.encode(str);
|
|
|
+ array.set(buffer);
|
|
|
+ array.fill(offset, buffer.length);
|
|
|
+}
|
|
|
+
|
|
|
function string_to_array(data,len){
|
|
|
const encoder = new TextEncoder(); // ĬÈÏ'utf-8'±àÂë
|
|
|
const buffer = encoder.encode(data);
|
|
|
@@ -81,14 +127,14 @@ function array_cat(a1,a2){
|
|
|
}
|
|
|
return buffer;
|
|
|
}
|
|
|
-function mk_hdr(addr,type,flag)
|
|
|
+function mk_hdr_bin(addr,type,subtype,nack,flag,dlen)
|
|
|
{
|
|
|
var tmp,length=0;
|
|
|
- var buffer = new ArrayBuffer(13);
|
|
|
-
|
|
|
+ var buffer = new ArrayBuffer(14);
|
|
|
+
|
|
|
tmp = new DataView(buffer, length);
|
|
|
var t = MAGIC;
|
|
|
- tmp.setUint16(0,t,true);//magic
|
|
|
+ tmp.setUint16(0,t,true); //magic
|
|
|
length += 2;
|
|
|
|
|
|
tmp = new DataView(buffer, length);
|
|
|
@@ -112,58 +158,42 @@ function mk_hdr(addr,type,flag)
|
|
|
length += 4;
|
|
|
|
|
|
tmp = new DataView(buffer, length);
|
|
|
- tmp.setUint32(0,0,true); //dlen
|
|
|
+ tmp.setUint32(0,dlen,true); //dlen
|
|
|
length += 4;
|
|
|
|
|
|
return buffer;
|
|
|
}
|
|
|
-function pkt_to_bin(type,subtype,js)
|
|
|
+function mk_hdr_obj(addr,type,subtype,nack,flag,dlen)
|
|
|
{
|
|
|
- var tmp,tmp2,length=0;
|
|
|
- var buffer = new ArrayBuffer(13);
|
|
|
-
|
|
|
- tmp = new DataView(buffer, length);
|
|
|
- var t = MAGIC;
|
|
|
- tmp.setUint16(0,t,true);//magic
|
|
|
- length += 2;
|
|
|
-
|
|
|
- tmp = new DataView(buffer, length);
|
|
|
- tmp.setUint8(0,type,true); //type
|
|
|
- length += 1;
|
|
|
-
|
|
|
- tmp = new DataView(buffer, length);
|
|
|
- tmp.setUint8(0,subtype,true); //subtype
|
|
|
- length += 1;
|
|
|
-
|
|
|
- tmp = new DataView(buffer, length);
|
|
|
- tmp.setUint8(0,0,true); //nack
|
|
|
- length += 1;
|
|
|
-
|
|
|
- tmp = new DataView(buffer, length);
|
|
|
- tmp.setUint32(0,0,true); //flag
|
|
|
- length += 4;
|
|
|
-
|
|
|
- tmp = new DataView(buffer, length);
|
|
|
- tmp.setUint32(0,js.len,true); //dlen
|
|
|
- length += 4;
|
|
|
+ this.magic = MAGIC;
|
|
|
+ this.addr = addr;
|
|
|
+ this.type = type;
|
|
|
+ this.subtype = subtype;
|
|
|
+ this.flag = flag;
|
|
|
+ this.dlen = dlen;
|
|
|
+}
|
|
|
+function pkt_to_bin(addr,type,subtype,nack,flag,js)
|
|
|
+{
|
|
|
+ var tmp;
|
|
|
+ var buffer = new mk_hdr_bin(addr,type,subtype,nack,flag,js.len);
|
|
|
|
|
|
switch(type){
|
|
|
case PKT_TYPE.PKT_TYPE_POWER_CH:
|
|
|
- tmp2 = new powerc_to_bin(js);
|
|
|
+ tmp = new powerc_to_bin(js);
|
|
|
break;
|
|
|
|
|
|
case PKT_TYPE.PKT_TYPE_POWER_TOTAL:
|
|
|
- tmp2 = BIN.powert.j2b(js);
|
|
|
+ tmp = new powert_to_bin(js);
|
|
|
break;
|
|
|
|
|
|
case PKT_TYPE.PKT_TYPE_ALARM:
|
|
|
- tmp2 = BIN.alarm.j2b(js);
|
|
|
+ tmp = new alarm_to_bin(js);
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
- return tmp2;
|
|
|
+ return tmp;
|
|
|
}
|
|
|
- return array_cat(buffer,tmp2);
|
|
|
+ return array_cat(buffer,tmp);
|
|
|
}
|
|
|
function bin_to_pkt(bin)
|
|
|
{
|
|
|
@@ -187,14 +217,17 @@ function bin_to_pkt(bin)
|
|
|
case PKT_TYPE.PKT_TYPE_ALARM:
|
|
|
hdr.alarmd = BIN.alarmd.b2j(data);
|
|
|
break;
|
|
|
-
|
|
|
- default :
|
|
|
+
|
|
|
+ case PKT_TYPE.PKT_TYPE_SLAVE_LIST:
|
|
|
+ hdr.slaves = BIN.alarmd.b2j(data);
|
|
|
+ break;
|
|
|
+
|
|
|
+ default:
|
|
|
console.log("wrong hdr type: "+hdr.type);
|
|
|
}
|
|
|
}
|
|
|
return hdr;
|
|
|
}
|
|
|
-
|
|
|
///////////////////////////////////////////////////
|
|
|
function bin_to_hdr(bin) {
|
|
|
var tmp, length=0;
|
|
|
@@ -391,6 +424,155 @@ function bin_to_thr(bin) {
|
|
|
|
|
|
this.len = length;
|
|
|
}
|
|
|
+////////////////////////////////
|
|
|
+function bin_to_modbus(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.mode = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.addr = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.baud = tmp.getUint32(0,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+function bin_to_misc(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.watchdog = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.fliptime = tmp.getUint32(0,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.led = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.beep = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.rotate = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+function bin_to_prod(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.id = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ this.pname = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.pnumber = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.status = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.name = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.number = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.date = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.batch = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.type = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.pwr_type = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ this.version = array_to_string(bin.slice(length,8));
|
|
|
+ length += 8;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.language = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.samptime = tmp.getUint32(0,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.savetime = tmp.getUint32(0,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.ph_group = tmp.getUint16(0,true);
|
|
|
+ length += 2;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.ch_delay = tmp.getUint16(0,true);
|
|
|
+ length += 2;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+function bin_to_serv(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ this.name = array_to_string(bin.slice(length,256));
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ this.site = array_to_string(bin.slice(length,256));
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ this.mail = array_to_string(bin.slice(length,256));
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ this.addr = array_to_string(bin.slice(length,256));
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ this.tele = array_to_string(bin.slice(length,32));
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+function bin_to_network(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.mode = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ this.ipaddr = array_to_string(bin.slice(length,48));
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ this.mask = array_to_string(bin.slice(length,48));
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ this.gateway = array_to_string(bin.slice(length,48));
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ this.dns1 = array_to_string(bin.slice(length,48));
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ this.dns2 = array_to_string(bin.slice(length,48));
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+////////////////////////////////
|
|
|
function bin_to_powerc(bin) {
|
|
|
var tmp, bin2, length=0;
|
|
|
|
|
|
@@ -487,6 +669,44 @@ function bin_to_alarmd(bin) {
|
|
|
|
|
|
this.len = length;
|
|
|
}
|
|
|
+function bin_to_paras(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ this.cas = new bin_to_modbus(bin.slice(length));
|
|
|
+ length += this.cas.len;
|
|
|
+
|
|
|
+ this.misc = new bin_to_misc(bin.slice(length));
|
|
|
+ length += this.misc.len;
|
|
|
+
|
|
|
+ this.prod = new bin_to_prod(bin.slice(length));
|
|
|
+ length += this.prod.len;
|
|
|
+
|
|
|
+ this.serv = new bin_to_serv(bin.slice(length));
|
|
|
+ length += this.serv.len;
|
|
|
+
|
|
|
+ this.network = new bin_to_network(bin.slice(length));
|
|
|
+ length += this.network.len;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+function bin_to_slist(bin) {
|
|
|
+ var tmp, length=0;
|
|
|
+
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ this.cnt = tmp.getUint8(0,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ this.addr = [];
|
|
|
+ tmp = new DataView(bin, length);
|
|
|
+ for(var i=0; i<this.cnt; i++) {
|
|
|
+ this.addr[i] = tmp.getUint8(i,true);
|
|
|
+ }
|
|
|
+ length += this.cnt;
|
|
|
+
|
|
|
+ this.len = length;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
///////////////////////////////////////////////////
|
|
|
function hdr_to_bin(js) {
|
|
|
var tmp, length=0;
|
|
|
@@ -496,6 +716,10 @@ function hdr_to_bin(js) {
|
|
|
tmp.setUint16(0,js.magic,true);
|
|
|
length += 2;
|
|
|
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.addr,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
tmp = new DataView(buffer, length);
|
|
|
tmp.setUint8(0,js.type,true);
|
|
|
length += 1;
|
|
|
@@ -637,7 +861,7 @@ function alarm_to_bin(js) {
|
|
|
|
|
|
return buffer;
|
|
|
}
|
|
|
-function thrval_to_js(js) {
|
|
|
+function thrval_to_bin(js) {
|
|
|
var tmp, length=0;
|
|
|
var buffer = new ArrayBuffer(js.len);
|
|
|
|
|
|
@@ -664,21 +888,179 @@ function thrval_to_js(js) {
|
|
|
function thr_to_bin(js) {
|
|
|
var bin,tmp, length=0;
|
|
|
|
|
|
- bin = thrval_to_js(js.v_upper);
|
|
|
- tmp = thrval_to_js(js.v_lower);
|
|
|
+ bin = thrval_to_bin(js.v_upper);
|
|
|
+ tmp = thrval_to_bin(js.v_lower);
|
|
|
|
|
|
bin = array_cat(bin, tmp);
|
|
|
- tmp = thrval_to_js(js.c_upper);
|
|
|
+ tmp = thrval_to_bin(js.c_upper);
|
|
|
bin = array_cat(bin, tmp);
|
|
|
|
|
|
- tmp = thrval_to_js(js.p_upper);
|
|
|
+ tmp = thrval_to_bin(js.p_upper);
|
|
|
bin = array_cat(bin, tmp);
|
|
|
|
|
|
- tmp = thrval_to_js(js.w_upper);
|
|
|
+ tmp = thrval_to_bin(js.w_upper);
|
|
|
bin = array_cat(bin, tmp);
|
|
|
|
|
|
return bin;
|
|
|
}
|
|
|
+////////////////////////////////
|
|
|
+function modbus_to_bin(js) {
|
|
|
+ var tmp, length=0;
|
|
|
+ var buffer = new ArrayBuffer(js.len);
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.mode,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.addr,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint32(0,js.baud,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ return buffer;
|
|
|
+}
|
|
|
+function misc_to_bin(js) {
|
|
|
+ var tmp, length=0;
|
|
|
+ var buffer = new ArrayBuffer(js.len);
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.watchdog,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.fliptime,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.led,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.beep,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.rotate,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ return buffer;
|
|
|
+}
|
|
|
+function prod_to_bin(js) {
|
|
|
+ var tmp, length=0;
|
|
|
+ var buffer = new ArrayBuffer(js.len);
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint32(0,js.id,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ array_set(buffer,js.pname,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ array_set(buffer,js.pnumber,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ array_set(buffer,js.status,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ array_set(buffer,js.name,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ array_set(buffer,js.number,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ array_set(buffer,js.date,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ array_set(buffer,js.batch,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.type,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.pwrtype,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ array_set(buffer,js.version,length);
|
|
|
+ length += 8;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.language,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.count,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint32(0,js.samptime,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint32(0,js.savetime,true);
|
|
|
+ length += 4;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint16(0,js.ph_group,true);
|
|
|
+ length += 2;
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint16(0,js.ch_delay,true);
|
|
|
+ length += 2;
|
|
|
+
|
|
|
+ return buffer;
|
|
|
+}
|
|
|
+function serv_to_bin(js) {
|
|
|
+ var tmp, length=0;
|
|
|
+ var buffer = new ArrayBuffer(js.len);
|
|
|
+
|
|
|
+ array_set(buffer,js.name,length);
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ array_set(buffer,js.site,length);
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ array_set(buffer,js.mail,length);
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ array_set(buffer,js.addr,length);
|
|
|
+ length += 256;
|
|
|
+
|
|
|
+ array_set(buffer,js.tele,length);
|
|
|
+ length += 32;
|
|
|
+
|
|
|
+ return buffer;
|
|
|
+}
|
|
|
+function network_to_bin(js) {
|
|
|
+ var tmp, length=0;
|
|
|
+ var buffer = new ArrayBuffer(js.len);
|
|
|
+
|
|
|
+ tmp = new DataView(buffer, length);
|
|
|
+ tmp.setUint8(0,js.mode,true);
|
|
|
+ length += 1;
|
|
|
+
|
|
|
+ array_set(buffer,js.ipaddr,length);
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ array_set(buffer,js.mask,length);
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ array_set(buffer,js.gateway,length);
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ array_set(buffer,js.dns1,length);
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ array_set(buffer,js.dns2,length);
|
|
|
+ length += 48;
|
|
|
+
|
|
|
+ return buffer;
|
|
|
+}
|
|
|
+////////////////////////////////
|
|
|
function powerc_to_bin(js) {
|
|
|
var bin,tmp, length=0;
|
|
|
|
|
|
@@ -778,120 +1160,57 @@ function alarmd_to_bin(js) {
|
|
|
return array_cat(bin, buffer);
|
|
|
}
|
|
|
//////////////////////////////////////////////////////////////
|
|
|
-
|
|
|
-var XXX ={};
|
|
|
-XXX.hdr = function() {
|
|
|
- this.j2b = function (js) {
|
|
|
- var tmp;
|
|
|
-
|
|
|
- switch(js.type){
|
|
|
+function bin_parse(bin)
|
|
|
+{
|
|
|
+ var tmp,h = new bin_to_hdr(bin);
|
|
|
+ if(h.nack == 1){
|
|
|
+ //tmp = myBinary.ack.bin2js(bin,this.h.len,true);
|
|
|
+ //myLog('log',tmp);
|
|
|
+ //var data = tmp.data;
|
|
|
+ }
|
|
|
+
|
|
|
+ var data = bin.slice(h.len);
|
|
|
+ if(data.byteLength>0 && h.dlen==data.byteLength) {
|
|
|
+ switch(h.type) {
|
|
|
case PKT_TYPE.PKT_TYPE_POWER_CH:
|
|
|
- tmp = BIN.powerc.j2b(js.powerc);
|
|
|
- break;
|
|
|
+ {
|
|
|
+ var tmp=[],length=0;
|
|
|
+ for(var i=0;; i++) {
|
|
|
+ tmp[i] = new bin_to_powerc(data.slice(length));
|
|
|
+ length += tmp[i].len;
|
|
|
+ if(length >= data.byteLength) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ h.powerc = tmp;
|
|
|
+ }
|
|
|
+ break;
|
|
|
|
|
|
case PKT_TYPE.PKT_TYPE_POWER_TOTAL:
|
|
|
- tmp = BIN.powert.j2b(js.powert);
|
|
|
- break;
|
|
|
+ h.powert = new bin_to_powert(data);
|
|
|
+ break;
|
|
|
|
|
|
case PKT_TYPE.PKT_TYPE_ALARM:
|
|
|
- tmp = BIN.alarm.j2b(js.alarmd);
|
|
|
- break;
|
|
|
-
|
|
|
- default:
|
|
|
- return tmp;
|
|
|
- }
|
|
|
- js.dlen = tmp.byteLength;
|
|
|
- var hdr = new hdr_to_bin(js);
|
|
|
- return array_cat(hdr,tmp);
|
|
|
- };
|
|
|
-
|
|
|
- this.b2j = function (bin) {
|
|
|
- var tmp;
|
|
|
- var hdr = new bin_to_hdr(bin);
|
|
|
-
|
|
|
- if(hdr.nack == 1){
|
|
|
- //tmp = myBinary.ack.bin2js(bin,this.hdr.len,true);
|
|
|
- //myLog('log',tmp);
|
|
|
- //var data = tmp.data;
|
|
|
- }
|
|
|
-
|
|
|
- var data = bin.slice(hdr.len);
|
|
|
- if(data.byteLength>0 && hdr.dlen==data.byteLength) {
|
|
|
- switch(hdr.type) {
|
|
|
- case PKT_TYPE.PKT_TYPE_POWER_CH:
|
|
|
- hdr.powerc = BIN.powerc.b2j(data);
|
|
|
- break;
|
|
|
-
|
|
|
- case PKT_TYPE.PKT_TYPE_POWER_TOTAL:
|
|
|
- hdr.powert = BIN.powert.b2j(data);
|
|
|
- break;
|
|
|
-
|
|
|
- case PKT_TYPE.PKT_TYPE_ALARM:
|
|
|
- hdr.alarmd = BIN.alarmd.b2j(data);
|
|
|
- break;
|
|
|
-
|
|
|
- default :
|
|
|
- console.log("wrong hdr type: "+hdr.type);
|
|
|
- }
|
|
|
- }
|
|
|
- return hdr;
|
|
|
- }
|
|
|
-};
|
|
|
-XXX.paras=function() {
|
|
|
- this.j2b = function (js) {
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- this.b2j = function (bin) {
|
|
|
-
|
|
|
- }
|
|
|
-};
|
|
|
-XXX.powerc=function() {
|
|
|
- this.j2b = function (js) {
|
|
|
- return new powerc_to_bin(js);
|
|
|
- }
|
|
|
-
|
|
|
- this.b2j = function (bin) {
|
|
|
- var tmp=[],length=0;
|
|
|
- for(var i=0;; i++) {
|
|
|
- tmp[i] = new bin_to_powerc(bin.slice(length));
|
|
|
- length += tmp[i].len;
|
|
|
- if(length >= bin.byteLength) {
|
|
|
- break;
|
|
|
- }
|
|
|
+ h.alarmd = new bin_to_alarm(data);
|
|
|
+ break;
|
|
|
+
|
|
|
+ case PKT_TYPE.PKT_TYPE_SLAVE_LIST:
|
|
|
+ h.alarmd = new bin_to_slist(data);
|
|
|
+ break;
|
|
|
+
|
|
|
+ case PKT_TYPE.PKT_TYPE_PARAS:
|
|
|
+ h.alarmd = new bin_to_paras(data);
|
|
|
+ break;
|
|
|
+
|
|
|
+ default :
|
|
|
+ console.log("wrong hdr type: "+h.type);
|
|
|
+ break;
|
|
|
}
|
|
|
- return tmp;
|
|
|
- }
|
|
|
-};
|
|
|
-XXX.powert=function() {
|
|
|
- this.j2b = function (js) {
|
|
|
- return new powert_to_bin(js);
|
|
|
- }
|
|
|
-
|
|
|
- this.b2j = function (bin) {
|
|
|
- return new bin_to_powert(bin);
|
|
|
- }
|
|
|
-};
|
|
|
-XXX.alarmd=function() {
|
|
|
- this.j2b = function (js) {
|
|
|
- return new alarmd_to_bin(js);
|
|
|
- }
|
|
|
-
|
|
|
- this.b2j = function (bin) {
|
|
|
- return new bin_to_alarmd(bin);
|
|
|
}
|
|
|
+ return h;
|
|
|
};
|
|
|
|
|
|
|
|
|
-var BIN=new function() {
|
|
|
- this.hdr = new XXX.hdr();
|
|
|
- this.paras = new XXX.paras();
|
|
|
- this.powerc = new XXX.powerc();
|
|
|
- this.powert = new XXX.powert();
|
|
|
- this.alarmd = new XXX.alarmd();
|
|
|
-}();
|
|
|
-
|
|
|
-
|
|
|
//////////////////////////////////////////
|
|
|
function LOG(){
|
|
|
var data = [];
|
|
|
@@ -899,7 +1218,6 @@ function LOG(){
|
|
|
data.push(arguments[i])
|
|
|
}
|
|
|
console.log(data);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -975,7 +1293,7 @@ function WS(url,fn) {
|
|
|
function _onopen(evt) {
|
|
|
his.closeCount = 0;
|
|
|
console.log("___ ws.onopen");
|
|
|
- setTimeout(loop_send, 2000);
|
|
|
+ //setTimeout(loop_send, 2000);
|
|
|
}
|
|
|
|
|
|
function _onclose(evt) {
|
|
|
@@ -987,7 +1305,8 @@ function WS(url,fn) {
|
|
|
function _onmsg(evt) {
|
|
|
console.log("___ ws.onmsg");
|
|
|
if (evt.data instanceof ArrayBuffer) {
|
|
|
- fn(evt.data);
|
|
|
+ var obj=bin_parse(evt.data);
|
|
|
+ fn(obj);
|
|
|
}
|
|
|
}
|
|
|
|
guohui
