@ncd-io/node-red-enterprise-sensors 0.1.14 → 0.1.16

package/lib/DigiParser.js

@@ -172,7 +172,8 @@ class outgoingFrame{
 		var config = this.transmissionOptions(opts);
 		var frame = [17, this.master.getId()];
 		frame.push(...mac);
-		frame.push([255, 254, source, destination, cluster[0], cluster[1], profile[0], profile[1], (config >> 8), (config & 255)]);
+		var stuff = [255, 254, source, destination, cluster[0], cluster[1], profile[0], profile[1], (config >> 8), (config & 255)];
+		frame.push(...stuff);
 		if(data.constructor != Array) data = [data];
 		frame.push(...data);
 		return this.master._send(frame);

package/lib/WirelessGateway.js

@@ -10,6 +10,12 @@ module.exports = class WirelessSensor{
 		this.sensor_pool = {};
 		this.sensor_types = sensor_types(this);
 		this.queue = new Queue(1);
+
+		//route info and link quality objects
+		this.mesh_map = {};
+		this.link_quality = {};
+		this.query_pool = {};
+
 		this.payloadType = {
 			'122': 'power_up',
 			'124': 'config_ack',
@@ -27,10 +33,21 @@ module.exports = class WirelessSensor{
 				console.log(e);
 			}
 		}
+		function routeReceiver(frame){
+			that.parse_route_information_packet(frame);
+		}
+		function linkQualtiyReceiver(frame){
+			that.parse_link_quality_packet(frame);
+		}
+
 		this.digi.on('receive_packet', receiver);
+		this.digi.on('explicit_rx_indicator', linkQualtiyReceiver);
+		this.digi.on('route_information_packet', routeReceiver);
 		this.on('close', () => {
 			//console.log('removing listener');
 			this.digi._emitter.removeListener('receive_packet', receiver);
+			this.digi._emitter.removeListener('explicit_rx_indicator',linkQualtiyReceiver);
+			this.digi._emitter.removeListener('route_information_packet',routeReceiver);
 		});
 	}
 	send_control(type, mac, msg){
@@ -47,6 +64,64 @@ module.exports = class WirelessSensor{
 		this._emitter.emit('close');
 		this.digi.close();
 	}
+
+	parse_route_information_packet(frame){
+		var destination = frame.destination_mac;
+		var route_array = this.mesh_map[destination];
+		var index = this.query_pool[destination];
+		//This is the route packet from the modem
+		if(frame.source_mac == frame.responder_mac){
+			//Add Gateway MAC as first element of array.
+			route_array[0] = frame.source_mac;
+			//Add Receiver MAC as second item in array
+			route_array[1] = frame.receiver_mac;
+			if(frame.receiver_mac == frame.destination_mac){
+				//if receiver is the sensor then connection is direct from gateway to receiver so emit route info
+				var msg_obj = {};
+				msg_obj.route = route_array;
+				msg_obj.timestamp = Date.now();
+				this._emitter.emit("route_info",msg_obj);
+			}
+		}else{
+			//This is the final route packet
+			if(frame.receiver_mac == destination){
+				route_array.push(frame.receiver_mac);
+				var msg_obj = {};
+				msg_obj.route = route_array;
+				msg_obj.timestamp = Date.now();
+				this._emitter.emit("route_info",msg_obj);
+				delete this.query_pool[frame.destination_mac];
+			}else{
+				// This is an intermediate packet
+				if(frame.responder_mac == route_array[this.query_pool[destination]]){
+					route_array.push(frame.receiver_mac);
+				}
+			}
+
+		}
+		//increment mesh hops index
+		this.query_pool[destination]++;
+	}
+
+	parse_link_quality_packet(frame){
+		console.log("parse_link_quality_packet: "+frame);
+		var msg_obj = {};
+		msg_obj.source_address = frame.source_mac;
+		msg_obj.destination = toMac(frame.data.slice(0,8));
+		msg_obj.payload_size = msbLsb(frame.data[8],frame.data[9]);
+		msg_obj.iterations = msbLsb(frame.data[10], frame.data[11]);
+		msg_obj.successful_iterations = msbLsb(frame.data[12],frame.data[13]);
+		msg_obj.retries = msbLsb(frame.data[14],frame.data[15]);
+		msg_obj.result = frame.data[16] == 0 ? "success":"failed"
+		msg_obj.max_allowed_retries = frame.data[17];
+		msg_obj.max_rssi = 0 - frame.data[18];
+		msg_obj.min_rssi = 0 - frame.data[19];
+		msg_obj.avg_rssi = 0 - frame.data[20];
+		msg_obj.timestamp = Date.now();
+
+		this._emitter.emit("link_info",msg_obj);
+	}
+
 	parse(frame){
 		var type = this.payloadType[frame.data[0]];
 		if(typeof this[type] == 'function'){
@@ -62,7 +137,7 @@ module.exports = class WirelessSensor{
 			var new_mode = is_new;
 			var mode = (type == 'power_up') ? data.mode : ((type == 'sensor_data') ? 'RUN' : ((type == 'config_ack') ? 'ACK' : 'PGM'));
 			// #OTF
-			var otf_devices = [23,26,45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521,531,537];
+			var otf_devices = [23,26,39,45,48,52,78,79,80,81,82,84,88,89,91,101,102,107,519,520,521,531,537];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -214,7 +289,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [23,26,45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521,531,537];
+		var otf_devices = [23,26,39,45,48,52,78,79,80,81,82,84,88,89,91,101,102,107,519,520,521,531,537];
 		if(otf_devices.includes(parsed.sensor_type)){
 			// If the message says FLY and there is not FLY timer in progress.
 			if(payload[8] == 70 && payload[9] == 76 && payload[10] == 89) {
@@ -1515,6 +1590,123 @@ module.exports = class WirelessSensor{
 			});
 		});
 	}
+	route_discover(sensor_mac, opts){
+		var data = [85];
+		var that = this;
+		return new Promise((fulfill, reject) => {
+			that.queue.add(() => {
+				return new Promise((f, r) => {
+					var failed = false;
+					var retries = 0;
+					var tO;
+					function fail(packet){
+						failed = true;
+						clearTimeout(tO);
+						that._emitter.removeListener('receive_packet-'+sensor_mac, pass);
+						that._emitter.removeListener('transmit_status-'+sensor_mac, pass);
+						reject({
+							err: packet,
+							sent: [sensor_mac, data]
+						});
+						r();
+					}
+					function pass(packet){
+						if(failed) return;
+						clearTimeout(tO);
+						fulfill(packet);
+						f();
+					};
+
+					function send(){
+						that.send.transmit_request(mac2bytes(sensor_mac), data, opts).then(function(frame){
+							if(frame.delivery_status == 'Success'){
+								pass(frame);
+							}else{
+								tO = setTimeout(() => {
+									if(retries < 1){
+										retries++;
+										send();
+									}else{
+										fail('Control response timeout');
+									}
+								}, 1000);
+							}
+						}).catch(fail);
+					}
+					that.query_pool[sensor_mac] = 0;
+					if(that.mesh_map.hasOwnProperty(sensor_mac)){
+						delete that.mesh_map[sensor_mac];
+					}
+					that.mesh_map[sensor_mac] = [];
+					if(that.link_quality.hasOwnProperty(sensor_mac)){
+						delete that.link_quality[sensor_mac];
+					}
+					that.link_quality = {};
+					send();
+				});
+			});
+		});
+	}
+	link_test(source_mac,destination_mac,opts){
+		var that = this;
+		return new Promise((fulfill, reject) => {
+			that.queue.add(() => {
+				return new Promise((f, r) => {
+					var failed = false;
+					var retries = 0;
+					var tO;
+					function fail(packet){
+						failed = true;
+						clearTimeout(tO);
+						that._emitter.removeListener('receive_packet-'+source_mac, pass);
+						that._emitter.removeListener('transmit_status-'+source_mac, pass);
+						reject({
+							err: packet,
+							sent: [source_mac]
+						});
+						r();
+					}
+					function pass(packet){
+						if(failed) return;
+						clearTimeout(tO);
+						fulfill(packet);
+						f();
+					};
+
+					function send(){
+						var cluster = [0,20];
+						var profile = [193, 5];
+						var data = [];
+						data.push(...mac2bytes(destination_mac));
+						var payload_size = [0,200];
+						var iterations = [0,200];
+						data.push(...payload_size);
+						data.push(...iterations);
+
+						var hexArray = [];
+						data.forEach((b) => hexArray.push(toHex(b)));
+
+						var opts = {"method":3};
+						that.send.explicit_addressing_command(mac2bytes(source_mac), 230, 230, cluster, profile, data, opts).then(function(frame){
+							if(frame.delivery_status == 'Success'){
+								pass(frame);
+							}else{
+								tO = setTimeout(() => {
+									if(retries < 1){
+										retries++;
+										send();
+									}else{
+										fail('Control response timeout');
+									}
+								}, 1000);
+							}
+						}).catch(fail);
+					}
+					send();
+				});
+			});
+		});
+	}
 	on(e,cb){this._emitter.on(e,cb);}
 };
 
@@ -2038,18 +2230,37 @@ function sensor_types(parent){
 			'name': '24-Bit 6-Channel Current Monitor',
 			parse: (d) => {
 				return {
-					channel_1: d.slice(0, 3).reduce(msbLsb),
-					channel_2: d.slice(4, 7).reduce(msbLsb),
-					channel_3: d.slice(8, 11).reduce(msbLsb),
-					channel_1: d.slice(12, 15).reduce(msbLsb),
-					channel_2: d.slice(16, 19).reduce(msbLsb),
-					channel_3: d.slice(20, 23).reduce(msbLsb)
+					ct1_rms: d.slice(0, 4).reduce(msbLsb),
+					ct1_peak_1: d.slice(4, 6).reduce(msbLsb),
+					ct1_peak_2: d.slice(6, 8).reduce(msbLsb),
+					ct1_peak_3: d.slice(8, 10).reduce(msbLsb),
+					ct2_rms: d.slice(10, 14).reduce(msbLsb),
+					ct2_peak_1: d.slice(14, 16).reduce(msbLsb),
+					ct2_peak_2: d.slice(16, 18).reduce(msbLsb),
+					ct2_peak_3: d.slice(18, 20).reduce(msbLsb),
+					ct3_rms: d.slice(20, 24).reduce(msbLsb),
+					ct3_peak_1: d.slice(24, 26).reduce(msbLsb),
+					ct3_peak_2: d.slice(26, 28).reduce(msbLsb),
+					ct3_peak_3: d.slice(28, 30).reduce(msbLsb),
+					ct4_rms: d.slice(30, 34).reduce(msbLsb),
+					ct4_peak_1: d.slice(34, 36).reduce(msbLsb),
+					ct4_peak_2: d.slice(36, 38).reduce(msbLsb),
+					ct4_peak_3: d.slice(38, 40).reduce(msbLsb),
+					ct5_rms: d.slice(40, 44).reduce(msbLsb),
+					ct5_peak_1: d.slice(44, 46).reduce(msbLsb),
+					ct5_peak_2: d.slice(46, 48).reduce(msbLsb),
+					ct5_peak_3: d.slice(48, 50).reduce(msbLsb),
+					ct6_rms: d.slice(50, 54).reduce(msbLsb),
+					ct6_peak_1: d.slice(54, 56).reduce(msbLsb),
+					ct6_peak_2: d.slice(56, 58).reduce(msbLsb),
+					ct6_peak_3: d.slice(58, 60).reduce(msbLsb)
 				};
 			}
 		},
 		'52': {
 			name: '16-Bit 2-Channel 4-20mA',
 			parse: (d) => {
+				// This parser may be outdated if a customer has an issue check with Engineering
 				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
 				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
 				return {
@@ -2589,13 +2800,13 @@ function sensor_types(parent){
 								fft_concat[label] = {};
 
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 							}
 							var fft_concat_obj = {
@@ -3203,13 +3414,13 @@ function sensor_types(parent){
 								fft_concat[label] = {};
 
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 							}
 
@@ -4003,13 +4214,13 @@ function sensor_types(parent){
 								fft_concat[label] = {};
 
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 							}
 							var fft_concat_obj = {
@@ -4619,13 +4830,13 @@ function sensor_types(parent){
 								fft_concat[label] = {};
 
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 							}
 							var fft_concat_obj = {
@@ -5046,6 +5257,29 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'107': {
+			name: '16-Bit 4-Channel 4-20mA',
+			parse: (d) => {
+				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
+				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
+				var adc3 = signInt(d.slice(4, 6).reduce(msbLsb));
+				var adc4 = signInt(d.slice(6, 8).reduce(msbLsb));
+				var ma1 = (signInt(d.slice(8, 10).reduce(msbLsb)))/100.0;
+				var ma2 = (signInt(d.slice(10, 12).reduce(msbLsb)))/100.0;
+				var ma3 = (signInt(d.slice(12, 14).reduce(msbLsb)))/100.0;
+				var ma4 = (signInt(d.slice(14, 16).reduce(msbLsb)))/100.0;
+				return {
+					adc1: adc1,
+					adc2: adc2,
+					adc3: adc3,
+					adc4: adc4,
+					ma1: ma1,
+					ma2: ma2,
+					ma3: ma3,
+					ma4: ma4
+				};
+			}
+		},
 		'200': {
 			name: '4-20mA Pass Through',
 			parse: (d) => {
@@ -5551,13 +5785,13 @@ function sensor_types(parent){
 								fft_concat[label] = {};
 
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 							}
 							var fft_concat_obj = {
@@ -5974,32 +6208,42 @@ function sensor_types(parent){
 			parse: (payload, parsed) => {
 				return {
 					moisture_1: payload.slice(0, 2).reduce(msbLsb)/100,
-					temp_1: payload.slice(2, 4).reduce(msbLsb)/100,
+					temp_1: signInt(payload.slice(2, 4).reduce(msbLsb))/100,
 					moisture_2: payload.slice(4, 6).reduce(msbLsb)/100,
-					temp_2: payload.slice(6, 8).reduce(msbLsb)/100,
+					temp_2: signInt(payload.slice(6, 8).reduce(msbLsb))/100,
 					moisture_3: payload.slice(8, 10).reduce(msbLsb)/100,
-					temp_3: payload.slice(10, 12).reduce(msbLsb)/100,
+					temp_3: signInt(payload.slice(10, 12).reduce(msbLsb))/100,
 					moisture_4: payload.slice(12, 14).reduce(msbLsb)/100,
-					temp_4: payload.slice(14, 16).reduce(msbLsb)/100,
+					temp_4: signInt(payload.slice(14, 16).reduce(msbLsb))/100,
 					moisture_5: payload.slice(16, 18).reduce(msbLsb)/100,
-					temp_5: payload.slice(18, 20).reduce(msbLsb)/100,
+					temp_5: signInt(payload.slice(18, 20).reduce(msbLsb))/100,
 					moisture_6: payload.slice(20, 22).reduce(msbLsb)/100,
-					temp_6: payload.slice(22, 24).reduce(msbLsb)/100
+					temp_6: signInt(payload.slice(22, 24).reduce(msbLsb))/100
 				}
 			}
 		},
 		'531': {
 			name: 'Custom Noise Sensor',
-			parse: (d) => {
-				return {
-					rms_dba: d[0],
-					c1_dba: d[1],
-					c1_freq: d.slice(2, 4).reduce(msbLsb),
-					c2_dba: d[4],
-					c2_freq: d.slice(5, 7).reduce(msbLsb),
-					c3_dba: d[7],
-					c3_freq: d.slice(8, 10).reduce(msbLsb),
-				};
+			parse: (d, p) => {
+				let firmware = p[1];
+				if(firmware > 1){
+					return {
+						rms_dba: d[0],
+						c1_dba: d[1],
+						c1_freq: d.slice(2, 4).reduce(msbLsb),
+						c2_dba: d[4],
+						c2_freq: d.slice(5, 7).reduce(msbLsb),
+						c3_dba: d[7],
+						c3_freq: d.slice(8, 10).reduce(msbLsb),
+					};
+				}else{
+					return {
+						noise_db: d[0],
+						peak_freq_1: d.slice(1, 3).reduce(msbLsb),
+						peak_freq_2: d.slice(3, 5).reduce(msbLsb),
+						peak_freq_3: d.slice(5, 7).reduce(msbLsb)
+					};
+				}
 			}
 		},
 		'537': {
@@ -6250,13 +6494,13 @@ function sensor_types(parent){
 								fft_concat[label] = {};
 
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(5));
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
 								}
 							}
 							var fft_concat_obj = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ncd-io/node-red-enterprise-sensors",
-    "version": "0.1.14",
+    "version": "0.1.16",
     "description": "",
     "main": "index.js",
     "scripts": {

package/wireless.html

@@ -430,6 +430,7 @@
 					"96": "96 - 16-Bit 1-Channel 0-48VDC Receiver",
 					"101": "101 - Pro Vibration",
 					"102": "102 - Strain Gauge",
+					"107": "107 - 4 Channel 4-20mA Receiver",
 					"200": "200 - 4-20mA Pass Through",
 					"202": "202 - Weather Station",
 					"502": "502 - C_50-27",
@@ -680,6 +681,7 @@
 			<option value="96">96 - 16-Bit 1-Channel 0-48VDC Receiver</option>
 			<option value="101">101 - Pro Vibration</option>
 			<option value="102">102 - Strain Gauge</option>
+			<option value="107">107 - 4 Channel 4-20mA Receiver</option>
 			<option value="200">200 - 4-20mA Pass Through</option>
 			<option value="202">202 - Weather Station</option>
 			<option value="502">502 - C_50-27</option>
@@ -707,7 +709,7 @@
 				<label for="node-input-auto_config"><i class="icon-tag"></i> Auto Config</label>
 				<input class="section-control" type="checkbox" id="node-input-auto_config" value="1">
 			</div>
-			<div class="form-row ncd-dependent" data-sensor-23 data-sensor-26 data-sensor-45 data-sensor-48 data-sensor-78 data-sensor-79 data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-88 data-sensor-89 data-sensor-91 data-sensor-101 data-sensor-102 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-537>
+			<div class="form-row ncd-dependent" data-sensor-23 data-sensor-26 data-sensor-39 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-78 data-sensor-79 data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-88 data-sensor-89 data-sensor-91 data-sensor-101 data-sensor-102 data-sensor-107 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-537>
 				<hr>
 				<label for="node-input-on_the_fly_enable"><i class="icon-tag"></i> OTF Config*</label>
 				<input type="checkbox" id="node-input-on_the_fly_enable" value="1">
@@ -1517,7 +1519,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-88 data-sensor-89>
+			<div class="ncd-dependent" data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-88 data-sensor-89 data-sensor-107>
 				<div class="form-row ncd-active-check">
 					<strong>Sensor Boot Time</strong>
 					<p class="caption">
@@ -1552,7 +1554,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-3 data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-88 data-sensor-89 data-sensor-200>
+			<div class="ncd-dependent" data-sensor-3 data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-88 data-sensor-89 data-sensor-107 data-sensor-200>
 				<div class="form-row ncd-active-check">
 					<strong>Low Calibration Point</strong>
 					<div>

package/wireless.js

@@ -151,7 +151,41 @@ module.exports = function(RED) {
 		};
 
 		node.on('input', function(msg){
-			node.gateway.control_send(msg.payload.address, msg.payload.data, msg.payload.options).then().catch(console.log);
+			switch(msg.topic){
+				case "route_trace":
+					var opts = {trace:1};
+					node.gateway.route_discover(msg.payload.address,opts).then().catch(console.log);
+					break;
+				case "link_test":
+					node.gateway.link_test(msg.payload.source_address,msg.payload.destination_address,msg.payload.options);
+					break;
+				case "fft_request":
+					break;
+				case "fidelity_test":
+					break;
+				default:
+					const byteArrayToHexString = byteArray => Array.from(msg.payload.address, byte => ('0' + (byte & 0xFF).toString(16)).slice(-2)).join('');
+					node.gateway.control_send(msg.payload.address, msg.payload.data, msg.payload.options).then().catch(console.log);
+			}
+
+
+			// console.log("input triggered, topic:"+msg.topic);
+			// if(msg.topic == "transmit"){
+			// 	const byteArrayToHexString = byteArray => Array.from(msg.payload.address, byte => ('0' + (byte & 0xFF).toString(16)).slice(-2)).join('');
+			// 	node.gateway.control_send(msg.payload.address, msg.payload.data, msg.payload.options).then().catch(console.log);
+			// }
+			// if(msg.topic == "route_trace"){
+			// 	var opts = {trace:1};
+			// 	node.gateway.route_discover(msg.payload.address,opts).then().catch(console.log);
+			// }
+			// if(msg.topic == "link_test"){
+			// 	node.gateway.link_test(msg.payload.source_address,msg.payload.destination_address,msg.payload.options);
+			// }
+			// if(msg.topic == "fft_request"){
+
+			// }
+			// if(msg.topic == "fidelity_test"){
+			// }
 		});
 
 		node.gateway.on('sensor_data', (d) => {
@@ -167,6 +201,14 @@ module.exports = function(RED) {
 			msg1 = {topic:'somethingTopic',payload:"something"};
 			node.send([null,{topic: 'unknown_data', payload:d, time: Date.now()}]);
 		});
+		node.gateway.on("route_info",(d)=>{
+			msg1 = {topic:"route_info",payload:d};
+			node.send(msg1);
+		});
+		node.gateway.on("link_info",(d)=>{
+			msg1 = {topic:"link_info",payload:d};
+			node.send(msg1);
+		});
 
 		node.set_status();
 		node._gateway_node.on('mode_change', (mode) => {
@@ -815,6 +857,20 @@ module.exports = function(RED) {
 								// }
 								// promises.set_rtc_101 = node.config_gateway.config_set_rtc_101(mac);
 								break;
+							case 107:
+								if(config.sensor_boot_time_420ma_active){
+									promises.sensor_boot_time_420ma = node.config_gateway.config_set_sensor_boot_time_420ma(mac, parseInt(config.sensor_boot_time_420ma));
+								}
+								if(config.low_calibration_420ma_active){
+									promises.low_calibration_420ma = node.config_gateway.config_set_low_calibration_420ma(mac, parseInt(config.low_calibration_420ma));
+								}
+								if(config.mid_calibration_420ma_active){
+									promises.mid_calibration_420ma = node.config_gateway.config_set_mid_calibration_420ma(mac, parseInt(config.mid_calibration_420ma));
+								}
+								if(config.high_calibration_420ma_active){
+									promises.high_calibration_420ma = node.config_gateway.config_set_high_calibration_420ma(mac, parseInt(config.high_calibration_420ma));
+								}
+								break;
 							case 200:
 								if(config.low_calibration_420ma_active){
 									promises.low_calibration_420ma = node.config_gateway.config_set_low_calibration_420ma(mac, parseInt(config.low_calibration_420ma));